X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAllocInfo.hs;h=57c9ce6e1a7f4a8fa4c38c252600b5eea7bdbd53;hb=51cae5224f2f2f5db8b3196d0f5118ba4246701a;hp=0992f6eca8b41d8c1b74bdd9a38587ce0fef0b1e;hpb=598d761c769316dc4550028285f6508538b8a99c;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAllocInfo.hs b/compiler/nativeGen/RegAllocInfo.hs
index 0992f6e..57c9ce6 100644
--- a/compiler/nativeGen/RegAllocInfo.hs
+++ b/compiler/nativeGen/RegAllocInfo.hs
@@ -21,6 +21,7 @@ module RegAllocInfo (
 	regUsage,
 	patchRegs,
 	jumpDests,
+	isJumpish,
 	patchJump,
 	isRegRegMove,
 
@@ -295,7 +296,10 @@ regUsage instr = case instr of
     SUB   x cc r1 ar r2	-> usage (r1 : regRI ar, [r2])
     UMUL    cc r1 ar r2	-> usage (r1 : regRI ar, [r2])
     SMUL    cc r1 ar r2	-> usage (r1 : regRI ar, [r2])
+    UDIV    cc r1 ar r2 -> usage (r1 : regRI ar, [r2])
+    SDIV    cc r1 ar r2 -> usage (r1 : regRI ar, [r2])
     RDY   rd            -> usage ([], [rd])
+    WRY   r1 r2         -> usage ([r1, r2], [])
     AND   b r1 ar r2  	-> usage (r1 : regRI ar, [r2])
     ANDN  b r1 ar r2 	-> usage (r1 : regRI ar, [r2])
     OR    b r1 ar r2   	-> usage (r1 : regRI ar, [r2])
@@ -317,8 +321,8 @@ regUsage instr = case instr of
     FSUB  s r1 r2 r3 	-> usage ([r1, r2], [r3])
     FxTOy s1 s2 r1 r2 	-> usage ([r1], [r2])
 
-    -- We assume that all local jumps will be BI/BF.  JMP must be out-of-line.
-    JMP   addr 	        -> usage (regAddr addr, [])
+    JMP     addr 	-> usage (regAddr addr, [])
+    JMP_TBL addr ids    -> usage (regAddr addr, [])
 
     CALL  (Left imm)  n True  -> noUsage
     CALL  (Left imm)  n False -> usage (argRegs n, callClobberedRegs)
@@ -421,11 +425,51 @@ jumpDests insn acc
         BCC _ id        -> id : acc
         BCCFAR _ id     -> id : acc
         BCTR targets    -> targets ++ acc
+#elif sparc_TARGET_ARCH
+	BI   _ _ id	-> id : acc
+	BF   _ _ id	-> id : acc
+	JMP_TBL _ ids	-> ids ++ acc
+#else
+#error "RegAllocInfo.jumpDests not finished"
 #endif
 	_other		-> acc
 
-patchJump :: Instr -> BlockId -> BlockId -> Instr
 
+-- | Check whether a particular instruction is a jump, branch or call instruction (jumpish)
+--	We can't just use jumpDests above because the jump might take its arg,
+--	so the instr won't contain a blockid.
+--
+isJumpish :: Instr -> Bool
+isJumpish instr
+ = case instr of
+#if i386_TARGET_ARCH || x86_64_TARGET_ARCH
+	JMP{}		-> True
+	JXX{}		-> True
+	JXX_GBL{}	-> True
+	JMP_TBL{}	-> True
+	CALL{}		-> True
+
+#elif powerpc_TARGET_ARCH
+	BCC{}		-> True
+	BCCFAR{}	-> True
+	JMP{}		-> True
+	
+#elif sparc_TARGET_ARCH
+	BI{}		-> True
+	BF{}		-> True
+	JMP{}		-> True
+	JMP_TBL{}	-> True
+	CALL{}		-> True
+#else
+#error	"RegAllocInfo.isJumpish: not implemented for this architecture"
+#endif
+	_		-> False
+	
+
+-- | Change the destination of this jump instruction
+--	Used in joinToTargets in the linear allocator, when emitting fixup code
+--	for join points.
+patchJump :: Instr -> BlockId -> BlockId -> Instr
 patchJump insn old new
   = case insn of
 #if i386_TARGET_ARCH || x86_64_TARGET_ARCH
@@ -435,6 +479,14 @@ patchJump insn old new
         BCC cc id | id == old -> BCC cc new
         BCCFAR cc id | id == old -> BCCFAR cc new
         BCTR targets -> error "Cannot patch BCTR"
+#elif sparc_TARGET_ARCH
+	BI cc annul id
+	 | id == old	-> BI cc annul new
+	 
+	BF cc annul id
+	 | id == old	-> BF cc annul new
+#else
+#error	"RegAllocInfo.patchJump not finished"
 #endif
 	_other		-> insn
 
@@ -664,7 +716,10 @@ patchRegs instr env = case instr of
     SUB   x cc r1 ar r2 -> SUB x cc (env r1) (fixRI ar) (env r2)
     UMUL    cc r1 ar r2	-> UMUL cc (env r1) (fixRI ar) (env r2)
     SMUL    cc r1 ar r2	-> SMUL cc (env r1) (fixRI ar) (env r2)
+    UDIV    cc r1 ar r2	-> UDIV cc (env r1) (fixRI ar) (env r2)
+    SDIV    cc r1 ar r2	-> SDIV cc (env r1) (fixRI ar) (env r2)
     RDY   rd            -> RDY (env rd)
+    WRY   r1 r2		-> WRY (env r1) (env r2)
     AND   b r1 ar r2    -> AND b (env r1) (fixRI ar) (env r2)
     ANDN  b r1 ar r2    -> ANDN b (env r1) (fixRI ar) (env r2)
     OR    b r1 ar r2    -> OR b (env r1) (fixRI ar) (env r2)
@@ -685,7 +740,10 @@ patchRegs instr env = case instr of
     FSQRT s r1 r2       -> FSQRT s (env r1) (env r2)
     FSUB  s r1 r2 r3    -> FSUB s (env r1) (env r2) (env r3)
     FxTOy s1 s2 r1 r2   -> FxTOy s1 s2 (env r1) (env r2)
-    JMP   addr          -> JMP (fixAddr addr)
+
+    JMP     addr        -> JMP     (fixAddr addr)
+    JMP_TBL addr ids    -> JMP_TBL (fixAddr addr) ids
+
     CALL  (Left i) n t  -> CALL (Left i) n t
     CALL  (Right r) n t -> CALL (Right (env r)) n t
     _ -> instr
@@ -908,7 +966,7 @@ mkBranchInstr id = [JXX ALWAYS id]
 #endif
 
 #if sparc_TARGET_ARCH
-mkBranchInstr (BlockId id) = [BI ALWAYS False (ImmCLbl (mkAsmTempLabel id)), NOP]
+mkBranchInstr id = [BI ALWAYS False id, NOP]
 #endif
 
 #if powerpc_TARGET_ARCH