projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba7575a
)
Fix warnings in ByteCodeInstr
author
Ian Lynagh
<igloo@earth.li>
Mon, 29 Dec 2008 17:33:31 +0000
(17:33 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Mon, 29 Dec 2008 17:33:31 +0000
(17:33 +0000)
compiler/ghci/ByteCodeInstr.lhs
patch
|
blob
|
history
diff --git
a/compiler/ghci/ByteCodeInstr.lhs
b/compiler/ghci/ByteCodeInstr.lhs
index
1d629c0
..
84472f2
100644
(file)
--- a/
compiler/ghci/ByteCodeInstr.lhs
+++ b/
compiler/ghci/ByteCodeInstr.lhs
@@
-6,13
+6,6
@@
ByteCodeInstrs: Bytecode instruction definitions
\begin{code}
{-# OPTIONS_GHC -funbox-strict-fields #-}
\begin{code}
{-# OPTIONS_GHC -funbox-strict-fields #-}
-{-# 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
--- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
module ByteCodeInstr (
BCInstr(..), ProtoBCO(..), bciStackUse, BreakInfo (..)
) where
module ByteCodeInstr (
BCInstr(..), ProtoBCO(..), bciStackUse, BreakInfo (..)
) where
@@
-34,8
+27,6
@@
import VarSet
import PrimOp
import SMRep
import PrimOp
import SMRep
-import GHC.Ptr
-
import Module (Module)
import GHC.Exts
import Module (Module)
import GHC.Exts
@@
-107,8
+98,8
@@
data BCInstr
| ALLOC_AP !Int -- make an AP with this many payload words
| ALLOC_AP_NOUPD !Int -- make an AP_NOUPD with this many payload words
| ALLOC_PAP !Int !Int -- make a PAP with this arity / payload words
| ALLOC_AP !Int -- make an AP with this many payload words
| ALLOC_AP_NOUPD !Int -- make an AP_NOUPD with this many payload words
| ALLOC_PAP !Int !Int -- make a PAP with this arity / payload words
- | MKAP !Int{-ptr to AP is this far down stack-} !Int{-# words-}
- | MKPAP !Int{-ptr to PAP is this far down stack-} !Int{-# words-}
+ | MKAP !Int{-ptr to AP is this far down stack-} !Int{-number of words-}
+ | MKPAP !Int{-ptr to PAP is this far down stack-} !Int{-number of words-}
| UNPACK !Int -- unpack N words from t.o.s Constr
| PACK DataCon !Int
-- after assembly, the DataCon is an index into the
| UNPACK !Int -- unpack N words from t.o.s Constr
| PACK DataCon !Int
-- after assembly, the DataCon is an index into the
@@
-230,7
+221,7
@@
instance Outputable BCInstr where
ppr ENTER = text "ENTER"
ppr RETURN = text "RETURN"
ppr (RETURN_UBX pk) = text "RETURN_UBX " <+> ppr pk
ppr ENTER = text "ENTER"
ppr RETURN = text "RETURN"
ppr (RETURN_UBX pk) = text "RETURN_UBX " <+> ppr pk
- ppr (BRK_FUN breakArray index info) = text "BRK_FUN" <+> text "<array>" <+> int index <+> ppr info
+ ppr (BRK_FUN _breakArray index info) = text "BRK_FUN" <+> text "<array>" <+> int index <+> ppr info
-- -----------------------------------------------------------------------------
-- The stack use, in words, of each bytecode insn. These _must_ be
-- -----------------------------------------------------------------------------
-- The stack use, in words, of each bytecode insn. These _must_ be