Cleanup of using stack attention

The previous change still had the stack check at the beginning of a compiled code which caused the problems with the debugger. This change properly removes all these checks.
rubinius · Jan 23, 2013 · 5aedf3b · 5aedf3b
1 parent 47e70d1
commit 5aedf3b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 28 deletions.
diff --git a/vm/builtin/block_environment.cpp b/vm/builtin/block_environment.cpp
@@ -319,9 +319,7 @@ namespace rubinius {
 
     GCTokenImpl gct;
 
-    if(state->detect_stack_condition(frame)) {
-      if(!state->check_interrupts(gct, frame, frame)) return NULL;
-    }
+    if(!state->check_interrupts(gct, frame, frame)) return NULL;
 
     state->checkpoint(gct, frame);
 

diff --git a/vm/helpers.cpp b/vm/helpers.cpp
@@ -354,7 +354,7 @@ namespace rubinius {
 
       // Process a few commands...
       if(ret == state->symbol("step")) {
-        state->vm()->get_attention();
+        state->vm()->set_check_local_interrupts();
         state->vm()->set_thread_step();
       }
 

diff --git a/vm/machine_code.cpp b/vm/machine_code.cpp
@@ -617,9 +617,7 @@ namespace rubinius {
 
       // Check the stack and interrupts here rather than in the interpreter
       // loop itself.
-      if(state->detect_stack_condition(frame)) {
-        if(!state->check_interrupts(gct, frame, frame)) return NULL;
-      }
+      if(!state->check_interrupts(gct, frame, frame)) return NULL;
 
       state->checkpoint(gct, frame);
 
@@ -675,9 +673,7 @@ namespace rubinius {
 
     GCTokenImpl gct;
 
-    if(state->detect_stack_condition(frame)) {
-      if(!state->check_interrupts(gct, frame, frame)) return NULL;
-    }
+    if(!state->check_interrupts(gct, frame, frame)) return NULL;
 
     state->checkpoint(gct, frame);
 

diff --git a/vm/signal.cpp b/vm/signal.cpp
@@ -171,7 +171,6 @@ namespace rubinius {
 
         {
           target_->set_check_local_interrupts();
-          target_->get_attention();
           target_->wakeup(state, gct);
         }
       }

diff --git a/vm/state.hpp b/vm/state.hpp
@@ -102,13 +102,9 @@ namespace rubinius {
 
     bool check_stack(CallFrame* call_frame, void* end) {
       // @TODO assumes stack growth direction
-      if(vm_->at_stack_limit()) {
-        vm_->reset_stack_limit();
-      } else {
-        if(unlikely(vm_->detect_stack_condition(end))) {
-          raise_stack_error(call_frame);
-          return false;
-        }
+      if(unlikely(vm_->detect_stack_condition(end))) {
+        raise_stack_error(call_frame);
+        return false;
       }
       return true;
     }

diff --git a/vm/vm.cpp b/vm/vm.cpp
@@ -425,14 +425,12 @@ namespace rubinius {
     SYNC(state);
     interrupted_exception_.set(exc);
     set_check_local_interrupts();
-    get_attention();
   }
 
   void VM::register_kill(STATE) {
     SYNC(state);
     set_interrupt_by_kill();
     set_check_local_interrupts();
-    get_attention();
   }
 
   void VM::set_current_fiber(Fiber* fib) {

diff --git a/vm/vm.hpp b/vm/vm.hpp
@@ -202,14 +202,6 @@ namespace rubinius {
       set_stack_bounds(root_stack_start_, root_stack_size_);
     }
 
-    void get_attention() {
-      vm_jit_.stack_limit_ = vm_jit_.stack_start_;
-    }
-
-    bool at_stack_limit() {
-      return vm_jit_.stack_limit_ == vm_jit_.stack_start_;
-    }
-
     bool detect_stack_condition(void* end) {
       // @TODO assumes stack growth direction
       return reinterpret_cast<uintptr_t>(end) < vm_jit_.stack_limit_;