[project @ 2001-07-09 19:45:16 by sof]

Hmm..are the Cambridge offices running low on oxygen? Desloppified to make stage2 work again

diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/ghc/compiler/ghci/ByteCodeLink.lhs
index d94d0fb..320138d 100644 (file)
--- a/ghc/compiler/ghci/ByteCodeLink.lhs
+++ b/ghc/compiler/ghci/ByteCodeLink.lhs
@@ -334,10 +334,10 @@ mkBits findLabel st proto_insns
           = addr st ret_itbl_addr
             where
                ret_itbl_addr = case pk of
-                                  CharRep   -> stg_gc_unbx_r1_info
-                                  IntRep    -> stg_gc_unbx_r1_info
-                                  FloatRep  -> stg_gc_f1_info
-                                  DoubleRep -> stg_gc_d1_info
+                                  CharRep   -> stg_gc_unbx_r1_ret_info
+                                  IntRep    -> stg_gc_unbx_r1_ret_info
+                                  FloatRep  -> stg_gc_f1_ret_info
+                                  DoubleRep -> stg_gc_d1_ret_info
                                   VoidRep   -> nullAddr  
                                   -- Interpreter.c spots this special case
                      
@@ -347,9 +347,9 @@ foreign label "stg_ctoi_ret_F1_info"  stg_ctoi_ret_F1_info :: Addr
 foreign label "stg_ctoi_ret_D1_info"  stg_ctoi_ret_D1_info :: Addr
 foreign label "stg_ctoi_ret_V_info"   stg_ctoi_ret_V_info :: Addr
 
-foreign label "stg_gc_unbx_r1_ret_info" stg_gc_unbx_r1_info :: Addr
-foreign label "stg_gc_f1_ret_info"      stg_gc_f1_info :: Addr
-foreign label "stg_gc_d1_ret_info"      stg_gc_d1_info :: Addr
+foreign label "stg_gc_unbx_r1_ret_info" stg_gc_unbx_r1_ret_info :: Addr
+foreign label "stg_gc_f1_ret_info"      stg_gc_f1_ret_info :: Addr
+foreign label "stg_gc_d1_ret_info"      stg_gc_d1_ret_info :: Addr
 
 -- The size in 16-bit entities of an instruction.
 instrSize16s :: BCInstr -> Int

diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h
index 3e028ce..eeaaf3a 100644 (file)
--- a/ghc/includes/StgMiscClosures.h
+++ b/ghc/includes/StgMiscClosures.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMiscClosures.h,v 1.38 2001/03/22 03:51:09 hwloidl Exp $
+ * $Id: StgMiscClosures.h,v 1.39 2001/07/09 19:45:16 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -74,9 +74,9 @@ extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_V_info;
 
 /* Used by the interpreter to return an unboxed value on the stack to
    compiled code. */
-extern DLL_IMPORT_RTS const StgInfoTable stg_gc_unbx_r1_info;
-extern DLL_IMPORT_RTS const StgInfoTable stg_gc_f1_info;
-extern DLL_IMPORT_RTS const StgInfoTable stg_gc_d1_info;
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_unbx_r1_ret_info;
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_f1_ret_info;
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_d1_ret_info;
 
 /* this is the NIL ptr for a TSO queue (e.g. runnable queue) */
 #define END_TSO_QUEUE  ((StgTSO *)(void*)&stg_END_TSO_QUEUE_closure)