NCG: Split RegAllocInfo into arch specific modules

[ghc-hetmet.git] / compiler / nativeGen / Regs.hs

diff --git a/compiler/nativeGen/Regs.hs b/compiler/nativeGen/Regs.hs
index 97ecee6..76a9752 100644 (file)
--- a/compiler/nativeGen/Regs.hs
+++ b/compiler/nativeGen/Regs.hs
@@ -61,18 +61,11 @@ module Regs (
        freg,
        sp, r3, r4, r27, r28, f1, f20, f21,
 
        freg,
        sp, r3, r4, r27, r28, f1, f20, f21,
 

-#elif i386_TARGET_ARCH
+#elif i386_TARGET_ARCH || i386_64_TARGET_ARCH

        EABase(..), EAIndex(..), addrModeRegs,
        
        eax, ebx, ecx, edx, esi, edi, ebp, esp,
        fake0, fake1, fake2, fake3, fake4, fake5,
        EABase(..), EAIndex(..), addrModeRegs,
        
        eax, ebx, ecx, edx, esi, edi, ebp, esp,
        fake0, fake1, fake2, fake3, fake4, fake5,

-
-#elif i386_64_TARGET_ARCH
-       EABase(..), EAIndex(..), addrModeRegs, 
-
-       ripRel,
-       allFPArgRegs,
-       

        rax, rbx, rcx, rdx, rsi, rdi, rbp, rsp,
        eax, ebx, ecx, edx, esi, edi, ebp, esp,
        r8, r9, r10, r11, r12, r13, r14, r15,
        rax, rbx, rcx, rdx, rsi, rdi, rbp, rsp,
        eax, ebx, ecx, edx, esi, edi, ebp, esp,
        r8, r9, r10, r11, r12, r13, r14, r15,

@@ -80,6 +73,9 @@ module Regs (
        xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
        xmm,
 
        xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
        xmm,
 

+       ripRel,
+       allFPArgRegs,
+

 #elif sparc_TARGET_ARCH
        fpRel,
        fits13Bits, 
 #elif sparc_TARGET_ARCH
        fpRel,
        fits13Bits,