projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
ghci
/
ByteCodeInstr.lhs
diff --git
a/ghc/compiler/ghci/ByteCodeInstr.lhs
b/ghc/compiler/ghci/ByteCodeInstr.lhs
index
05c4fe4
..
43c5515
100644
(file)
--- a/
ghc/compiler/ghci/ByteCodeInstr.lhs
+++ b/
ghc/compiler/ghci/ByteCodeInstr.lhs
@@
-17,11
+17,10
@@
import Id ( Id )
import CoreSyn
import PprCore ( pprCoreExpr, pprCoreAlt )
import Literal ( Literal )
import CoreSyn
import PprCore ( pprCoreExpr, pprCoreAlt )
import Literal ( Literal )
-import PrimRep ( PrimRep )
import DataCon ( DataCon )
import VarSet ( VarSet )
import PrimOp ( PrimOp )
import DataCon ( DataCon )
import VarSet ( VarSet )
import PrimOp ( PrimOp )
-import SMRep ( StgWord )
+import SMRep ( StgWord, CgRep )
import GHC.Ptr
-- ----------------------------------------------------------------------------
import GHC.Ptr
-- ----------------------------------------------------------------------------
@@
-59,7
+58,7
@@
data BCInstr
-- Push an alt continuation
| PUSH_ALTS (ProtoBCO Name)
-- Push an alt continuation
| PUSH_ALTS (ProtoBCO Name)
- | PUSH_ALTS_UNLIFTED (ProtoBCO Name) PrimRep
+ | PUSH_ALTS_UNLIFTED (ProtoBCO Name) CgRep
-- Pushing literals
| PUSH_UBX (Either Literal (Ptr ())) Int
-- Pushing literals
| PUSH_UBX (Either Literal (Ptr ())) Int
@@
-125,7
+124,7
@@
data BCInstr
-- To Infinity And Beyond
| ENTER
| RETURN -- return a lifted value
-- To Infinity And Beyond
| ENTER
| RETURN -- return a lifted value
- | RETURN_UBX PrimRep -- return an unlifted value, here's its rep
+ | RETURN_UBX CgRep -- return an unlifted value, here's its rep
-- -----------------------------------------------------------------------------
-- Printing bytecode instructions
-- -----------------------------------------------------------------------------
-- Printing bytecode instructions