X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FZipCfgCmmRep.hs;h=d83e7e29264161dc537ec8af87894d4f0b166f21;hb=eb4427afd02f653087fa3d2720193b625b6411ee;hp=43f57a0f35688457b0dd27bcc54f3026205fa3a9;hpb=5d1c70a506f366eca47464f2a354de8cc0d9a795;p=ghc-hetmet.git

diff --git a/compiler/cmm/ZipCfgCmmRep.hs b/compiler/cmm/ZipCfgCmmRep.hs
index 43f57a0..d83e7e2 100644
--- a/compiler/cmm/ZipCfgCmmRep.hs
+++ b/compiler/cmm/ZipCfgCmmRep.hs
@@ -29,7 +29,6 @@ import CmmTx
 import CLabel
 import FastString
 import ForeignCall
-import qualified ZipCfg as Z
 import qualified ZipDataflow as DF
 import ZipCfg 
 import MkZipCfg
@@ -37,10 +36,9 @@ import Util
 
 import BasicTypes
 import Maybes
-import Monad
+import Control.Monad
 import Outputable
 import Prelude hiding (zip, unzip, last)
-import qualified Data.List as L
 import SMRep (ByteOff)
 import UniqSupply
 
@@ -87,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
@@ -110,19 +124,21 @@ data MidCallTarget	-- The target of a MidUnsafeCall
   deriving Eq
 
 data Convention
-  = NativeCall   -- Native C-- call
+  = NativeDirectCall -- Native C-- call skipping the node (closure) argument
+  
+  | NativeNodeCall   -- Native C-- call including the node argument
 
-  | NativeReturn -- Native C-- return
+  | NativeReturn     -- Native C-- return
 
-  | Slow         -- Slow entry points: all args pushed on the stack
+  | Slow             -- Slow entry points: all args pushed on the stack
 
-  | GC           -- Entry to the garbage collector: uses the node reg!
+  | GC               -- Entry to the garbage collector: uses the node reg!
 
-  | PrimOpCall   -- Calling prim ops
+  | PrimOpCall       -- Calling prim ops
 
-  | PrimOpReturn -- Returning from prim ops
+  | PrimOpReturn     -- Returning from prim ops
 
-  | Foreign      -- Foreign call/return
+  | Foreign          -- Foreign call/return
         ForeignConvention
 
   | Private
@@ -520,14 +536,15 @@ genFullCondBranch expr t f =
          ]
 
 pprConvention :: Convention -> SDoc
-pprConvention (NativeCall   {}) = text "<native-call-convention>"
-pprConvention (NativeReturn {}) = text "<native-ret-convention>"
-pprConvention  Slow             = text "<slow-convention>"
-pprConvention  GC               = text "<gc-convention>"
-pprConvention  PrimOpCall       = text "<primop-call-convention>"
-pprConvention  PrimOpReturn     = text "<primop-ret-convention>"
-pprConvention (Foreign c)       = ppr c
-pprConvention (Private {})      = text "<private-convention>"
+pprConvention (NativeNodeCall   {}) = text "<native-node-call-convention>"
+pprConvention (NativeDirectCall {}) = text "<native-direct-call-convention>"
+pprConvention (NativeReturn {})     = text "<native-ret-convention>"
+pprConvention  Slow                 = text "<slow-convention>"
+pprConvention  GC                   = text "<gc-convention>"
+pprConvention  PrimOpCall           = text "<primop-call-convention>"
+pprConvention  PrimOpReturn         = text "<primop-ret-convention>"
+pprConvention (Foreign c)           = ppr c
+pprConvention (Private {})          = text "<private-convention>"
 
 pprForeignConvention :: ForeignConvention -> SDoc
 pprForeignConvention (ForeignConvention c as rs) = ppr c <> ppr as <> ppr rs