X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FInterpreter.c;h=d047876d21d2c12fc198686fe384a688b183ce4c;hp=1b2d7303edf2d3285910cdf47248ec8a9ddad4b8;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hpb=164be7854f6de07bb4bc15f60af727ddb562cde7

diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index 1b2d730..d047876 100644
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -7,21 +7,20 @@
 #include "PosixSource.h"
 #include "Rts.h"
 #include "RtsAPI.h"
+#include "rts/Bytecodes.h"
+
+// internal headers
+#include "sm/Storage.h"
 #include "RtsUtils.h"
-#include "Closures.h"
-#include "TSO.h"
 #include "Schedule.h"
-#include "RtsFlags.h"
-#include "LdvProfile.h"
 #include "Updates.h"
 #include "Sanity.h"
-#include "Liveness.h"
 #include "Prelude.h"
-
-#include "Bytecodes.h"
+#include "Stable.h"
 #include "Printer.h"
 #include "Disassembler.h"
 #include "Interpreter.h"
+#include "ThreadPaused.h"
 
 #include <string.h>     /* for memcpy */
 #ifdef HAVE_ERRNO_H
@@ -196,6 +195,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:
     // 
@@ -760,19 +762,22 @@ run_BCO_fun:
 run_BCO:
     INTERP_TICK(it_BCO_entries);
     {
-	register int       bciPtr     = 1; /* instruction pointer */
+	register int       bciPtr = 0; /* instruction pointer */
         register StgWord16 bci;
 	register StgBCO*   bco        = (StgBCO*)obj;
 	register StgWord16* instrs    = (StgWord16*)(bco->instrs->payload);
 	register StgWord*  literals   = (StgWord*)(&bco->literals->payload[0]);
 	register StgPtr*   ptrs       = (StgPtr*)(&bco->ptrs->payload[0]);
+	int bcoSize;
+    bcoSize = BCO_NEXT_WORD;
+	IF_DEBUG(interpreter,debugBelch("bcoSize = %d\n", bcoSize));
 
 #ifdef INTERP_STATS
 	it_lastopc = 0; /* no opcode */
 #endif
 
     nextInsn:
-	ASSERT(bciPtr <= instrs[0]);
+	ASSERT(bciPtr < bcoSize);
 	IF_DEBUG(interpreter,
 		 //if (do_print_stack) {
 		 //debugBelch("\n-- BEGIN stack\n");
@@ -1183,7 +1188,7 @@ run_BCO:
 
 	case bci_TESTLT_P: {
 	    unsigned int discr  = BCO_NEXT;
-	    int failto = BCO_NEXT;
+	    int failto = BCO_GET_LARGE_ARG;
 	    StgClosure* con = (StgClosure*)Sp[0];
 	    if (GET_TAG(con) >= discr) {
 		bciPtr = failto;
@@ -1193,7 +1198,7 @@ run_BCO:
 
 	case bci_TESTEQ_P: {
 	    unsigned int discr  = BCO_NEXT;
-	    int failto = BCO_NEXT;
+	    int failto = BCO_GET_LARGE_ARG;
 	    StgClosure* con = (StgClosure*)Sp[0];
 	    if (GET_TAG(con) != discr) {
 		bciPtr = failto;
@@ -1204,7 +1209,7 @@ run_BCO:
 	case bci_TESTLT_I: {
 	    // There should be an Int at Sp[1], and an info table at Sp[0].
 	    int discr   = BCO_NEXT;
-	    int failto  = BCO_NEXT;
+	    int failto  = BCO_GET_LARGE_ARG;
 	    I_ stackInt = (I_)Sp[1];
 	    if (stackInt >= (I_)BCO_LIT(discr))
 		bciPtr = failto;
@@ -1214,7 +1219,7 @@ run_BCO:
 	case bci_TESTEQ_I: {
 	    // There should be an Int at Sp[1], and an info table at Sp[0].
 	    int discr   = BCO_NEXT;
-	    int failto  = BCO_NEXT;
+	    int failto  = BCO_GET_LARGE_ARG;
 	    I_ stackInt = (I_)Sp[1];
 	    if (stackInt != (I_)BCO_LIT(discr)) {
 		bciPtr = failto;
@@ -1225,7 +1230,7 @@ run_BCO:
 	case bci_TESTLT_D: {
 	    // There should be a Double at Sp[1], and an info table at Sp[0].
 	    int discr   = BCO_NEXT;
-	    int failto  = BCO_NEXT;
+	    int failto  = BCO_GET_LARGE_ARG;
 	    StgDouble stackDbl, discrDbl;
 	    stackDbl = PK_DBL( & Sp[1] );
 	    discrDbl = PK_DBL( & BCO_LIT(discr) );
@@ -1238,7 +1243,7 @@ run_BCO:
 	case bci_TESTEQ_D: {
 	    // There should be a Double at Sp[1], and an info table at Sp[0].
 	    int discr   = BCO_NEXT;
-	    int failto  = BCO_NEXT;
+	    int failto  = BCO_GET_LARGE_ARG;
 	    StgDouble stackDbl, discrDbl;
 	    stackDbl = PK_DBL( & Sp[1] );
 	    discrDbl = PK_DBL( & BCO_LIT(discr) );
@@ -1251,7 +1256,7 @@ run_BCO:
 	case bci_TESTLT_F: {
 	    // There should be a Float at Sp[1], and an info table at Sp[0].
 	    int discr   = BCO_NEXT;
-	    int failto  = BCO_NEXT;
+	    int failto  = BCO_GET_LARGE_ARG;
 	    StgFloat stackFlt, discrFlt;
 	    stackFlt = PK_FLT( & Sp[1] );
 	    discrFlt = PK_FLT( & BCO_LIT(discr) );
@@ -1264,7 +1269,7 @@ run_BCO:
 	case bci_TESTEQ_F: {
 	    // There should be a Float at Sp[1], and an info table at Sp[0].
 	    int discr   = BCO_NEXT;
-	    int failto  = BCO_NEXT;
+	    int failto  = BCO_GET_LARGE_ARG;
 	    StgFloat stackFlt, discrFlt;
 	    stackFlt = PK_FLT( & Sp[1] );
 	    discrFlt = PK_FLT( & BCO_LIT(discr) );
@@ -1281,7 +1286,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 (cap->context_switch) {
+	    if (cap->r.rHpLim == NULL) {
 		Sp--; Sp[0] = (W_)&stg_enter_info;
 		RETURN_TO_SCHEDULER(ThreadInterpret, ThreadYielding);
 	    }
@@ -1422,7 +1427,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) - FIELD_OFFSET(Capability,r)));
+	    cap = (Capability *)((void *)((unsigned char*)resumeThread(tok) - STG_FIELD_OFFSET(Capability,r)));
 	    LOAD_STACK_POINTERS;
 
             // Re-load the pointer to the BCO from the RET_DYN frame,
@@ -1448,7 +1453,7 @@ run_BCO:
 
 	case bci_JMP: {
 	    /* BCO_NEXT modifies bciPtr, so be conservative. */
-	    int nextpc = BCO_NEXT;
+	    int nextpc = BCO_GET_LARGE_ARG;
 	    bciPtr     = nextpc;
 	    goto nextInsn;
 	}