# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1421679964 -3600
# Node ID 5e85485a1b44ddc1e7906c19cec47a8eb78ff23c
# Parent  5be321eab6acae9fdc70493524850c2934767889# Parent  1ca36602c05b220a84e28abf25d7c41fb331da4b
Merge.

diff -r 5be321eab6ac -r 5e85485a1b44 src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp
--- a/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Mon Jan 19 14:50:36 2015 +0100
+++ b/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Mon Jan 19 16:06:04 2015 +0100
@@ -630,7 +630,8 @@
 
 inline void MacroAssembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) {
   relocate(a.rspec(offset));
-  ldf(w, a.base(), a.disp() + offset, d);
+  if(a.has_index()) { assert(offset == 0, ""); ldf(w, a.base(), a.index(), d); }
+  else              { ldf(w, a.base(), a.disp() + offset, d); }
 }
 
 // returns if membar generates anything, obviously this code should mirror