From 5e048459a28b08601a203b25ae9ead6284e8198a Mon Sep 17 00:00:00 2001
From: "Ben.Lippmeier@anu.edu.au" <unknown>
Date: Mon, 23 Feb 2009 06:21:35 +0000
Subject: [PATCH] SPARC NCG: Add jumps to end of blocks when working out
 condition codes

---
 compiler/nativeGen/SPARC/CodeGen/Gen32.hs |   54 +++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
index eb302a7..4ae87df 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
@@ -642,13 +642,23 @@ condIntReg cond x y = do
     bid2@(BlockId _) <- getBlockIdNat
     CondCode _ cond cond_code <- condIntCode cond x y
     let
-	code__2 dst = cond_code `appOL` toOL [
-	    BI cond False bid1, NOP,
-	    OR False g0 (RIImm (ImmInt 0)) dst,
-	    BI ALWAYS False bid2, NOP,
-	    NEWBLOCK bid1,
-	    OR False g0 (RIImm (ImmInt 1)) dst,
-	    NEWBLOCK bid2]
+	code__2 dst 
+	 =	cond_code 
+	  `appOL` toOL 
+		[ BI cond False bid1
+		, NOP
+
+		, OR False g0 (RIImm (ImmInt 0)) dst
+		, BI ALWAYS False bid2
+		, NOP
+
+		, NEWBLOCK bid1
+		, OR False g0 (RIImm (ImmInt 1)) dst
+		, BI ALWAYS False bid2
+		, NOP
+
+		, NEWBLOCK bid2]
+
     return (Any II32 code__2)
 
 
@@ -659,12 +669,26 @@ condFltReg cond x y = do
 
     CondCode _ cond cond_code <- condFltCode cond x y
     let
-    	code__2 dst = cond_code `appOL` toOL [ 
-    	    NOP,
-	    BF cond False bid1, NOP,
-	    OR False g0 (RIImm (ImmInt 0)) dst,
-	    BI ALWAYS False bid2, NOP,
-	    NEWBLOCK bid1,
-	    OR False g0 (RIImm (ImmInt 1)) dst,
-	    NEWBLOCK bid2]
+    	code__2 dst 
+	 = 	cond_code 
+	  `appOL` toOL 
+	  	[ NOP
+		, BF cond False bid1
+		, NOP
+
+		, OR False g0 (RIImm (ImmInt 0)) dst
+		, BI ALWAYS False bid2
+		, NOP
+
+		, NEWBLOCK bid1
+		, OR False g0 (RIImm (ImmInt 1)) dst
+		, BI ALWAYS False bid2
+		, NOP
+
+		, NEWBLOCK bid2 ]
+
     return (Any II32 code__2)
+
+
+
+
-- 
1.7.10.4