X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAllocInfo.hs;h=2c3ab6b31413a5ce8a0e173d13bf86033fcda1c7;hb=84923cc7de2a93c22a2f72daf9ac863959efae13;hp=98c4e2dfe061310d19ec1cfc1481f1c1e819e5c7;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAllocInfo.hs b/compiler/nativeGen/RegAllocInfo.hs
index 98c4e2d..2c3ab6b 100644
--- a/compiler/nativeGen/RegAllocInfo.hs
+++ b/compiler/nativeGen/RegAllocInfo.hs
@@ -156,6 +156,8 @@ regUsage instr = case instr of
     IDIV   sz op	-> mkRU (eax:edx:use_R op) [eax,edx]
     AND    sz src dst	-> usageRM src dst
     OR     sz src dst	-> usageRM src dst
+    XOR    sz (OpReg src) (OpReg dst)
+        | src == dst    -> mkRU [] [dst]
     XOR    sz src dst	-> usageRM src dst
     NOT    sz op	-> usageM op
     NEGI   sz op	-> usageM op
@@ -224,12 +226,6 @@ regUsage instr = case instr of
     _other		-> panic "regUsage: unrecognised instr"
 
  where
-#if x86_64_TARGET_ARCH
-	-- call parameters: include %eax, because it is used
-	-- to pass the number of SSE reg arguments to varargs fns.
-    params = eax : allArgRegs ++ allFPArgRegs
-#endif
-
     -- 2 operand form; first operand Read; second Written
     usageRW :: Operand -> Operand -> RegUsage
     usageRW op (OpReg reg) = mkRU (use_R op) [reg]
@@ -337,6 +333,7 @@ regUsage instr = case instr of
     CMP   sz reg ri	-> usage (reg : regRI ri,[])
     CMPL  sz reg ri	-> usage (reg : regRI ri,[])
     BCC	  cond lbl	-> noUsage
+    BCCFAR cond lbl	-> noUsage
     MTCTR reg		-> usage ([reg],[])
     BCTR  targets	-> noUsage
     BL    imm params	-> usage (params, callClobberedRegs)
@@ -401,6 +398,7 @@ jumpDests insn acc
 	JMP_TBL _ ids	-> ids ++ acc
 #elif powerpc_TARGET_ARCH
         BCC _ id        -> id : acc
+        BCCFAR _ id     -> id : acc
         BCTR targets    -> targets ++ acc
 #endif
 	_other		-> acc
@@ -414,6 +412,7 @@ patchJump insn old new
 	JMP_TBL op ids -> error "Cannot patch JMP_TBL"
 #elif powerpc_TARGET_ARCH
         BCC cc id | id == old -> BCC cc new
+        BCCFAR cc id | id == old -> BCCFAR cc new
         BCTR targets -> error "Cannot patch BCTR"
 #endif
 	_other		-> insn
@@ -644,6 +643,7 @@ patchRegs instr env = case instr of
     CMP	  sz reg ri	-> CMP sz (env reg) (fixRI ri)
     CMPL  sz reg ri	-> CMPL sz (env reg) (fixRI ri)
     BCC	  cond lbl	-> BCC cond lbl
+    BCCFAR cond lbl	-> BCCFAR cond lbl
     MTCTR reg		-> MTCTR (env reg)
     BCTR  targets	-> BCTR targets
     BL    imm argRegs	-> BL imm argRegs	-- argument regs