Mercurial > hg > truffle

changeset 18881:5e85485a1b44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Mon, 19 Jan 2015 16:06:04 +0100
parents 5be321eab6ac (current diff) 1ca36602c05b (diff)
children ceeaa3d58f1c
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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