X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FDisassembler.c;h=fff3fe9d7632bce75fc24e009f7fc714be2b23e7;hp=f29cce2daa43be9ae19803dd8bf4825f1d9279bf;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hpb=94abbcb6d1d3d28d0b2de965e1357ac7b8f8c40a

diff --git a/rts/Disassembler.c b/rts/Disassembler.c
index f29cce2..fff3fe9 100644
--- a/rts/Disassembler.c
+++ b/rts/Disassembler.c
@@ -13,12 +13,10 @@
 #include "PosixSource.h"
 #include "Rts.h"
 #include "RtsAPI.h"
+#include "rts/Bytecodes.h"
+
 #include "RtsUtils.h"
-#include "Closures.h"
-#include "TSO.h"
 #include "Schedule.h"
-
-#include "Bytecodes.h"
 #include "Printer.h"
 #include "Disassembler.h"
 #include "Interpreter.h"
@@ -41,11 +39,13 @@ disInstr ( StgBCO *bco, int pc )
    StgMutArrPtrs* ptrs_arr    = bco->ptrs;
    StgPtr*        ptrs        = (StgPtr*)(&ptrs_arr->payload[0]);
 
-   StgArrWords*   itbls_arr   = bco->itbls;
-   StgInfoTable** itbls       = (StgInfoTable**)(&itbls_arr->payload[0]);
-
    instr = instrs[pc++];
    switch (instr) {
+      case bci_BRK_FUN:
+         debugBelch ("BRK_FUN  " );  printPtr( ptrs[instrs[pc]] ); 
+         debugBelch (" %d ", instrs[pc+1]); printPtr( ptrs[instrs[pc+2]] ); debugBelch("\n" );
+         pc += 3;
+         break;
       case bci_SWIZZLE:
          debugBelch("SWIZZLE stkoff %d by %d\n",
                          instrs[pc], (signed int)instrs[pc+1]);
@@ -146,6 +146,9 @@ disInstr ( StgBCO *bco, int pc )
       case bci_ALLOC_AP:
          debugBelch("ALLOC_AP  %d words\n", instrs[pc] );
          pc += 1; break;
+      case bci_ALLOC_AP_NOUPD:
+         debugBelch("ALLOC_AP_NOUPD %d words\n", instrs[pc] );
+         pc += 1; break;
       case bci_ALLOC_PAP:
          debugBelch("ALLOC_PAP %d arity, %d words\n",
 		 instrs[pc], instrs[pc+1] );
@@ -163,7 +166,7 @@ disInstr ( StgBCO *bco, int pc )
          pc += 1; break;
       case bci_PACK:
          debugBelch("PACK      %d words with itbl ", instrs[pc+1] );
-         printPtr( (StgPtr)itbls[instrs[pc]] );
+         printPtr( (StgPtr)literals[instrs[pc]] );
          debugBelch("\n");
          pc += 2; break;