X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FnativeGen%2FSPARC%2FCodeGen%2FBase.hs;h=57fb7c9e90e7b4ce7b8c16710f740675a8873f49;hb=889c084e943779e76d19f2ef5e970ff655f511eb;hp=54bbf9b51a7845795b91fb23a1001bb592011aa0;hpb=f9288086f935c97812b2d80defcff38baf7b6a6c;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/SPARC/CodeGen/Base.hs b/compiler/nativeGen/SPARC/CodeGen/Base.hs
index 54bbf9b..57fb7c9 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Base.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Base.hs
@@ -18,10 +18,12 @@ import SPARC.Instr
 import SPARC.Cond
 import SPARC.AddrMode
 import SPARC.Regs
+import SPARC.RegPlate
 import Size
 import Reg
 
-import Cmm
+import OldCmm
+import OldPprCmm ()
 
 import Outputable
 import OrdList
@@ -95,11 +97,11 @@ getRegisterReg (CmmLocal (LocalReg u pk))
   	= RegVirtual $ mkVirtualReg u (cmmTypeSize pk)
 
 getRegisterReg (CmmGlobal mid)
-  = case get_GlobalReg_reg_or_addr mid of
-       Left rr	-> RegReal rr
-
-       _	-> pprPanic "SPARC.CodeGen.Base.getRegisterReg: global is in memory" 
-       				(ppr $ CmmGlobal mid)
+  = case globalRegMaybe mid of
+        Just reg -> RegReal reg
+        Nothing  -> pprPanic
+                        "SPARC.CodeGen.Base.getRegisterReg: global is in memory"
+                        (ppr $ CmmGlobal mid)
 
 
 -- Expand CmmRegOff.  ToDo: should we do it this way around, or convert