From e5e7d10bb9fc69e58a78540a4a4bf34124730f48 Mon Sep 17 00:00:00 2001 From: "dias@eecs.tufts.edu" Date: Tue, 17 Mar 2009 20:42:38 +0000 Subject: [PATCH] Calling convention bug and cleanup - yet another wrong calling convention; this one was a special case for returning one value. --- compiler/cmm/CmmCallConv.hs | 97 ++++++++++++++++++++++--------------- compiler/cmm/MkZipCfgCmm.hs | 2 + compiler/codeGen/CgCallConv.hs | 1 - compiler/codeGen/CgTailCall.lhs | 2 +- compiler/codeGen/StgCmmExpr.hs | 2 - compiler/codeGen/StgCmmForeign.hs | 3 +- 6 files changed, 63 insertions(+), 44 deletions(-) diff --git a/compiler/cmm/CmmCallConv.hs b/compiler/cmm/CmmCallConv.hs index 243072e..b7e528b 100644 --- a/compiler/cmm/CmmCallConv.hs +++ b/compiler/cmm/CmmCallConv.hs @@ -34,7 +34,7 @@ type ArgumentFormat a b = [(a, ParamLocation b)] assignArguments :: (a -> CmmType) -> [a] -> ArgumentFormat a WordOff assignArguments f reps = assignments where - availRegs = getRegs False + availRegs = getRegsWithNode (sizes, assignments) = unzip $ assignArguments' reps (negate (sum sizes)) availRegs assignArguments' [] _ _ = [] assignArguments' (r:rs) offset availRegs = @@ -53,13 +53,22 @@ assignArguments f reps = assignments assignArgumentsPos :: (Outputable a) => Convention -> Bool -> (a -> CmmType) -> [a] -> ArgumentFormat a ByteOff assignArgumentsPos conv isCall arg_ty reps = map cvt assignments - where - regs = case conv of Native -> getRegs isCall - GC -> getRegs False - PrimOp -> if isCall then noStack else getRegs isCall - Slow -> noRegs - _ -> getRegs isCall - -- _ -> panic "unrecognized calling convention" + where -- The calling conventions (CgCallConv.hs) are complicated, to say the least + regs = if isCall then + case (reps, conv) of + (_, Native) -> getRegsWithoutNode + (_, GC ) -> getRegsWithNode + (_, PrimOp) -> allRegs + (_, Slow ) -> noRegs + (_, _ ) -> getRegsWithoutNode + else + case (reps, conv) of + ([_], _) -> allRegs + (_, Native) -> getRegsWithNode + (_, GC ) -> getRegsWithNode + (_, PrimOp) -> getRegsWithNode + (_, Slow ) -> noRegs + (_, _ ) -> getRegsWithNode (sizes, assignments) = unzip $ assignArguments' reps (sum sizes) regs assignArguments' [] _ _ = [] assignArguments' (r:rs) offset avails = @@ -92,29 +101,38 @@ type AvailRegs = ( [VGcPtr -> GlobalReg] -- available vanilla regs. -- We take these register supplies from the *real* registers, i.e. those -- that are guaranteed to map to machine registers. -useVanillaRegs, useFloatRegs, useDoubleRegs, useLongRegs :: Int -useVanillaRegs | opt_Unregisterised = 0 - | otherwise = mAX_Real_Vanilla_REG -useFloatRegs | opt_Unregisterised = 0 - | otherwise = mAX_Real_Float_REG -useDoubleRegs | opt_Unregisterised = 0 - | otherwise = mAX_Real_Double_REG -useLongRegs | opt_Unregisterised = 0 - | otherwise = mAX_Real_Long_REG - -getRegs :: Bool -> AvailRegs -getRegs reserveNode = - (if reserveNode then filter (\r -> r VGcPtr /= node) intRegs else intRegs, - regList FloatReg useFloatRegs, - regList DoubleReg useDoubleRegs, - regList LongReg useLongRegs) - where - regList f max = map f [1 .. max] - intRegs = regList VanillaReg useVanillaRegs - -noStack :: AvailRegs -noStack = (map VanillaReg any, map FloatReg any, map DoubleReg any, map LongReg any) - where any = [1 .. ] +vanillaRegNos, floatRegNos, doubleRegNos, longRegNos :: [Int] +vanillaRegNos | opt_Unregisterised = [] + | otherwise = regList mAX_Real_Vanilla_REG +floatRegNos | opt_Unregisterised = [] + | otherwise = regList mAX_Real_Float_REG +doubleRegNos | opt_Unregisterised = [] + | otherwise = regList mAX_Real_Double_REG +longRegNos | opt_Unregisterised = [] + | otherwise = regList mAX_Real_Long_REG + +-- +getRegsWithoutNode, getRegsWithNode :: AvailRegs +getRegsWithoutNode = + (filter (\r -> r VGcPtr /= node) intRegs, + map FloatReg floatRegNos, map DoubleReg doubleRegNos, map LongReg longRegNos) + where intRegs = map VanillaReg vanillaRegNos +getRegsWithNode = + (intRegs, map FloatReg floatRegNos, map DoubleReg doubleRegNos, map LongReg longRegNos) + where intRegs = map VanillaReg vanillaRegNos + +allVanillaRegNos, allFloatRegNos, allDoubleRegNos, allLongRegNos :: [Int] +allVanillaRegNos = regList mAX_Vanilla_REG +allFloatRegNos = regList mAX_Float_REG +allDoubleRegNos = regList mAX_Double_REG +allLongRegNos = regList mAX_Long_REG + +regList :: Int -> [Int] +regList n = [1 .. n] + +allRegs :: AvailRegs +allRegs = (map VanillaReg allVanillaRegNos, map FloatReg allFloatRegNos, + map DoubleReg allDoubleRegNos, map LongReg allLongRegNos) noRegs :: AvailRegs noRegs = ([], [], [], []) @@ -157,15 +175,16 @@ assign_slot_pos width off _regs = -- On calls in the native convention, `node` is used to hold the environment -- for the closure, so we can't pass arguments in that register. -assign_bits_reg :: SlotAssigner -> Width -> WordOff -> VGcPtr -> AvailRegs - -> Assignment +assign_bits_reg :: SlotAssigner -> Width -> WordOff -> VGcPtr -> AvailRegs -> Assignment assign_bits_reg _ W128 _ _ _ = panic "W128 is not a supported register type" -assign_bits_reg assign_slot w off gcp regs@(v:vs, fs, ds, ls) = - if widthInBits w <= widthInBits wordWidth then - (RegisterParam (v gcp), off, 0, (vs, fs, ds, ls)) - else assign_slot w off regs -assign_bits_reg assign_slot w off _ regs@([], _, _, _) = - assign_slot w off regs +assign_bits_reg _ w off gcp (v:vs, fs, ds, ls) + | widthInBits w <= widthInBits wordWidth = + pprTrace "long regs" (ppr ls <+> ppr wordWidth <+> ppr mAX_Real_Long_REG) $ (RegisterParam (v gcp), off, 0, (vs, fs, ds, ls)) +assign_bits_reg _ w off _ (vs, fs, ds, l:ls) + | widthInBits w > widthInBits wordWidth = + pprTrace "long regs" (ppr ls <+> ppr wordWidth <+> ppr mAX_Real_Long_REG) $ (RegisterParam l, off, 0, (vs, fs, ds, ls)) +assign_bits_reg assign_slot w off _ regs@(_, _, _, ls) = + pprTrace "long regs" (ppr w <+> ppr ls <+> ppr wordWidth <+> ppr mAX_Real_Long_REG <+> ppr mAX_Long_REG) $ assign_slot w off regs assign_float_reg :: SlotAssigner -> Width -> WordOff -> AvailRegs -> Assignment assign_float_reg _ W32 off (vs, f:fs, ds, ls) = (RegisterParam $ f, off, 0, (vs, fs, ds, ls)) diff --git a/compiler/cmm/MkZipCfgCmm.hs b/compiler/cmm/MkZipCfgCmm.hs index 88adaae..f28e327 100644 --- a/compiler/cmm/MkZipCfgCmm.hs +++ b/compiler/cmm/MkZipCfgCmm.hs @@ -35,6 +35,7 @@ import PprCmm() import FastString import ForeignCall import MkZipCfg +import Outputable import Panic import SMRep (ByteOff) import StaticFlags @@ -262,6 +263,7 @@ mkCmmCall f results actuals = mkCall f Native results actuals -- I'm dropping the SRT, but that should be okay: we plan to reconstruct it later. mkCall f conv results actuals updfr_off = + pprTrace "mkCall" (ppr f <+> ppr actuals <+> ppr results <+> ppr conv) $ withFreshLabel "call successor" $ \k -> let area = CallArea $ Young k (off, copyin) = copyInOflow conv False area results diff --git a/compiler/codeGen/CgCallConv.hs b/compiler/codeGen/CgCallConv.hs index 29441d6..5fa0a85 100644 --- a/compiler/codeGen/CgCallConv.hs +++ b/compiler/codeGen/CgCallConv.hs @@ -408,7 +408,6 @@ allDoubleRegNos = regList mAX_Double_REG allLongRegNos = regList mAX_Long_REG regList :: Int -> [Int] -regList 0 = [] regList n = [1 .. n] type AvailRegs = ( [Int] -- available vanilla regs. diff --git a/compiler/codeGen/CgTailCall.lhs b/compiler/codeGen/CgTailCall.lhs index 60a8561..3732bab 100644 --- a/compiler/codeGen/CgTailCall.lhs +++ b/compiler/codeGen/CgTailCall.lhs @@ -387,7 +387,7 @@ tailCallPrimOp op args -- except that *all* the arguments will be in registers. -- Hence the ASSERT( null leftovers ) arg_amodes <- getArgAmodes args - ; let (arg_regs, leftovers) = assignPrimOpCallRegs arg_amodes + ; let (arg_regs, leftovers) = pprTrace "prim op" (ppr op) $ assignPrimOpCallRegs arg_amodes jump_to_primop = jumpToLbl (mkRtsPrimOpLabel op) ; ASSERT(null leftovers) -- no stack-resident args diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs index df6e8a1..32e43a7 100644 --- a/compiler/codeGen/StgCmmExpr.hs +++ b/compiler/codeGen/StgCmmExpr.hs @@ -480,8 +480,6 @@ cgTailCall fun_id fun_info args = do do emit $ mkComment $ mkFastString "directEntry" emit (mkAssign nodeReg fun) directCall lbl arity args - -- directCall lbl (arity+1) (StgVarArg fun_id : args)) - -- >>= (emit . (mkComment (mkFastString "DirectEntry") <*>)) else do emit $ mkComment $ mkFastString "directEntry else" directCall lbl arity args } diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs index 64d0203..af00c79 100644 --- a/compiler/codeGen/StgCmmForeign.hs +++ b/compiler/codeGen/StgCmmForeign.hs @@ -58,7 +58,8 @@ cgForeignCall results result_hints (CCall (CCallSpec target cconv safety)) stg_a = case target of StaticTarget lbl -> (unzip cmm_args, - CmmLit (CmmLabel (mkForeignLabel lbl (call_size cmm_args) False IsFunction))) + CmmLit (CmmLabel (mkForeignLabel lbl (call_size cmm_args) + False IsFunction))) DynamicTarget -> case cmm_args of (fn,_):rest -> (unzip rest, fn) [] -> panic "cgForeignCall []" -- 1.7.10.4