X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FMachCodeGen.hs;h=3abf6a43e25e43eab51f6ea36c28a4ca32042480;hb=46b28f7bfdd535e9fe5217a1151bedfb2cc15472;hp=d371214cf52352171d9810e063cf8c4a6312bff0;hpb=72475c8247406b64b8d5d9441c0b37b17d703a54;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/MachCodeGen.hs b/compiler/nativeGen/MachCodeGen.hs
index d371214..3abf6a4 100644
--- a/compiler/nativeGen/MachCodeGen.hs
+++ b/compiler/nativeGen/MachCodeGen.hs
@@ -265,6 +265,17 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
    -- in
    return (ChildCode64 code rlo)
 
+iselExpr64 (CmmMachOp (MO_U_Conv _ I64) [expr]) = do
+     fn <- getAnyReg expr
+     r_dst_lo <-  getNewRegNat I32
+     let r_dst_hi = getHiVRegFromLo r_dst_lo
+         code = fn r_dst_lo
+     return (
+             ChildCode64 (code `snocOL` 
+                          MOV I32 (OpImm (ImmInt 0)) (OpReg r_dst_hi))
+                          r_dst_lo
+            )
+
 iselExpr64 expr
    = pprPanic "iselExpr64(i386)" (ppr expr)
 
@@ -3363,8 +3374,8 @@ genCCall target dest_regs args vols = do
          setDeltaNat (delta-arg_size)
 	 let code' = code `appOL` arg_code `appOL` toOL [
 			SUB wordRep (OpImm (ImmInt arg_size)) (OpReg rsp) ,
-			MOV arg_rep (OpReg arg_reg) (OpAddr  (spRel 0)),
-	 		DELTA (delta-arg_size)]
+	 		DELTA (delta-arg_size),
+			MOV arg_rep (OpReg arg_reg) (OpAddr  (spRel 0))]
 	 push_args rest code'
 
        | otherwise = do