X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmOpt.hs;h=2dced6ae9cb0d44d8e2805fcdb2a7483cf82d8a7;hb=4e0c994eb1613c62e94069642d7acdb2e69b773b;hp=81630737c6eb48747b4a496f502cb12890690f8d;hpb=6e9501c0e3c3bb807981c0378c969d0667a7ce0b;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmOpt.hs b/compiler/cmm/CmmOpt.hs
index 8163073..2dced6a 100644
--- a/compiler/cmm/CmmOpt.hs
+++ b/compiler/cmm/CmmOpt.hs
@@ -259,6 +259,8 @@ cmmMachOpFold mop args@[CmmLit (CmmInt x xrep), CmmLit (CmmInt y _)]
     	MO_Add r -> CmmLit (CmmInt (x + y) r)
     	MO_Sub r -> CmmLit (CmmInt (x - y) r)
     	MO_Mul r -> CmmLit (CmmInt (x * y) r)
+    	MO_U_Quot r | y /= 0 -> CmmLit (CmmInt (x_u `quot` y_u) r)
+    	MO_U_Rem  r | y /= 0 -> CmmLit (CmmInt (x_u `rem`  y_u) r)
     	MO_S_Quot r | y /= 0 -> CmmLit (CmmInt (x `quot` y) r)
     	MO_S_Rem  r | y /= 0 -> CmmLit (CmmInt (x `rem` y) r)
 
@@ -431,12 +433,15 @@ cmmMachOpFold mop args@[x, y@(CmmLit (CmmInt n _))]
     	MO_Mul rep
 	   | Just p <- exactLog2 n ->
                  CmmMachOp (MO_Shl rep) [x, CmmLit (CmmInt p rep)]
+    	MO_U_Quot rep
+	   | Just p <- exactLog2 n ->
+                 CmmMachOp (MO_U_Shr rep) [x, CmmLit (CmmInt p rep)]
     	MO_S_Quot rep
 	   | Just p <- exactLog2 n, 
 	     CmmReg _ <- x ->	-- We duplicate x below, hence require
 				-- it is a reg.  FIXME: remove this restriction.
 		-- shift right is not the same as quot, because it rounds
-		-- to minus infinity, whereasq uot rounds toward zero.
+		-- to minus infinity, whereasq quot rounds toward zero.
 		-- To fix this up, we add one less than the divisor to the
 		-- dividend if it is a negative number.
 		--