Commit f949be57 authored by Ben.Lippmeier.anu.edu.au's avatar Ben.Lippmeier.anu.edu.au
Browse files

Follow vreg/hreg patch in X86_64 NCG

parent 2d498de3
...@@ -1781,9 +1781,7 @@ genCCall target dest_regs args = do ...@@ -1781,9 +1781,7 @@ genCCall target dest_regs args = do
assign_code [CmmHinted dest _hint] = assign_code [CmmHinted dest _hint] =
case typeWidth rep of case typeWidth rep of
W32 | isFloatType rep -> unitOL (MOV (floatSize W32) (OpReg xmm0) (OpReg r_dest)) 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)) W64 | isFloatType rep -> unitOL (MOV (floatSize W64) (OpReg xmm0) (OpReg r_dest))
^ ^ ^ ^ ^ ^ ^
_ -> unitOL (MOV (cmmTypeSize rep) (OpReg rax) (OpReg r_dest)) _ -> unitOL (MOV (cmmTypeSize rep) (OpReg rax) (OpReg r_dest))
where where
rep = localRegType dest rep = localRegType dest
......
...@@ -77,7 +77,7 @@ regColors ...@@ -77,7 +77,7 @@ regColors
, (r14, "#004040") , (r14, "#004040")
, (r15, "#002080") ] , (r15, "#002080") ]
++ zip (map RealReg [16..31]) (repeat "red") ++ zip (map regSingle [16..31]) (repeat "red")
#else #else
regDotColor :: Reg -> SDoc regDotColor :: Reg -> SDoc
regDotColor = panic "not defined" regDotColor = panic "not defined"
......
...@@ -108,10 +108,10 @@ virtualRegSqueeze cls vr ...@@ -108,10 +108,10 @@ virtualRegSqueeze cls vr
VirtualRegD{} -> _ILIT(1) VirtualRegD{} -> _ILIT(1)
VirtualRegF{} -> _ILIT(0) VirtualRegF{} -> _ILIT(0)
{-# INLINE realRegSqueeze #-}
realRegSqueeze :: RegClass -> RealReg -> FastInt realRegSqueeze :: RegClass -> RealReg -> FastInt
#if defined(i386_TARGET_ARCH) #if defined(i386_TARGET_ARCH)
{-# INLINE realRegSqueeze #-}
realRegSqueeze cls rr realRegSqueeze cls rr
= case cls of = case cls of
RcInteger RcInteger
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment