projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the IND_OLDGEN and IND_OLDGEN_PERM closure types
[ghc-hetmet.git]
/
utils
/
genapply
/
GenApply.hs
diff --git
a/utils/genapply/GenApply.hs
b/utils/genapply/GenApply.hs
index
fe792a1
..
d9e6041
100644
(file)
--- a/
utils/genapply/GenApply.hs
+++ b/
utils/genapply/GenApply.hs
@@
-1,15
+1,15
@@
{-# OPTIONS -cpp -fglasgow-exts #-}
{-# OPTIONS -cpp -fglasgow-exts #-}
-{-# OPTIONS_GHC -w #-}
+{-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
--- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
-- for details
module Main(main) where
#include "../../includes/ghcconfig.h"
-- for details
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"
-- 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 ", "
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 F = text "F_"
argRep D = text "D_"
argRep L = text "L_"
+argRep P = text "gcptr"
argRep _ = text "W_"
genApply regstatus args =
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 " [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_STATIC] &&ind_lbl,"
-- print " [IND_PERM] &&ind_lbl,"
--- print " [IND_OLDGEN_PERM] &&ind_lbl"
-- print " };"
tickForArity (length args),
-- print " };"
tickForArity (length args),
@@
-564,10
+562,8
@@
genApply regstatus args =
-- else:
text "case AP,",
text " AP_STACK,",
-- else:
text "case AP,",
text " AP_STACK,",
- text " CAF_BLACKHOLE,",
text " BLACKHOLE,",
text " BLACKHOLE,",
- text " SE_BLACKHOLE,",
- text " SE_CAF_BLACKHOLE,",
+ text " WHITEHOLE,",
text " THUNK,",
text " THUNK_1_0,",
text " THUNK_0_1,",
text " THUNK,",
text " THUNK_1_0,",
text " THUNK_0_1,",
@@
-592,10
+588,8
@@
genApply regstatus args =
-- print " ind_lbl:"
-- else:
text "case IND,",
-- print " ind_lbl:"
-- else:
text "case IND,",
- text " IND_OLDGEN,",
text " IND_STATIC,",
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
nest 4 (vcat [
text "R1 = StgInd_indirectee(R1);",
-- An indirection node might contain a tagged pointer