X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FInterpreter.c;h=62fd2c2ef2578c78337df3c6f9557b470963a7f3;hb=b01325cd38343133ac8f0a1d45e7b8d7cbb52a43;hp=0312d3d8420b6ad7a02a13ff78fdd5be064590a9;hpb=f5f43a8ed4199e1251aa0e02cafb0acd14ff4535;p=ghc-hetmet.git

diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index 0312d3d..62fd2c2 100644
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -54,7 +54,6 @@
 
 #define BCO_PTR(n)    (W_)ptrs[n]
 #define BCO_LIT(n)    literals[n]
-#define BCO_ITBL(n)   itbls[n]
 
 #define LOAD_STACK_POINTERS					\
     Sp = cap->r.rCurrentTSO->sp;				\
@@ -729,8 +728,6 @@ run_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**)
-	    (&bco->itbls->payload[0]);
 
 #ifdef INTERP_STATS
 	it_lastopc = 0; /* no opcode */
@@ -1018,12 +1015,12 @@ run_BCO:
 	    int i;
 	    int o_itbl         = BCO_NEXT;
 	    int n_words        = BCO_NEXT;
-	    StgInfoTable* itbl = INFO_PTR_TO_STRUCT(BCO_ITBL(o_itbl));
+	    StgInfoTable* itbl = INFO_PTR_TO_STRUCT(BCO_LIT(o_itbl));
 	    int request        = CONSTR_sizeW( itbl->layout.payload.ptrs, 
 					       itbl->layout.payload.nptrs );
 	    StgClosure* con = (StgClosure*)allocate_NONUPD(request);
 	    ASSERT( itbl->layout.payload.ptrs + itbl->layout.payload.nptrs > 0);
-	    SET_HDR(con, BCO_ITBL(o_itbl), CCS_SYSTEM/*ToDo*/);
+	    SET_HDR(con, (StgInfoTable*)BCO_LIT(o_itbl), CCS_SYSTEM/*ToDo*/);
 	    for (i = 0; i < n_words; i++) {
 		con->payload[i] = (StgClosure*)Sp[i];
 	    }