[project @ 2004-08-13 13:04:50 by simonmar]

[ghc-hetmet.git] / ghc / rts / Disassembler.c

diff --git a/ghc/rts/Disassembler.c b/ghc/rts/Disassembler.c
index 6ede8c9..41b66f1 100644 (file)
--- a/ghc/rts/Disassembler.c
+++ b/ghc/rts/Disassembler.c
@@ -4,8 +4,8 @@
  * Copyright (c) 1994-2002.
  *
  * $RCSfile: Disassembler.c,v $
- * $Revision: 1.26 $
- * $Date: 2002/12/11 15:36:41 $
+ * $Revision: 1.28 $
+ * $Date: 2004/08/13 13:09:46 $
  * ---------------------------------------------------------------------------*/
 
 #ifdef DEBUG
@@ -34,7 +34,7 @@ disInstr ( StgBCO *bco, int pc )
 {
    int i;
 
-   StgWord16*     instrs      = (StgWord16*)(BCO_INSTRS(bco));
+   StgWord16*     instrs      = (StgWord16*)(bco->instrs->payload);
 
    StgArrWords*   literal_arr = bco->literals;
    StgWord*       literals    = (StgWord*)(&literal_arr->payload[0]);
@@ -140,9 +140,6 @@ disInstr ( StgBCO *bco, int pc )
       case bci_PUSH_APPLY_PPPPPP:
          fprintf(stderr, "PUSH_APPLY_PPPPPP\n");
          break;
-      case bci_PUSH_APPLY_PPPPPPP:
-         fprintf(stderr, "PUSH_APPLY_PPPPPPP\n");
-         break;
       case bci_SLIDE: 
          fprintf(stderr, "SLIDE     %d down by %d\n", instrs[pc], instrs[pc+1] );
          pc += 2; break;
@@ -249,7 +246,7 @@ disInstr ( StgBCO *bco, int pc )
 void disassemble( StgBCO *bco )
 {
    nat i, j;
-   StgWord16*     instrs    = (StgWord16*)(BCO_INSTRS(bco));
+   StgWord16*     instrs    = (StgWord16*)(bco->instrs->payload);
    StgMutArrPtrs* ptrs      = bco->ptrs;
    nat            nbcs      = (int)instrs[0];
    nat            pc        = 1;