X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FnativeGen%2FSPARC%2FRegPlate.hs;h=ff42f2b91c5e221e59c0b3cdf9762722085e96ec;hp=38852c507c604170a6f701f2202544adeb82d27d;hb=f9288086f935c97812b2d80defcff38baf7b6a6c;hpb=25ea332f16464c3f9b0f45bd37cfd418dde5fe92

diff --git a/compiler/nativeGen/SPARC/RegPlate.hs b/compiler/nativeGen/SPARC/RegPlate.hs
index 38852c5..ff42f2b 100644
--- a/compiler/nativeGen/SPARC/RegPlate.hs
+++ b/compiler/nativeGen/SPARC/RegPlate.hs
@@ -11,6 +11,8 @@ module SPARC.RegPlate (
 
 where
 
+#include "HsVersions.h"
+
 import Reg
 import CmmExpr
 import FastBool
@@ -19,6 +21,7 @@ import FastBool
 --	These names are the same as the ones in Regs.hs, but those have
 --	type Reg and not RegNo.
 --
+#ifdef sparc_TARGET_ARCH
 
 #define g0	0
 #define g1	1
@@ -96,7 +99,6 @@ import FastBool
 freeReg :: RegNo -> FastBool
 
 
-#ifdef sparc_REGS
 -- SPARC regs used by the OS / ABI
 -- %g0(r0) is always zero
 freeReg g0	= fastBool False
@@ -128,15 +130,15 @@ freeReg	i7	= fastBool False
 freeReg f0	= fastBool False
 freeReg f1	= fastBool False
 	
+{-
 freeReg regNo
 	-- don't release high half of double regs
 	| regNo >= f0
 	, regNo <  NCG_FirstFloatReg
 	, regNo `mod` 2 /= 0
 	= fastBool False
+-}
 --------------------------------------
-#endif
-
 
 
 #ifdef REG_Base
@@ -181,9 +183,15 @@ freeReg REG_F4	= fastBool False
 #ifdef REG_D1
 freeReg REG_D1	= fastBool False
 #endif
+#ifdef REG_D1_2
+freeReg REG_D1_2 = fastBool False
+#endif
 #ifdef REG_D2
 freeReg REG_D2	= fastBool False
 #endif
+#ifdef REG_D2_2
+freeReg REG_D2_2 = fastBool False
+#endif
 #ifdef REG_Sp 
 freeReg REG_Sp	= fastBool False
 #endif 
@@ -207,81 +215,91 @@ freeReg _	= fastBool True
 -- in a real machine register, otherwise returns @'Just' reg@, where
 -- reg is the machine register it is stored in.
 
-globalRegMaybe :: GlobalReg -> Maybe Reg
+
+globalRegMaybe :: GlobalReg -> Maybe RealReg
 
 #ifdef REG_Base
-globalRegMaybe BaseReg			= Just (RealReg REG_Base)
+globalRegMaybe BaseReg			= Just (RealRegSingle REG_Base)
 #endif
 #ifdef REG_R1
-globalRegMaybe (VanillaReg 1 _)		= Just (RealReg REG_R1)
+globalRegMaybe (VanillaReg 1 _)		= Just (RealRegSingle REG_R1)
 #endif 
 #ifdef REG_R2 
-globalRegMaybe (VanillaReg 2 _)		= Just (RealReg REG_R2)
+globalRegMaybe (VanillaReg 2 _)		= Just (RealRegSingle REG_R2)
 #endif 
 #ifdef REG_R3 
-globalRegMaybe (VanillaReg 3 _) 	= Just (RealReg REG_R3)
+globalRegMaybe (VanillaReg 3 _) 	= Just (RealRegSingle REG_R3)
 #endif 
 #ifdef REG_R4 
-globalRegMaybe (VanillaReg 4 _)		= Just (RealReg REG_R4)
+globalRegMaybe (VanillaReg 4 _)		= Just (RealRegSingle REG_R4)
 #endif 
 #ifdef REG_R5 
-globalRegMaybe (VanillaReg 5 _)		= Just (RealReg REG_R5)
+globalRegMaybe (VanillaReg 5 _)		= Just (RealRegSingle REG_R5)
 #endif 
 #ifdef REG_R6 
-globalRegMaybe (VanillaReg 6 _)		= Just (RealReg REG_R6)
+globalRegMaybe (VanillaReg 6 _)		= Just (RealRegSingle REG_R6)
 #endif 
 #ifdef REG_R7 
-globalRegMaybe (VanillaReg 7 _)		= Just (RealReg REG_R7)
+globalRegMaybe (VanillaReg 7 _)		= Just (RealRegSingle REG_R7)
 #endif 
 #ifdef REG_R8 
-globalRegMaybe (VanillaReg 8 _)		= Just (RealReg REG_R8)
+globalRegMaybe (VanillaReg 8 _)		= Just (RealRegSingle REG_R8)
 #endif
 #ifdef REG_R9 
-globalRegMaybe (VanillaReg 9 _)		= Just (RealReg REG_R9)
+globalRegMaybe (VanillaReg 9 _)		= Just (RealRegSingle REG_R9)
 #endif
 #ifdef REG_R10 
-globalRegMaybe (VanillaReg 10 _)	= Just (RealReg REG_R10)
+globalRegMaybe (VanillaReg 10 _)	= Just (RealRegSingle REG_R10)
 #endif
 #ifdef REG_F1
-globalRegMaybe (FloatReg 1)		= Just (RealReg REG_F1)
+globalRegMaybe (FloatReg 1)		= Just (RealRegSingle REG_F1)
 #endif				 	
 #ifdef REG_F2			 	
-globalRegMaybe (FloatReg 2)		= Just (RealReg REG_F2)
+globalRegMaybe (FloatReg 2)		= Just (RealRegSingle REG_F2)
 #endif				 	
 #ifdef REG_F3			 	
-globalRegMaybe (FloatReg 3)		= Just (RealReg REG_F3)
+globalRegMaybe (FloatReg 3)		= Just (RealRegSingle REG_F3)
 #endif				 	
 #ifdef REG_F4			 	
-globalRegMaybe (FloatReg 4)		= Just (RealReg REG_F4)
+globalRegMaybe (FloatReg 4)		= Just (RealRegSingle REG_F4)
 #endif				 	
 #ifdef REG_D1			 	
-globalRegMaybe (DoubleReg 1)		= Just (RealReg REG_D1)
+globalRegMaybe (DoubleReg 1)		= Just (RealRegPair REG_D1 (REG_D1 + 1))
 #endif				 	
 #ifdef REG_D2			 	
-globalRegMaybe (DoubleReg 2)		= Just (RealReg REG_D2)
+globalRegMaybe (DoubleReg 2)		= Just (RealRegPair REG_D2 (REG_D2 + 1))
 #endif
 #ifdef REG_Sp	    
-globalRegMaybe Sp		   	= Just (RealReg REG_Sp)
+globalRegMaybe Sp		   	= Just (RealRegSingle REG_Sp)
 #endif
 #ifdef REG_Lng1			 	
-globalRegMaybe (LongReg 1)		= Just (RealReg REG_Lng1)
+globalRegMaybe (LongReg 1)		= Just (RealRegSingle REG_Lng1)
 #endif				 	
 #ifdef REG_Lng2			 	
-globalRegMaybe (LongReg 2)		= Just (RealReg REG_Lng2)
+globalRegMaybe (LongReg 2)		= Just (RealRegSingle REG_Lng2)
 #endif
 #ifdef REG_SpLim	    			
-globalRegMaybe SpLim		   	= Just (RealReg REG_SpLim)
+globalRegMaybe SpLim		   	= Just (RealRegSingle REG_SpLim)
 #endif	    				
 #ifdef REG_Hp	   			
-globalRegMaybe Hp		   	= Just (RealReg REG_Hp)
+globalRegMaybe Hp		   	= Just (RealRegSingle REG_Hp)
 #endif	    				
 #ifdef REG_HpLim      			
-globalRegMaybe HpLim		   	= Just (RealReg REG_HpLim)
+globalRegMaybe HpLim		   	= Just (RealRegSingle REG_HpLim)
 #endif	    				
 #ifdef REG_CurrentTSO      			
-globalRegMaybe CurrentTSO	   	= Just (RealReg REG_CurrentTSO)
+globalRegMaybe CurrentTSO	   	= Just (RealRegSingle REG_CurrentTSO)
 #endif	    				
 #ifdef REG_CurrentNursery      			
-globalRegMaybe CurrentNursery	   	= Just (RealReg REG_CurrentNursery)
+globalRegMaybe CurrentNursery	   	= Just (RealRegSingle REG_CurrentNursery)
 #endif	    				
 globalRegMaybe _		   	= Nothing
+
+#else
+freeReg :: RegNo -> FastBool
+freeReg		= error "SPARC.RegPlate.freeReg: not defined"
+
+globalRegMaybe :: GlobalReg -> Maybe Reg
+globalRegMaybe	= error "SPARC.RegPlate.globalRegMaybe: not defined"
+
+#endif