[project @ 2000-06-23 12:09:00 by sewardj]

Minor mods to make fully-optimised builds of Hugs work again.

diff --git a/ghc/interpreter/hugs.c b/ghc/interpreter/hugs.c
index 508091b..67c637b 100644 (file)
--- a/ghc/interpreter/hugs.c
+++ b/ghc/interpreter/hugs.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: hugs.c,v $
- * $Revision: 1.76 $
- * $Date: 2000/06/23 09:41:11 $
+ * $Revision: 1.77 $
+ * $Date: 2000/06/23 12:09:01 $
  * ------------------------------------------------------------------------*/
 
 #include <setjmp.h>
@@ -393,7 +393,7 @@ static List /*CONID*/ initialize ( Int argc, String argv[] )
    readOptions("-p\"%s> \" -r$$");
    readOptions(fromEnv("STGHUGSFLAGS",""));
 
-#  if DEBUG
+#  ifdef DEBUG
    { 
       char exe_name[N_INSTALLDIR + 6];
       strcpy(exe_name, installDir);

diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c
index 8248f2a..d03f683 100644 (file)
--- a/ghc/rts/Evaluator.c
+++ b/ghc/rts/Evaluator.c
@@ -5,8 +5,8 @@
  * Copyright (c) 1994-1998.
  *
  * $RCSfile: Evaluator.c,v $
- * $Revision: 1.55 $
- * $Date: 2000/06/15 13:23:51 $
+ * $Revision: 1.56 $
+ * $Date: 2000/06/23 12:09:00 $
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
@@ -1357,6 +1357,20 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 )
             Case(i_VAR_WORD_big):
             Case(i_RETADDR_big):
             Case(i_ALLOC_PAP):
+
+            Case(i_UNPACK_INJ):
+            Case(i_UNPACK_ROW):
+            Case(i_TEST_INJ_CONST):
+            Case(i_TEST_INJ_big):
+            Case(i_TEST_INJ):
+            Case(i_PACK_INJ_CONST):
+            Case(i_PACK_INJ_big):
+            Case(i_PACK_INJ):
+            Case(i_PACK_ROW_big):
+            Case(i_PACK_ROW):
+            Case(i_ALLOC_ROW_big):
+            Case(i_ALLOC_ROW):
+
                     bciPtr--;
                     printf ( "\n\n" );
                     disInstr ( bco, PC );