X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FInterpreter.c;h=cc18059f22828c17f3d6b5d1062d9835e713a96d;hb=dc6afe4242238aa1a7a5d3a150a346d23dd6ea22;hp=0df0f99bc3f34b3c21a7ae2cbd2929b7bd59bf3c;hpb=97bca0b7b11e73f8ca9d05d342c4c459f372fcbf;p=ghc-hetmet.git

diff --git a/ghc/rts/Interpreter.c b/ghc/rts/Interpreter.c
index 0df0f99..cc18059 100644
--- a/ghc/rts/Interpreter.c
+++ b/ghc/rts/Interpreter.c
@@ -26,6 +26,11 @@
 #include "Disassembler.h"
 #include "Interpreter.h"
 
+#include <string.h>     /* for memcpy */
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 
 /* --------------------------------------------------------------------------
  * The bytecode interpreter
@@ -58,13 +63,13 @@
    return (retcode);
 
 
-static inline StgPtr
+STATIC_INLINE StgPtr
 allocate_UPD (int n_words)
 {
    return allocate(stg_max(sizeofW(StgHeader)+MIN_UPD_SIZE, n_words));
 }
 
-static inline StgPtr
+STATIC_INLINE StgPtr
 allocate_NONUPD (int n_words)
 {
     return allocate(stg_max(sizeofW(StgHeader)+MIN_NONUPD_SIZE, n_words));
@@ -274,7 +279,7 @@ eval_obj:
 	break;
 	
     case BCO:
-	ASSERT(BCO_ARITY(obj) > 0);
+	ASSERT(((StgBCO *)obj)->arity > 0);
 	break;
 
     case AP:	/* Copied from stg_AP_entry. */
@@ -576,7 +581,7 @@ do_apply:
 	    nat arity, i;
 
 	    Sp++;
-	    arity = BCO_ARITY(obj);
+	    arity = ((StgBCO *)obj)->arity;
 	    ASSERT(arity > 0);
 	    if (arity < n) {
 		// n must be greater than 1, and the only kinds of
@@ -718,7 +723,7 @@ run_BCO:
     {
 	register int       bciPtr     = 1; /* instruction pointer */
 	register StgBCO*   bco        = (StgBCO*)obj;
-	register StgWord16* instrs    = (StgWord16*)(BCO_INSTRS(bco));
+	register StgWord16* instrs    = (StgWord16*)(bco->instrs->payload);
 	register StgWord*  literals   = (StgWord*)(&bco->literals->payload[0]);
 	register StgPtr*   ptrs       = (StgPtr*)(&bco->ptrs->payload[0]);
 	register StgInfoTable** itbls = (StgInfoTable**)
@@ -926,7 +931,7 @@ run_BCO:
 
 	case bci_ALLOC_AP: {
 	    StgAP* ap; 
-	    int n_payload = BCO_NEXT - 1;
+	    int n_payload = BCO_NEXT;
 	    int request   = PAP_sizeW(n_payload);
 	    ap = (StgAP*)allocate_UPD(request);
 	    Sp[-1] = (W_)ap;
@@ -939,7 +944,7 @@ run_BCO:
 	case bci_ALLOC_PAP: {
 	    StgPAP* pap; 
 	    int arity = BCO_NEXT;
-	    int n_payload = BCO_NEXT - 1;
+	    int n_payload = BCO_NEXT;
 	    int request   = PAP_sizeW(n_payload);
 	    pap = (StgPAP*)allocate_NONUPD(request);
 	    Sp[-1] = (W_)pap;
@@ -953,7 +958,7 @@ run_BCO:
 	case bci_MKAP: {
 	    int i;
 	    int stkoff = BCO_NEXT;
-	    int n_payload = BCO_NEXT - 1;
+	    int n_payload = BCO_NEXT;
 	    StgAP* ap = (StgAP*)Sp[stkoff];
 	    ASSERT((int)ap->n_args == n_payload);
 	    ap->fun = (StgClosure*)Sp[0];
@@ -1157,6 +1162,9 @@ run_BCO:
 	    int stk_offset            = BCO_NEXT;
 	    int o_itbl                = BCO_NEXT;
 	    void(*marshall_fn)(void*) = (void (*)(void*))BCO_LIT(o_itbl);
+	    int ret_dyn_size = 
+		RET_DYN_BITMAP_SIZE + RET_DYN_NONPTR_REGS_SIZE
+		+ sizeofW(StgRetDyn);
 
 #ifdef RTS_SUPPORTS_THREADS
 	    // Threaded RTS:
@@ -1168,7 +1176,10 @@ run_BCO:
 	    
 	    memcpy(arguments, Sp, sizeof(W_) * stk_offset);
 #endif
-		
+
+	    // Restore the Haskell thread's current value of errno
+	    errno = cap->r.rCurrentTSO->saved_errno;
+
 	    // There are a bunch of non-ptr words on the stack (the
 	    // ccall args, the ccall fun address and space for the
 	    // result), which we need to cover with an info table
@@ -1179,7 +1190,7 @@ run_BCO:
 	    // CCALL instruction.   So we build a RET_DYN stack frame
 	    // on the stack frame to describe this chunk of stack.
 	    //
-	    Sp -= RET_DYN_SIZE + sizeofW(StgRetDyn);
+	    Sp -= ret_dyn_size;
 	    ((StgRetDyn *)Sp)->liveness = ALL_NON_PTRS | N_NONPTRS(stk_offset);
 	    ((StgRetDyn *)Sp)->info = (StgInfoTable *)&stg_gc_gen_info;
 
@@ -1192,20 +1203,22 @@ run_BCO:
 	    // around (stack squeezing), so we have to grab the real
 	    // Sp out of the TSO to find the ccall args again.
 
-	    marshall_fn ( (void*)(cap->r.rCurrentTSO->sp + RET_DYN_SIZE + sizeofW(StgRetDyn)) );
+	    marshall_fn ( (void*)(cap->r.rCurrentTSO->sp + ret_dyn_size) );
 #else
 	    // Threaded RTS:
-	    // We already made a malloced copy of the arguments above.
+	    // We already made a copy of the arguments above.
 
 	    marshall_fn ( arguments );
 #endif
 
 	    // And restart the thread again, popping the RET_DYN frame.
-	    cap = (Capability *)((void *)resumeThread(tok,rtsFalse) - sizeof(StgFunTable));
+	    cap = (Capability *)((void *)((unsigned char*)resumeThread(tok,rtsFalse) - sizeof(StgFunTable)));
 	    LOAD_STACK_POINTERS;
-	    Sp += RET_DYN_SIZE + sizeofW(StgRetDyn);
-
+	    Sp += ret_dyn_size;
 	    
+	    // Save the Haskell thread's current value of errno
+	    cap->r.rCurrentTSO->saved_errno = errno;
+		
 #ifdef RTS_SUPPORTS_THREADS
 	    // Threaded RTS:
 	    // Copy the "arguments", which might include a return value,