diff options
author | Ian Lynagh <ian@well-typed.com> | 2012-08-21 16:41:30 +0100 |
---|---|---|
committer | Ian Lynagh <ian@well-typed.com> | 2012-08-21 16:44:51 +0100 |
commit | 6d3fb1b1efee263f07da47693147990e8443ab1d (patch) | |
tree | f61678c3b8da7ad81a3c8a110e52305cf821b7fc /compiler/codeGen/CodeGen/Platform | |
parent | d4ac7d8160b3533c7d0a2377b5442038f69486a8 (diff) | |
download | haskell-6d3fb1b1efee263f07da47693147990e8443ab1d.tar.gz |
Fix the generation of CallerSaves; fixes #7163
Simon Marlow spotted that we were #include'ing MachRegs.h several times,
but that doesn't work as (a) it uses ifdeffery to avoid being included
multiple times, and (b) even if we work around that, then the #define's
from previous inclusions are still defined when we #include it again.
So we now put the platform code for each platform in a separate .hs file.
Diffstat (limited to 'compiler/codeGen/CodeGen/Platform')
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/ARM.hs | 9 | ||||
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/NoRegs.hs | 8 | ||||
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/PPC.hs | 9 | ||||
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 10 | ||||
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/SPARC.hs | 9 | ||||
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/X86.hs | 9 | ||||
-rw-r--r-- | compiler/codeGen/CodeGen/Platform/X86_64.hs | 9 |
7 files changed, 63 insertions, 0 deletions
diff --git a/compiler/codeGen/CodeGen/Platform/ARM.hs b/compiler/codeGen/CodeGen/Platform/ARM.hs new file mode 100644 index 0000000000..0116139313 --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/ARM.hs @@ -0,0 +1,9 @@ + +module CodeGen.Platform.ARM (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 0 +#define MACHREGS_arm 1 +#include "../../../../includes/CallerSaves.part.hs" + diff --git a/compiler/codeGen/CodeGen/Platform/NoRegs.hs b/compiler/codeGen/CodeGen/Platform/NoRegs.hs new file mode 100644 index 0000000000..ff39dd90ae --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/NoRegs.hs @@ -0,0 +1,8 @@ + +module CodeGen.Platform.NoRegs (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 1 +#include "../../../../includes/CallerSaves.part.hs" + diff --git a/compiler/codeGen/CodeGen/Platform/PPC.hs b/compiler/codeGen/CodeGen/Platform/PPC.hs new file mode 100644 index 0000000000..c4c975a58f --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/PPC.hs @@ -0,0 +1,9 @@ + +module CodeGen.Platform.PPC (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 0 +#define MACHREGS_powerpc 1 +#include "../../../../includes/CallerSaves.part.hs" + diff --git a/compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs b/compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs new file mode 100644 index 0000000000..a0cbe7e433 --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs @@ -0,0 +1,10 @@ + +module CodeGen.Platform.PPC_Darwin (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 0 +#define MACHREGS_powerpc 1 +#define MACHREGS_darwin 1 +#include "../../../../includes/CallerSaves.part.hs" + diff --git a/compiler/codeGen/CodeGen/Platform/SPARC.hs b/compiler/codeGen/CodeGen/Platform/SPARC.hs new file mode 100644 index 0000000000..86b949469e --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/SPARC.hs @@ -0,0 +1,9 @@ + +module CodeGen.Platform.SPARC (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 0 +#define MACHREGS_sparc 1 +#include "../../../../includes/CallerSaves.part.hs" + diff --git a/compiler/codeGen/CodeGen/Platform/X86.hs b/compiler/codeGen/CodeGen/Platform/X86.hs new file mode 100644 index 0000000000..c19bf9dcfb --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/X86.hs @@ -0,0 +1,9 @@ + +module CodeGen.Platform.X86 (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 0 +#define MACHREGS_i386 1 +#include "../../../../includes/CallerSaves.part.hs" + diff --git a/compiler/codeGen/CodeGen/Platform/X86_64.hs b/compiler/codeGen/CodeGen/Platform/X86_64.hs new file mode 100644 index 0000000000..59cf788e43 --- /dev/null +++ b/compiler/codeGen/CodeGen/Platform/X86_64.hs @@ -0,0 +1,9 @@ + +module CodeGen.Platform.X86_64 (callerSaves) where + +import CmmExpr + +#define MACHREGS_NO_REGS 0 +#define MACHREGS_x86_64 1 +#include "../../../../includes/CallerSaves.part.hs" + |