projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-02-28 12:02:31 by sewardj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
nativeGen
/
MachRegs.lhs
diff --git
a/ghc/compiler/nativeGen/MachRegs.lhs
b/ghc/compiler/nativeGen/MachRegs.lhs
index
446e7dd
..
aabe13e
100644
(file)
--- a/
ghc/compiler/nativeGen/MachRegs.lhs
+++ b/
ghc/compiler/nativeGen/MachRegs.lhs
@@
-64,11
+64,12
@@
import AbsCUtils ( magicIdPrimRep )
import CLabel ( CLabel )
import PrimOp ( PrimOp(..) )
import PrimRep ( PrimRep(..) )
import CLabel ( CLabel )
import PrimOp ( PrimOp(..) )
import PrimRep ( PrimRep(..) )
-import Stix ( sStLitLbl, StixTree(..), StixReg(..) )
+import Stix ( sStLitLbl, StixTree(..), StixReg(..),
+ getUniqueNat, returnNat, thenNat, NatM )
import Unique ( mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3,
Uniquable(..), Unique
)
import Unique ( mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3,
Uniquable(..), Unique
)
-import UniqSupply ( getUniqueUs, returnUs, thenUs, UniqSM )
+--import UniqSupply ( getUniqueUs, returnUs, thenUs, UniqSM )
import Outputable
\end{code}
import Outputable
\end{code}
@@
-270,10
+271,10
@@
data Reg
mkReg :: Unique -> PrimRep -> Reg
mkReg = UnmappedReg
mkReg :: Unique -> PrimRep -> Reg
mkReg = UnmappedReg
-getNewRegNCG :: PrimRep -> UniqSM Reg
+getNewRegNCG :: PrimRep -> NatM Reg
getNewRegNCG pk
getNewRegNCG pk
- = getUniqueUs `thenUs` \ u ->
- returnUs (UnmappedReg u pk)
+ = getUniqueNat `thenNat` \ u ->
+ returnNat (UnmappedReg u pk)
instance Text Reg where
showsPrec _ (FixedReg i) = showString "%" . shows IBOX(i)
instance Text Reg where
showsPrec _ (FixedReg i) = showString "%" . shows IBOX(i)