diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-03-21 12:30:12 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-03-21 12:30:12 +0000 |
| commit | c4167f75518bcdeab38b33ca39920ae9170d5345 (patch) | |
| tree | 4c5284c7daf19d3e1fb88a3b7f6992b873959005 /compiler/nativeGen | |
| parent | d0a477123cd6ba5c4d6bb2c650e532d7d972fbf9 (diff) | |
| download | haskell-c4167f75518bcdeab38b33ca39920ae9170d5345.tar.gz | |
Rename allArgRegs to allIntArgRegs
Diffstat (limited to 'compiler/nativeGen')
| -rw-r--r-- | compiler/nativeGen/X86/CodeGen.hs | 4 | ||||
| -rw-r--r-- | compiler/nativeGen/X86/Regs.hs | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index 9bcd77bcbd..1478bffb60 100644 --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -1963,11 +1963,11 @@ genCCall64' :: Platform genCCall64' platform target dest_regs args = do -- load up the register arguments (stack_args, aregs, fregs, load_args_code) - <- load_args args allArgRegs allFPArgRegs nilOL + <- load_args args allIntArgRegs allFPArgRegs nilOL let fp_regs_used = reverse (drop (length fregs) (reverse allFPArgRegs)) - int_regs_used = reverse (drop (length aregs) (reverse allArgRegs)) + int_regs_used = reverse (drop (length aregs) (reverse allIntArgRegs)) arg_regs = [eax] ++ int_regs_used ++ fp_regs_used -- for annotating the call instruction with sse_regs = length fp_regs_used diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs index 9c4c2629c3..e0ddfc49f0 100644 --- a/compiler/nativeGen/X86/Regs.hs +++ b/compiler/nativeGen/X86/Regs.hs @@ -15,7 +15,7 @@ module X86.Regs ( -- registers spRel, argRegs, - allArgRegs, + allIntArgRegs, callClobberedRegs, allMachRegNos, classOfRealReg, @@ -406,7 +406,7 @@ xmm n = regSingle (firstxmm+n) -- horror show ----------------------------------------------------------------- freeReg :: RegNo -> FastBool globalRegMaybe :: GlobalReg -> Maybe RealReg -allArgRegs :: [Reg] +allIntArgRegs :: [Reg] callClobberedRegs :: [Reg] #if defined(i386_TARGET_ARCH) || defined(x86_64_TARGET_ARCH) @@ -626,17 +626,17 @@ globalRegMaybe _ = Nothing -- #if i386_TARGET_ARCH -allArgRegs = panic "X86.Regs.allArgRegs: should not be used!" +allIntArgRegs = panic "X86.Regs.allIntArgRegs: should not be used!" #elif x86_64_TARGET_ARCH #if defined(mingw32_HOST_OS) -allArgRegs = map regSingle [rcx,rdx,r8,r9] +allIntArgRegs = map regSingle [rcx,rdx,r8,r9] #else -allArgRegs = map regSingle [rdi,rsi,rdx,rcx,r8,r9] +allIntArgRegs = map regSingle [rdi,rsi,rdx,rcx,r8,r9] #endif #else -allArgRegs = panic "X86.Regs.allArgRegs: not defined for this architecture" +allIntArgRegs = panic "X86.Regs.allIntArgRegs: not defined for this architecture" #endif @@ -665,7 +665,7 @@ callClobberedRegs freeReg _ = 0# globalRegMaybe _ = panic "X86.Regs.globalRegMaybe: not defined" -allArgRegs = panic "X86.Regs.globalRegMaybe: not defined" +allIntArgRegs = panic "X86.Regs.globalRegMaybe: not defined" callClobberedRegs = panic "X86.Regs.globalRegMaybe: not defined" |