X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FInterpreter.c;h=1a6e9273e0ec33773332c46be2a5fe60624ca121;hb=a8e1e190ee5aa16f31bdde26daf3c897314e8994;hp=d541dfc4094e8972e8a7de1c215fc07412eb98b7;hpb=a8c3a7ccaf3e1d820a7902a478948a55f5324f50;p=ghc-hetmet.git

diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index d541dfc..1a6e927 100644
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -196,6 +196,9 @@ interpretBCO (Capability* cap)
 
     LOAD_STACK_POINTERS;
 
+    cap->r.rHpLim = (P_)1; // HpLim is the context-switch flag; when it
+                           // goes to zero we must return to the scheduler.
+
     // ------------------------------------------------------------------------
     // Case 1:
     // 
@@ -1281,7 +1284,7 @@ run_BCO:
 	    // context switching: sometimes the scheduler can invoke
 	    // the interpreter with context_switch == 1, particularly
 	    // if the -C0 flag has been given on the cmd line.
-	    if (context_switch) {
+	    if (cap->r.rHpLim == NULL) {
 		Sp--; Sp[0] = (W_)&stg_enter_info;
 		RETURN_TO_SCHEDULER(ThreadInterpret, ThreadYielding);
 	    }
@@ -1422,7 +1425,7 @@ run_BCO:
             ffi_call(cif, fn, ret, argptrs);
 
 	    // And restart the thread again, popping the RET_DYN frame.
-	    cap = (Capability *)((void *)((unsigned char*)resumeThread(tok) - sizeof(StgFunTable)));
+	    cap = (Capability *)((void *)((unsigned char*)resumeThread(tok) - FIELD_OFFSET(Capability,r)));
 	    LOAD_STACK_POINTERS;
 
             // Re-load the pointer to the BCO from the RET_DYN frame,