X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAllocInfo.hs;h=57c9ce6e1a7f4a8fa4c38c252600b5eea7bdbd53;hb=e8043f339e23328e3457696589edaa1ab7d60a64;hp=bab6c2f4fe94339cf99ae49e96db3e65ff2c6825;hpb=d7d09c18459983be1ef690e0d9136a8736b1976f;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAllocInfo.hs b/compiler/nativeGen/RegAllocInfo.hs
index bab6c2f..57c9ce6 100644
--- a/compiler/nativeGen/RegAllocInfo.hs
+++ b/compiler/nativeGen/RegAllocInfo.hs
@@ -21,6 +21,7 @@ module RegAllocInfo (
 	regUsage,
 	patchRegs,
 	jumpDests,
+	isJumpish,
 	patchJump,
 	isRegRegMove,
 
@@ -433,8 +434,42 @@ jumpDests insn acc
 #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
@@ -444,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