[project @ 2000-12-11 12:59:25 by simonmar]

bco wibbles.

diff --git a/ghc/includes/Closures.h b/ghc/includes/Closures.h
index a94e23a..136a083 100644 (file)
--- a/ghc/includes/Closures.h
+++ b/ghc/includes/Closures.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: Closures.h,v 1.20 2000/12/11 12:36:59 simonmar Exp $
+ * $Id: Closures.h,v 1.21 2000/12/11 12:59:25 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -176,9 +176,9 @@ typedef struct {
 
 typedef struct {
     StgHeader   header;
-    StgPtr      literals;      /* a pointer to an ArrWords */
-    StgPtr      instrs;                /* a pointer to an ArrWords */
-    StgPtr      ptrs;          /* a pointer to a MutArrPtrs */
+    StgClosure *literals;      /* a pointer to an ArrWords */
+    StgClosure *instrs;                /* a pointer to an ArrWords */
+    StgClosure *ptrs;          /* a pointer to a MutArrPtrs */
 } StgBCO;
 
 typedef struct {

diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc
index 39a1503..efb28c1 100644 (file)
--- a/ghc/rts/PrimOps.hc
+++ b/ghc/rts/PrimOps.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: PrimOps.hc,v 1.61 2000/12/11 12:56:14 simonmar Exp $
+ * $Id: PrimOps.hc,v 1.62 2000/12/11 12:59:25 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -1040,14 +1040,14 @@ FN_(newBCOzh_fast)
   CCS_ALLOC(CCCS,sizeofW(StgBCO)); /* ccs prof */
 
   bco = (StgBCO *) (Hp + 1 - sizeof(StgBCO));
-  SET_HDR(w, &stg_BCO_info, CCCS);
+  SET_HDR(bco, &stg_BCO_info, CCCS);
 
-  w->instrs     = R1.cl;
-  w->literals   = R2.cl;
-  w->ptrs       = R3.cl;
+  bco->instrs     = R1.cl;
+  bco->literals   = R2.cl;
+  bco->ptrs       = R3.cl;
 
   TICK_RET_UNBOXED_TUP(1);
-  RET_P(w);
+  RET_P(bco);
   FE_
 }