X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStgStartup.cmm;h=c3c0bc3dd7cc6c627926d37b4732abc8d383424d;hb=d108044bef62f6a0d579c92ced5e8188f72edc2d;hp=b5a5cdcb2f71ad92aff6eac7cf9fadade5491487;hpb=6015a94f9108a502150565577b66c23650796639;p=ghc-hetmet.git

diff --git a/rts/StgStartup.cmm b/rts/StgStartup.cmm
index b5a5cdc..c3c0bc3 100644
--- a/rts/StgStartup.cmm
+++ b/rts/StgStartup.cmm
@@ -28,9 +28,7 @@
     ASSERT(Hp != 0);			\
     ASSERT(Sp != 0);			\
     ASSERT(SpLim != 0);			\
-    ASSERT(HpLim != 0);			\
-    ASSERT(SpLim - WDS(RESERVED_STACK_WORDS) <= Sp); \
-    ASSERT(HpLim >= Hp);
+    ASSERT(SpLim - WDS(RESERVED_STACK_WORDS) <= Sp);
 
 /* -----------------------------------------------------------------------------
    Returning from the STG world.
@@ -147,18 +145,10 @@ stg_threadFinished
 
 INFO_TABLE_RET( stg_forceIO, RET_SMALL)
 
-#ifdef REG_R1
 {
   Sp_adj(1);
   ENTER();
 }
-#else
-{
-  R1 = Sp(0);
-  Sp_adj(2);
-  ENTER();
-}
-#endif
 
 /* -----------------------------------------------------------------------------
     Non-strict IO application.
@@ -171,18 +161,10 @@ INFO_TABLE_RET( stg_forceIO, RET_SMALL)
 
 INFO_TABLE_RET( stg_noforceIO, RET_SMALL )
 
-#ifdef REG_R1
 {
   Sp_adj(1);
   jump %ENTRY_CODE(Sp(0));
 }
-#else
-{
-  R1 = Sp(0);
-  Sp_adj(2);
-  jump %ENTRY_CODE(Sp(0));
-}
-#endif
 
 /* -----------------------------------------------------------------------------
    Special STG entry points for module registration.