changeset 7156:58ad5915b2b0

Merge
author asaha
date Tue, 17 Feb 2015 11:03:35 -0800
parents 4ee0e13da402 35d8318de0b6
children 6b95f74c9da6
files .hgtags make/hotspot_version
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 12 08:24:18 2015 -0800
+++ b/.hgtags	Tue Feb 17 11:03:35 2015 -0800
@@ -600,4 +600,5 @@
 344ff6e45a1e2960ac4a583f63ebfb54cd52e6b4 jdk8u45-b05
 3afa9cc6e8d537ee456b8e12d1abb1da520b5ddc jdk8u45-b06
 5871f3dd9b4a2c4b44e7da2184f4430323e0c04b jdk8u45-b07
+35c7330b68e21d0dfaaedaaf74b794fd10606e9c jdk8u45-b08
 b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00
--- a/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Thu Feb 12 08:24:18 2015 -0800
+++ b/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Tue Feb 17 11:03:35 2015 -0800
@@ -630,7 +630,12 @@
 
 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