X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FMachRegs.lhs;h=5832abe7861184d803be56e54c57b73835b65240;hb=08652e67c4d5d9a40687f93c286021a867c1bca0;hp=beea181c07a29e4bd65235d5f4d86c75e579f1a4;hpb=220a12e946b80166d3fe20419091135cef01f668;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/MachRegs.lhs b/compiler/nativeGen/MachRegs.lhs
index beea181..5832abe 100644
--- a/compiler/nativeGen/MachRegs.lhs
+++ b/compiler/nativeGen/MachRegs.lhs
@@ -90,7 +90,7 @@ module MachRegs (
 -- HACK: go for the max
 #endif
 
-#include "MachRegs.h"
+#include "../includes/MachRegs.h"
 
 import Cmm
 import MachOp		( MachRep(..) )
@@ -104,10 +104,9 @@ import Unique
 import UniqSet
 import Constants
 import FastTypes
+import FastBool
 import UniqFM
 
-import GHC.Exts
-
 #if powerpc_TARGET_ARCH
 import Data.Word	( Word8, Word16, Word32 )
 import Data.Int 	( Int8, Int16, Int32 )
@@ -503,18 +502,19 @@ worst n classN classC
 -- Compare MachRegs.freeRegs  and MachRegs.h to get these numbers.
 --
 #if i386_TARGET_ARCH
-#define ALLOCATABLE_REGS_INTEGER 3#
-#define ALLOCATABLE_REGS_DOUBLE  6#
-#endif
+#define ALLOCATABLE_REGS_INTEGER (_ILIT(3))
+#define ALLOCATABLE_REGS_DOUBLE  (_ILIT(6))
 
-#if x86_64_TARGET_ARCH
-#define ALLOCATABLE_REGS_INTEGER 5#
-#define ALLOCATABLE_REGS_DOUBLE  2#
-#endif
+#elif x86_64_TARGET_ARCH
+#define ALLOCATABLE_REGS_INTEGER (_ILIT(5))
+#define ALLOCATABLE_REGS_DOUBLE  (_ILIT(2))
 
-#if powerpc_TARGET_ARCH
-#define ALLOCATABLE_REGS_INTEGER 16#
-#define ALLOCATABLE_REGS_DOUBLE  26#
+#elif powerpc_TARGET_ARCH
+#define ALLOCATABLE_REGS_INTEGER (_ILIT(16))
+#define ALLOCATABLE_REGS_DOUBLE  (_ILIT(26))
+
+#else
+#error ToDo: define ALLOCATABLE_REGS_INTEGER and ALLOCATABLE_REGS_DOUBLE
 #endif
 
 {-# INLINE regClass      #-}
@@ -535,17 +535,17 @@ trivColorable classN conflicts exclusions
 		LeafUFM _ reg
 		 -> case regClass reg of
 		 	RcInteger
-			 -> case cI +# 1# of
+			 -> case cI +# _ILIT(1) of
 			  	cI' -> (# cI' >=# ALLOCATABLE_REGS_INTEGER, cI', cF #)
 
 			RcDouble
-			 -> case cF +# 1# of
+			 -> case cF +# _ILIT(1) of
 			 	cF' -> (# cF' >=# ALLOCATABLE_REGS_DOUBLE,  cI, cF' #)
 
 		EmptyUFM
 		 ->	(# False, cI, cF #)
 
-   in case isSqueesed 0# 0# conflicts of
+   in case isSqueesed (_ILIT(0)) (_ILIT(0)) conflicts of
 	(# False, cI', cF' #)
 	 -> case isSqueesed cI' cF' exclusions of
 		(# s, _, _ #)	-> not s