Merge in new code generator branch.

[ghc-hetmet.git] / compiler / nativeGen / SPARC / CodeGen / Expand.hs

diff --git a/compiler/nativeGen/SPARC/CodeGen/Expand.hs b/compiler/nativeGen/SPARC/CodeGen/Expand.hs
index 2becccb..d4500e8 100644 (file)
--- a/compiler/nativeGen/SPARC/CodeGen/Expand.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Expand.hs
@@ -14,7 +14,7 @@ import SPARC.Ppr      ()
 import Instruction
 import Reg
 import Size
 import Instruction
 import Reg
 import Size

-import Cmm
+import OldCmm

 
 
 import Outputable
 
 
 import Outputable

@@ -25,8 +25,8 @@ expandTop :: NatCmmTop Instr -> NatCmmTop Instr
 expandTop top@(CmmData{})
        = top
 
 expandTop top@(CmmData{})
        = top
 

-expandTop (CmmProc info lbl params (ListGraph blocks))
-       = CmmProc info lbl params (ListGraph $ map expandBlock blocks)
+expandTop (CmmProc info lbl (ListGraph blocks))
+       = CmmProc info lbl (ListGraph $ map expandBlock blocks)

 
 
 -- | Expand out synthetic instructions in this block
 
 
 -- | Expand out synthetic instructions in this block