X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FMachRegs.lhs;h=aabe13e30dbc61c1fc31f3c856af919ba1b1e727;hb=4070b105490709e2fbc40ef926853fc93595b7a6;hp=446e7dd7941366bd75c712c7efdaf0f5624c8bc3;hpb=e0e07f52be0e7518bbd5eea1e3b374b3e09c910c;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/MachRegs.lhs b/ghc/compiler/nativeGen/MachRegs.lhs
index 446e7dd..aabe13e 100644
--- 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 Stix		( sStLitLbl, StixTree(..), StixReg(..) )
+import Stix		( sStLitLbl, StixTree(..), StixReg(..),
+                          getUniqueNat, returnNat, thenNat, NatM )
 import Unique		( mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3,
 			  Uniquable(..), Unique
 			)
-import UniqSupply	( getUniqueUs, returnUs, thenUs, UniqSM )
+--import UniqSupply	( getUniqueUs, returnUs, thenUs, UniqSM )
 import Outputable
 \end{code}
 
@@ -270,10 +271,10 @@ data Reg
 mkReg :: Unique -> PrimRep -> Reg
 mkReg = UnmappedReg
 
-getNewRegNCG :: PrimRep -> UniqSM Reg
+getNewRegNCG :: PrimRep -> NatM Reg
 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)