Start of support for using native thread's stack and automatic stack …

…growth via signal handlers.
codehaus · Apr 16, 2009 · a7f9242 · a7f9242
1 parent 4ea7527
commit a7f9242
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/rvm/src/org/jikesrvm/Properties.java b/rvm/src/org/jikesrvm/Properties.java
@@ -83,6 +83,11 @@ public class Properties extends Options {
    */
   public static boolean verboseJNI = false;
 
+  /**
+   * Is stack growth managed by the OS/signals or automatic tests?
+   */
+  public static final boolean AutomaticStackGrowth = Configuration.BuildForWindows;
+
   // Runtime subsystem tracing.
   //
   public static final boolean TraceDictionaries = false;

diff --git a/rvm/src/org/jikesrvm/VM.java b/rvm/src/org/jikesrvm/VM.java
@@ -2532,11 +2532,13 @@ public static void disableGC(boolean recursiveOK) {
     }
 
     // 1.
-    //
-    if (Magic.getFramePointer().minus(ArchitectureSpecific.StackframeLayoutConstants.STACK_SIZE_GCDISABLED)
-        .LT(myThread.stackLimit) && !myThread.hasNativeStackFrame()) {
-      RVMThread.resizeCurrentStack(myThread.getStackLength()+
-          ArchitectureSpecific.StackframeLayoutConstants.STACK_SIZE_GCDISABLED, null);
+    //    
+    if (!VM.AutomaticStackGrowth) {
+      if (Magic.getFramePointer().minus(ArchitectureSpecific.StackframeLayoutConstants.STACK_SIZE_GCDISABLED)
+	  .LT(myThread.stackLimit) && !myThread.hasNativeStackFrame()) {
+	RVMThread.resizeCurrentStack(myThread.getStackLength()+
+				     ArchitectureSpecific.StackframeLayoutConstants.STACK_SIZE_GCDISABLED, null);
+      }
     }
 
     // 2.

diff --git a/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java b/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
@@ -3721,7 +3721,7 @@ private void genPrologue() {
       /*
        * generate stacklimit check
        */
-      if (isInterruptible) {
+      if (!VM.AutomaticStackGrowth && isInterruptible) {
         // S0<-limit
         if (VM.BuildFor32Addr) {
           asm.emitCMP_Reg_RegDisp(SP, TR, Entrypoints.stackLimitField.getOffset());

diff --git a/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java b/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
@@ -511,7 +511,7 @@ public static boolean mightBeFP(Address address) {
     // In general we don't know which spaces may hold allocated stacks.
     // If we want to be more specific than the space being mapped we
     // will need to add a check in Plan that can be overriden.
-    return Space.isMappedAddress(address);
+    return VM.AutomaticStackGrowth || Space.isMappedAddress(address);
   }
   /***********************************************************************
    *