[project @ 2000-03-24 17:49:29 by simonpj]

[ghc-hetmet.git] / ghc / includes / StgMacros.h

diff --git a/ghc/includes/StgMacros.h b/ghc/includes/StgMacros.h
index efa11fc..fb074e8 100644 (file)
--- a/ghc/includes/StgMacros.h
+++ b/ghc/includes/StgMacros.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMacros.h,v 1.22 2000/03/15 17:36:02 simonmar Exp $
+ * $Id: StgMacros.h,v 1.24 2000/03/17 13:30:23 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -365,7 +365,7 @@ EF_(stg_gen_block);
 
 #define THREAD_RETURN(ptrs)                      \
   ASSERT(ptrs==1);                               \
-  CurrentTSO->whatNext = ThreadEnterGHC;         \
+  CurrentTSO->what_next = ThreadEnterGHC;        \
   R1.i = ThreadBlocked;                          \
   JMP_(StgReturn);                               
 #endif
@@ -729,13 +729,11 @@ LoadThreadState (void)
    Module initialisation
    -------------------------------------------------------------------------- */
 
-extern F_ *init_stack;
-
 #define PUSH_INIT_STACK(reg_function)          \
-       *(init_stack++) = (F_)reg_function
+       *(Sp++) = (W_)reg_function
 
 #define POP_INIT_STACK()                       \
-       *(--init_stack)
+       *(--Sp)
 
 #define START_MOD_INIT(reg_mod_name)           \
        static int _module_registered = 0;      \