diff options
| author | Ben.Lippmeier.anu.edu.au <unknown> | 2009-05-27 04:01:01 +0000 |
|---|---|---|
| committer | Ben.Lippmeier.anu.edu.au <unknown> | 2009-05-27 04:01:01 +0000 |
| commit | f949be5748e7a99ec323b8d59144e322e9e86eb1 (patch) | |
| tree | a162a374810b664da1c87b79359aa5f8f218cac4 /compiler | |
| parent | 2d498de3fd7a8f60621c601e419fe7cb14788b1c (diff) | |
| download | haskell-f949be5748e7a99ec323b8d59144e322e9e86eb1.tar.gz | |
Follow vreg/hreg patch in X86_64 NCG
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/nativeGen/X86/CodeGen.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/X86/RegInfo.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/X86/Regs.hs | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index 4ca8f15840..8a1c77e1df 100644 --- 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 3c84641c22..ed420a41b0 100644 --- 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 9f62c25f0a..ad32ebac2f 100644 --- 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 |