projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
089482e
)
NCG: Validate fixes for powerpc
author
Ben.Lippmeier@anu.edu.au
<unknown>
Fri, 13 Feb 2009 00:47:25 +0000
(
00:47
+0000)
committer
Ben.Lippmeier@anu.edu.au
<unknown>
Fri, 13 Feb 2009 00:47:25 +0000
(
00:47
+0000)
compiler/nativeGen/PPC/Regs.hs
patch
|
blob
|
history
compiler/nativeGen/RegAlloc/Linear/Main.hs
patch
|
blob
|
history
compiler/nativeGen/Regs.hs
patch
|
blob
|
history
compiler/nativeGen/X86/Regs.hs
patch
|
blob
|
history
diff --git
a/compiler/nativeGen/PPC/Regs.hs
b/compiler/nativeGen/PPC/Regs.hs
index
d6993b2
..
850bbf4
100644
(file)
--- a/
compiler/nativeGen/PPC/Regs.hs
+++ b/
compiler/nativeGen/PPC/Regs.hs
@@
-490,7
+490,7
@@
freeReg REG_Hp = fastBool False
#ifdef REG_HpLim
freeReg REG_HpLim = fastBool False
#endif
#ifdef REG_HpLim
freeReg REG_HpLim = fastBool False
#endif
-freeReg n = fastBool True
+freeReg _ = fastBool True
-- | Returns 'Nothing' if this global register is not stored
-- | Returns 'Nothing' if this global register is not stored
diff --git
a/compiler/nativeGen/RegAlloc/Linear/Main.hs
b/compiler/nativeGen/RegAlloc/Linear/Main.hs
index
7f977d1
..
c838301
100644
(file)
--- a/
compiler/nativeGen/RegAlloc/Linear/Main.hs
+++ b/
compiler/nativeGen/RegAlloc/Linear/Main.hs
@@
-98,6
+98,8
@@
import RegAlloc.Linear.Stats
import RegAlloc.Linear.JoinToTargets
import RegAlloc.Liveness
import RegAlloc.Linear.JoinToTargets
import RegAlloc.Liveness
+-- import PprMach
+
import BlockId
import Regs
import Instrs
import BlockId
import Regs
import Instrs
diff --git
a/compiler/nativeGen/Regs.hs
b/compiler/nativeGen/Regs.hs
index
c93ecdd
..
5239520
100644
(file)
--- a/
compiler/nativeGen/Regs.hs
+++ b/
compiler/nativeGen/Regs.hs
@@
-58,7
+58,7
@@
module Regs (
allFPArgRegs,
fits16Bits,
makeImmediate,
allFPArgRegs,
fits16Bits,
makeImmediate,
- freg,
+ fReg,
sp, r3, r4, r27, r28, f1, f20, f21,
#elif i386_TARGET_ARCH || x86_64_TARGET_ARCH
sp, r3, r4, r27, r28, f1, f20, f21,
#elif i386_TARGET_ARCH || x86_64_TARGET_ARCH
diff --git
a/compiler/nativeGen/X86/Regs.hs
b/compiler/nativeGen/X86/Regs.hs
index
be83ad6
..
1f1c724
100644
(file)
--- a/
compiler/nativeGen/X86/Regs.hs
+++ b/
compiler/nativeGen/X86/Regs.hs
@@
-70,7
+70,10
@@
import Outputable ( Outputable(..), pprPanic, panic )
import qualified Outputable
import Unique
import FastBool
import qualified Outputable
import Unique
import FastBool
+
+#if defined(i386_TARGET_ARCH) || defined(x86_64_TARGET_ARCH)
import Constants
import Constants
+#endif
-- -----------------------------------------------------------------------------
-- Sizes on this architecture
-- -----------------------------------------------------------------------------
-- Sizes on this architecture
@@
-439,8
+442,10
@@
xmm n = RealReg (16+n)
-- horror show -----------------------------------------------------------------
-- horror show -----------------------------------------------------------------
-freeReg :: RegNo -> FastBool
-globalRegMaybe :: GlobalReg -> Maybe Reg
+freeReg :: RegNo -> FastBool
+globalRegMaybe :: GlobalReg -> Maybe Reg
+allArgRegs :: [Reg]
+callClobberedRegs :: [Reg]
#if defined(i386_TARGET_ARCH) || defined(x86_64_TARGET_ARCH)
#if defined(i386_TARGET_ARCH) || defined(x86_64_TARGET_ARCH)
@@
-651,7
+656,6
@@
globalRegMaybe CurrentNursery = Just (RealReg REG_CurrentNursery)
globalRegMaybe _ = Nothing
--
globalRegMaybe _ = Nothing
--
-allArgRegs :: [Reg]
#if i386_TARGET_ARCH
allArgRegs = panic "X86.Regs.allArgRegs: should not be used!"
#if i386_TARGET_ARCH
allArgRegs = panic "X86.Regs.allArgRegs: should not be used!"
@@
-665,7
+669,6
@@
allArgRegs = panic "X86.Regs.allArgRegs: not defined for this architecture"
-- | these are the regs which we cannot assume stay alive over a C call.
-- | these are the regs which we cannot assume stay alive over a C call.
-callClobberedRegs :: [Reg]
#if i386_TARGET_ARCH
-- caller-saves registers
#if i386_TARGET_ARCH
-- caller-saves registers