changeset 22127:a27d4ef9b3a3

[SPARC] Set SPARCFrameMap.initialSpillSize in java instead of addig it during code installation
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Tue, 30 Jun 2015 10:42:14 +0200
parents 5f622eadfa5b
children 3b8028e55761
files graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java src/share/vm/jvmci/jvmciCodeInstaller.cpp
diffstat 2 files changed, 2 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java	Tue Jun 30 10:41:03 2015 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java	Tue Jun 30 10:42:14 2015 +0200
@@ -36,7 +36,6 @@
  *
  * <pre>
  *   Base       Contents
- *
  *            :                                :  -----
  *   caller   | incoming overflow argument n   |    ^
  *   frame    :     ...                        :    | positive
@@ -78,8 +77,8 @@
 
     public SPARCFrameMap(CodeCacheProvider codeCache, RegisterConfig registerConfig) {
         super(codeCache, registerConfig);
-        // offset relative to sp + total frame size
-        initialSpillSize = 0;
+        // Initial spill size is set to register save area size (SPARC register window)
+        initialSpillSize = 128;
         spillSize = initialSpillSize;
     }
 
--- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Tue Jun 30 10:41:03 2015 +0200
+++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Tue Jun 30 10:42:14 2015 +0200
@@ -81,11 +81,6 @@
     return vmReg->next(offset / 4);
   } else {
     // stack slot
-#ifdef TARGET_ARCH_sparc
-    if(offset >= 0) {
-      offset += 128;
-    }
-#endif
     if (code_Location::addFrameSize(location)) {
       offset += total_frame_size;
     }
@@ -242,11 +237,6 @@
     }
   } else if (value->is_a(StackSlot::klass())) {
     jint offset = StackSlot::offset(value);
-#ifdef TARGET_ARCH_sparc
-    if(offset >= 0) {
-      offset += 128;
-    }
-#endif
     if (StackSlot::addFrameSize(value)) {
       offset += _total_frame_size;
     }