X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmmLayout.hs;h=5daceedc431c285934e4a994af2a3a804eb38352;hb=785e4ab34b25c6f023183d6fabf5e74b27b416f9;hp=1269897f4e99b115fc500a86126f40da00e8ee3d;hpb=e6243a818496aad82b6f47511d3bd9bc800f747d;p=ghc-hetmet.git

diff --git a/compiler/codeGen/StgCmmLayout.hs b/compiler/codeGen/StgCmmLayout.hs
index 1269897..5daceed 100644
--- a/compiler/codeGen/StgCmmLayout.hs
+++ b/compiler/codeGen/StgCmmLayout.hs
@@ -77,14 +77,18 @@ emitReturn :: [CmmExpr] -> FCode ()
 --	return (x,y)
 -- If the sequel is AssignTo [p,q]
 --	p=x; q=y; 
-emitReturn results 
-  = do  { adjustHpBackwards
-	; sequel    <- getSequel;
-	; updfr_off <- getUpdFrameOff
-	; case sequel of
-	    Return _        -> emit (mkReturnSimple results updfr_off)
-	    AssignTo regs _ -> emit (mkMultiAssign  regs results)
-    }
+emitReturn results
+  = do { sequel    <- getSequel;
+       ; updfr_off <- getUpdFrameOff
+       ; emit $ mkComment $ mkFastString "emitReturn"
+       ; case sequel of
+           Return _ ->
+             do { adjustHpBackwards
+                ; emit (mkReturnSimple results updfr_off) }
+           AssignTo regs adjust ->
+             do { if adjust then adjustHpBackwards else return ()
+                ; emit (mkMultiAssign  regs results) }
+       }
 
 emitCall :: Convention -> CmmExpr -> [CmmExpr] -> FCode ()
 -- (cgCall fun args) makes a call to the entry-code of 'fun', 
@@ -93,10 +97,10 @@ emitCall conv fun args
   = do	{ adjustHpBackwards
 	; sequel <- getSequel
 	; updfr_off <- getUpdFrameOff
-        ; emit $ mkComment $ mkFastString "emitcall"
+        ; emit $ mkComment $ mkFastString "emitCall"
 	; case sequel of
-	    Return _              -> emit (mkForeignJump conv fun args updfr_off)
-	    AssignTo res_regs srt -> emit (mkCall fun conv res_regs args updfr_off)
+	    Return _            -> emit (mkForeignJump conv fun args updfr_off)
+	    AssignTo res_regs _ -> emit (mkCall fun conv res_regs args updfr_off)
     }
 
 adjustHpBackwards :: FCode ()
@@ -162,10 +166,7 @@ direct_call caller lbl arity args reps
   | otherwise		-- Over-saturated call
   = ASSERT( arity == length initial_reps )
     do	{ pap_id <- newTemp gcWord
-	; let srt = pprTrace "Urk! SRT for over-sat call" 
-			     (ppr lbl) NoC_SRT
-		-- XXX: what if rest_args contains static refs?
-	; withSequel (AssignTo [pap_id] srt)
+	; withSequel (AssignTo [pap_id] True)
 		     (emitCall Native target fast_args)
 	; slow_call (CmmReg (CmmLocal pap_id)) 
 		    rest_args rest_reps }
@@ -471,9 +472,7 @@ emitClosureProcAndInfoTable top_lvl bndr cl_info args body
         -- top-level binding, which this binding would incorrectly shadow.
         ; node <- if top_lvl then return $ idToReg (NonVoid bndr)
                   else bindToReg (NonVoid bndr) lf_info
-        ; arg_regs <-
-            pprTrace "bindArgsToRegs" (ppr args) $
-            bindArgsToRegs args
+        ; arg_regs <- bindArgsToRegs args
         ; emitClosureAndInfoTable cl_info (node : arg_regs) $ body (node, arg_regs)
         }