Follow vreg/hreg patch in X86_64 NCG

diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index 4ca8f15..8a1c77e 100644 (file)
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -1781,9 +1781,7 @@ genCCall target dest_regs args = do
        assign_code [CmmHinted dest _hint] = 
          case typeWidth rep of
                W32 | isFloatType rep -> unitOL (MOV (floatSize W32) (OpReg xmm0) (OpReg r_dest))
-v v v v v v v
                W64 | isFloatType rep -> unitOL (MOV (floatSize W64) (OpReg xmm0) (OpReg r_dest))
-^ ^ ^ ^ ^ ^ ^
                _ -> unitOL (MOV (cmmTypeSize rep) (OpReg rax) (OpReg r_dest))
          where 
                rep = localRegType dest

diff --git a/compiler/nativeGen/X86/RegInfo.hs b/compiler/nativeGen/X86/RegInfo.hs
index 3c84641..ed420a4 100644 (file)
--- a/compiler/nativeGen/X86/RegInfo.hs
+++ b/compiler/nativeGen/X86/RegInfo.hs
@@ -77,7 +77,7 @@ regColors
        , (r14, "#004040")
        , (r15, "#002080") ]
 
-       ++ zip (map RealReg [16..31]) (repeat "red")
+       ++ zip (map regSingle [16..31]) (repeat "red")
 #else
 regDotColor :: Reg -> SDoc
 regDotColor    = panic "not defined"

diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs
index 9f62c25..ad32eba 100644 (file)
--- a/compiler/nativeGen/X86/Regs.hs
+++ b/compiler/nativeGen/X86/Regs.hs
@@ -108,10 +108,10 @@ virtualRegSqueeze cls vr
                VirtualRegD{}           -> _ILIT(1)
                VirtualRegF{}           -> _ILIT(0)
 
+{-# INLINE realRegSqueeze #-}
 realRegSqueeze :: RegClass -> RealReg -> FastInt
 
 #if defined(i386_TARGET_ARCH)
-{-# INLINE realRegSqueeze #-}
 realRegSqueeze cls rr
  = case cls of
        RcInteger