X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fgenapply%2FGenApply.hs;h=d9e6041a61327a840410a8b8837b1d76167067a9;hb=HEAD;hp=9d0febb59f8552d4e8e021e050c0839e17f6b8d0;hpb=d600bf7a6afdbfc4a22f9379406a9c6f789a4c2d;p=ghc-hetmet.git

diff --git a/utils/genapply/GenApply.hs b/utils/genapply/GenApply.hs
index 9d0febb..d9e6041 100644
--- a/utils/genapply/GenApply.hs
+++ b/utils/genapply/GenApply.hs
@@ -8,8 +8,8 @@
 module Main(main) where
 
 #include "../../includes/ghcconfig.h"
-#include "../../includes/MachRegs.h"
-#include "../../includes/Constants.h"
+#include "../../includes/stg/MachRegs.h"
+#include "../../includes/rts/Constants.h"
 
 -- Needed for TAG_BITS
 #include "../../includes/MachDeps.h"
@@ -426,12 +426,12 @@ formalParam V _ = empty
 formalParam arg n =
     formalParamType arg <> space <>
     text "arg" <> int n <> text ", "
-formalParamType arg | isPtr arg = text "\"ptr\"" <> space <> argRep arg
-                    | otherwise = argRep arg
+formalParamType arg = argRep arg
 
 argRep F = text "F_"
 argRep D = text "D_"
 argRep L = text "L_"
+argRep P = text "gcptr"
 argRep _ = text "W_"
 
 genApply regstatus args =
@@ -467,10 +467,8 @@ genApply regstatus args =
 --        print "    [THUNK_STATIC]    &&thunk_lbl,"
 --        print "    [THUNK_SELECTOR]  &&thunk_lbl,"
 --        print "    [IND]	      &&ind_lbl,"
---        print "    [IND_OLDGEN]      &&ind_lbl,"
 --        print "    [IND_STATIC]      &&ind_lbl,"
 --        print "    [IND_PERM]	      &&ind_lbl,"
---        print "    [IND_OLDGEN_PERM] &&ind_lbl"
 --        print "  };"
     
        tickForArity (length args),
@@ -564,8 +562,8 @@ genApply regstatus args =
 --    else:
 	text "case AP,",
 	text "     AP_STACK,",
-	text "     CAF_BLACKHOLE,",
 	text "     BLACKHOLE,",
+	text "     WHITEHOLE,",
         text "     THUNK,",
         text "     THUNK_1_0,",
         text "     THUNK_0_1,",
@@ -590,10 +588,8 @@ genApply regstatus args =
 --        print "    ind_lbl:"
 --    else:
         text "case IND,",
-        text "     IND_OLDGEN,",
         text "     IND_STATIC,",
-        text "     IND_PERM,",
-        text "     IND_OLDGEN_PERM: {",
+        text "     IND_PERM: {",
 	nest 4 (vcat [
 	  text "R1 = StgInd_indirectee(R1);",
             -- An indirection node might contain a tagged pointer