X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgForeignCall.hs;h=c4af511b84243d0d2402afe434800d9654f06e43;hb=bd3a364da7956c269d31645995d0d775c52f6a84;hp=e66e1b8ead6af5d860396e3541c93ddcd4e34aa8;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs
index e66e1b8..c4af511 100644
--- a/compiler/codeGen/CgForeignCall.hs
+++ b/compiler/codeGen/CgForeignCall.hs
@@ -2,7 +2,7 @@
 --
 -- Code generation for foreign calls.
 --
--- (c) The University of Glasgow 2004
+-- (c) The University of Glasgow 2004-2006
 --
 -----------------------------------------------------------------------------
 
@@ -19,24 +19,30 @@ module CgForeignCall (
 
 #include "HsVersions.h"
 
-import StgSyn		( StgLiveVars, StgArg, stgArgType )
-import CgProf		( curCCS, curCCSAddr )
-import CgBindery	( getVolatileRegs, getArgAmodes )
+import StgSyn
+import CgProf
+import CgBindery
 import CgMonad
-import CgUtils		( cmmOffsetW, cmmOffsetB, newTemp )
-import Type		( tyConAppTyCon, repType )
+import CgUtils
+import Type
 import TysPrim
-import CLabel		( mkForeignLabel, mkRtsCodeLabel )
+import CLabel
 import Cmm
 import CmmUtils
 import MachOp
 import SMRep
 import ForeignCall
 import Constants
-import StaticFlags	( opt_SccProfilingOn )
+import StaticFlags
 import Outputable
 
-import Monad		( when )
+import MachRegs (callerSaveVolatileRegs)
+  -- HACK: this is part of the NCG so we shouldn't use this, but we need
+  -- it for now to eliminate the need for saved regs to be in CmmCall.
+  -- The long term solution is to factor callerSaveVolatileRegs
+  -- from nativeGen into codeGen
+
+import Control.Monad
 
 -- -----------------------------------------------------------------------------
 -- Code generation for Foreign Calls
@@ -105,29 +111,33 @@ emitForeignCall'
 emitForeignCall' safety results target args vols 
   | not (playSafe safety) = do
     temp_args <- load_args_into_temps args
-    stmtC (CmmCall target results temp_args vols)
+    let (caller_save, caller_load) = callerSaveVolatileRegs vols
+    stmtsC caller_save
+    stmtC (CmmCall target results temp_args)
+    stmtsC caller_load
 
   | otherwise = do
     id <- newTemp wordRep
     temp_args <- load_args_into_temps args
+    temp_target <- load_target_into_temp target
+    let (caller_save, caller_load) = callerSaveVolatileRegs vols
     emitSaveThreadState
+    stmtsC caller_save
     stmtC (CmmCall (CmmForeignCall suspendThread CCallConv) 
 			[(id,PtrHint)]
 			[ (CmmReg (CmmGlobal BaseReg), PtrHint) ] 
-			vols
 			)
-    stmtC (CmmCall target results temp_args vols)
+    stmtC (CmmCall temp_target results temp_args)
     stmtC (CmmCall (CmmForeignCall resumeThread CCallConv) 
 			[ (CmmGlobal BaseReg, PtrHint) ]
 				-- Assign the result to BaseReg: we
 				-- might now have a different
 				-- Capability!
 			[ (CmmReg id, PtrHint) ]
-			vols
 			)
+    stmtsC caller_load
     emitLoadThreadState
 
-
 suspendThread = CmmLit (CmmLabel (mkRtsCodeLabel SLIT("suspendThread")))
 resumeThread  = CmmLit (CmmLabel (mkRtsCodeLabel SLIT("resumeThread")))
 
@@ -139,16 +149,25 @@ resumeThread  = CmmLit (CmmLabel (mkRtsCodeLabel SLIT("resumeThread")))
 --
 -- This is a HACK; really it should be done in the back end, but
 -- it's easier to generate the temporaries here.
-load_args_into_temps args = mapM maybe_assignTemp args
+load_args_into_temps = mapM arg_assign_temp
+  where arg_assign_temp (e,hint) = do
+	   tmp <- maybe_assign_temp e
+	   return (tmp,hint)
 	
-maybe_assignTemp (e, hint)
-  | hasNoGlobalRegs e = return (e, hint)
+load_target_into_temp (CmmForeignCall expr conv) = do 
+  tmp <- maybe_assign_temp expr
+  return (CmmForeignCall tmp conv)
+load_target_info_temp other_target =
+  return other_target
+
+maybe_assign_temp e
+  | hasNoGlobalRegs e = return e
   | otherwise          = do 
 	-- don't use assignTemp, it uses its own notion of "trivial"
 	-- expressions, which are wrong here
 	reg <- newTemp (cmmExprRep e)
 	stmtC (CmmAssign reg e)
-	return (CmmReg reg, hint)
+	return (CmmReg reg)
 
 -- -----------------------------------------------------------------------------
 -- Save/restore the thread state in the TSO