X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FInterpreter.c;h=b31ade08fbd3404b402ac8240fdbfacbbee6efdd;hb=9512557e2ad1800146ff1931748cda283c267026;hp=d4a48307a2f278e57327a0b6f999630c46607a19;hpb=9392c09726a8018a447eff14f08eb76a060ec9e5;p=ghc-hetmet.git

diff --git a/ghc/rts/Interpreter.c b/ghc/rts/Interpreter.c
index d4a4830..b31ade0 100644
--- a/ghc/rts/Interpreter.c
+++ b/ghc/rts/Interpreter.c
@@ -43,7 +43,7 @@
 
 #define BCO_NEXT      instrs[bciPtr++]
 #define BCO_PTR(n)    (W_)ptrs[n]
-#define BCO_LIT(n)    (W_)literals[n]
+#define BCO_LIT(n)    literals[n]
 #define BCO_ITBL(n)   itbls[n]
 
 #define LOAD_STACK_POINTERS					\
@@ -55,9 +55,17 @@
     cap->r.rCurrentTSO->sp = Sp
 
 #define RETURN_TO_SCHEDULER(todo,retcode)	\
-   SAVE_STACK_POINTERS; 			\
-   cap->r.rCurrentTSO->what_next = (todo);      \
-   return (retcode);
+   SAVE_STACK_POINTERS;				\
+   cap->r.rCurrentTSO->what_next = (todo);	\
+   threadPaused(cap,cap->r.rCurrentTSO);		\
+   cap->r.rRet = (retcode);			\
+   return cap;
+
+#define RETURN_TO_SCHEDULER_NO_PAUSE(todo,retcode)	\
+   SAVE_STACK_POINTERS;					\
+   cap->r.rCurrentTSO->what_next = (todo);		\
+   cap->r.rRet = (retcode);				\
+   return cap;
 
 
 STATIC_INLINE StgPtr
@@ -164,7 +172,7 @@ static StgWord app_ptrs_itbl[] = {
     (W_)&stg_ap_pppppp_info,
 };
 
-StgThreadReturnCode
+Capability *
 interpretBCO (Capability* cap)
 {
     // Use of register here is primarily to make it clear to compilers
@@ -334,7 +342,7 @@ eval_obj:
 	Sp -= 2;
 	Sp[1] = (W_)obj;
 	Sp[0] = (W_)&stg_enter_info;
-	RETURN_TO_SCHEDULER(ThreadRunGHC, ThreadYielding);
+	RETURN_TO_SCHEDULER_NO_PAUSE(ThreadRunGHC, ThreadYielding);
     }
     }
 
@@ -429,7 +437,7 @@ do_return:
 	Sp -= 2;
 	Sp[1] = (W_)obj;
 	Sp[0] = (W_)&stg_enter_info;
-	RETURN_TO_SCHEDULER(ThreadRunGHC, ThreadYielding);
+	RETURN_TO_SCHEDULER_NO_PAUSE(ThreadRunGHC, ThreadYielding);
     }
     }
 
@@ -489,7 +497,7 @@ do_return_unboxed:
 		     debugBelch("returning to unknown frame -- yielding to sched\n"); 
 		     printStackChunk(Sp,cap->r.rCurrentTSO->stack+cap->r.rCurrentTSO->stack_size);
 		);
-	    RETURN_TO_SCHEDULER(ThreadRunGHC, ThreadYielding);
+	    RETURN_TO_SCHEDULER_NO_PAUSE(ThreadRunGHC, ThreadYielding);
 	}
 	}
     }
@@ -508,7 +516,7 @@ do_apply:
 
 	case PAP: {
 	    StgPAP *pap;
-	    nat arity, i;
+	    nat i, arity;
 
 	    pap = (StgPAP *)obj;
 
@@ -528,7 +536,8 @@ do_apply:
 		// Shuffle the args for this function down, and put
 		// the appropriate info table in the gap.
 		for (i = 0; i < arity; i++) {
-		    Sp[i-1] = Sp[i];
+		    Sp[(int)i-1] = Sp[i];
+		    // ^^^^^ careful, i-1 might be negative, but i in unsigned
 		}
 		Sp[arity-1] = app_ptrs_itbl[n-arity-1];
 		Sp--;
@@ -584,7 +593,8 @@ do_apply:
 		// Shuffle the args for this function down, and put
 		// the appropriate info table in the gap.
 		for (i = 0; i < arity; i++) {
-		    Sp[i-1] = Sp[i];
+		    Sp[(int)i-1] = Sp[i];
+		    // ^^^^^ careful, i-1 might be negative, but i in unsigned
 		}
 		Sp[arity-1] = app_ptrs_itbl[n-arity-1];
 		Sp--;
@@ -618,7 +628,7 @@ do_apply:
 	    Sp -= 2;
 	    Sp[1] = (W_)obj;
 	    Sp[0] = (W_)&stg_enter_info;
-	    RETURN_TO_SCHEDULER(ThreadRunGHC, ThreadYielding);
+	    RETURN_TO_SCHEDULER_NO_PAUSE(ThreadRunGHC, ThreadYielding);
     }
 
     // ------------------------------------------------------------------------
@@ -902,7 +912,7 @@ run_BCO:
 	    int n_words = BCO_NEXT;
 	    Sp -= n_words;
 	    for (i = 0; i < n_words; i++) {
-		Sp[i] = BCO_LIT(o_lits+i);
+		Sp[i] = (W_)BCO_LIT(o_lits+i);
 	    }
 	    goto nextInsn;
 	}
@@ -1148,7 +1158,7 @@ run_BCO:
 	}
 
 	case bci_CCALL: {
-	    StgInt tok;
+	    void *tok;
 	    int stk_offset            = BCO_NEXT;
 	    int o_itbl                = BCO_NEXT;
 	    void(*marshall_fn)(void*) = (void (*)(void*))BCO_LIT(o_itbl);
@@ -1156,7 +1166,7 @@ run_BCO:
 		RET_DYN_BITMAP_SIZE + RET_DYN_NONPTR_REGS_SIZE
 		+ sizeofW(StgRetDyn);
 
-#ifdef RTS_SUPPORTS_THREADS
+#ifdef THREADED_RTS
 	    // Threaded RTS:
 	    // Arguments on the TSO stack are not good, because garbage
 	    // collection might move the TSO as soon as we call
@@ -1187,7 +1197,7 @@ run_BCO:
 	    SAVE_STACK_POINTERS;
 	    tok = suspendThread(&cap->r);
 
-#ifndef RTS_SUPPORTS_THREADS
+#ifndef THREADED_RTS
 	    // Careful:
 	    // suspendThread might have shifted the stack
 	    // around (stack squeezing), so we have to grab the real
@@ -1209,7 +1219,7 @@ run_BCO:
 	    // Save the Haskell thread's current value of errno
 	    cap->r.rCurrentTSO->saved_errno = errno;
 		
-#ifdef RTS_SUPPORTS_THREADS
+#ifdef THREADED_RTS
 	    // Threaded RTS:
 	    // Copy the "arguments", which might include a return value,
 	    // back to the TSO stack. It would of course be enough to