X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FZipCfgCmmRep.hs;h=451450e6f0b4ad44ac215dcb7f97fa3bc5334bcc;hp=f99a7eb3872236cbc698ac5987f749e8fa9715ea;hb=f96194794bf099020706c3816d1a5678b40addbb;hpb=d436c70d43fb905c63220040168295e473f4b90a

diff --git a/compiler/cmm/ZipCfgCmmRep.hs b/compiler/cmm/ZipCfgCmmRep.hs
index f99a7eb..451450e 100644
--- a/compiler/cmm/ZipCfgCmmRep.hs
+++ b/compiler/cmm/ZipCfgCmmRep.hs
@@ -36,7 +36,7 @@ import Util
 
 import BasicTypes
 import Maybes
-import Monad
+import Control.Monad
 import Outputable
 import Prelude hiding (zip, unzip, last)
 import SMRep (ByteOff)
@@ -85,18 +85,34 @@ data Last
         --      one  -> second block etc
         -- Undefined outside range, and when there's a Nothing
   | LastCall {                   -- A call (native or safe foreign)
-        cml_target  :: CmmExpr,  -- never a CmmPrim to a CallishMachOp!
-        cml_cont    :: Maybe BlockId,
+        cml_target :: CmmExpr,  -- never a CmmPrim to a CallishMachOp!
+
+        cml_cont :: Maybe BlockId,
             -- BlockId of continuation (Nothing for return or tail call)
-        cml_args    :: ByteOff,  -- byte offset for youngest outgoing arg
-                                 -- (includes update frame, which must be younger)
-        cml_ret_args:: ByteOff,  -- byte offset for youngest incoming arg
-        cml_ret_off :: Maybe UpdFrameOffset}
-          -- stack offset for return (update frames);
-          -- The return offset should be Nothing only if we have to create
-          -- a new call, e.g. for a procpoint, in which case it's an invariant
-          -- that the call does not stand for a return or a tail call,
-          -- and the successor does not need an info table.
+
+        cml_args :: ByteOff, 
+ 	    -- Byte offset, from the *old* end of the Area associated with
+            -- the BlockId (if cml_cont = Nothing, then Old area), of
+            -- youngest outgoing arg.  Set the stack pointer to this before
+	    -- transferring control.
+  	    -- (NB: an update frame might also have been stored in the Old
+	    --      area, but it'll be in an older part than the args.)
+
+        cml_ret_args :: ByteOff,  
+	    -- For calls *only*, the byte offset for youngest returned value
+	    -- This is really needed at the *return* point rather than here
+	    -- at the call, but in practice it's convenient to record it here.
+
+        cml_ret_off :: Maybe ByteOff
+          -- For calls *only*, the byte offset of the base of the frame that
+	  -- must be described by the info table for the return point.  
+ 	  -- The older words are an update frames, which have their own
+	  -- info-table and layout information
+
+	  -- From a liveness point of view, the stack words older than
+	  -- cml_ret_off are treated as live, even if the sequel of
+	  -- the call goes into a loop.
+	}
 
 data MidCallTarget	-- The target of a MidUnsafeCall
   = ForeignTarget 	-- A foreign procedure
@@ -443,10 +459,9 @@ pprMiddle stmt = pp_stmt <+> pp_debug
     	-- call "ccall" foo(x, y)[r1, r2];
     	-- ToDo ppr volatile
     	MidForeignCall safety target results args ->
-    	    hsep [ if null results
-    	              then empty
-    	              else parens (commafy $ map ppr results) <+> equals,
-                      ppr_safety safety,
+    	    hsep [ ppUnless (null results) $
+    	              parens (commafy $ map ppr results) <+> equals,
+                   ppr_safety safety,
     	           ptext $ sLit "call", 
     	           ppr_call_target target <> parens (commafy $ map ppr args) <> semi]