X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmCallConv.hs;h=a49fa65ab4a2d20d0da73083a5f0c5697bd9aa36;hp=243072e1d5d314777ed62a1b2e27c7681b88345b;hb=703ca1542c8e0983cc9d8eebce6e9f3dd3fd71e2;hpb=31a9d04804d9cacda35695c5397590516b964964 diff --git a/compiler/cmm/CmmCallConv.hs b/compiler/cmm/CmmCallConv.hs index 243072e..a49fa65 100644 --- a/compiler/cmm/CmmCallConv.hs +++ b/compiler/cmm/CmmCallConv.hs @@ -15,7 +15,6 @@ import ZipCfgCmmRep (Convention(..)) import Constants import StaticFlags (opt_Unregisterised) import Outputable -import Panic -- Calculate the 'GlobalReg' or stack locations for function call -- parameters as used by the Cmm calling convention. @@ -34,7 +33,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 = @@ -46,20 +45,21 @@ assignArguments f reps = assignments -- | JD: For the new stack story, I want arguments passed on the stack to manifest as -- positive offsets in a CallArea, not negative offsets from the stack pointer. -- Also, I want byte offsets, not word offsets. --- The first argument tells us whether we are assigning positions for call arguments --- or return results. The distinction matters because some conventions use different --- global registers in each case. In particular, the native calling convention --- uses the `node' register to pass the closure environment. -assignArgumentsPos :: (Outputable a) => Convention -> Bool -> (a -> CmmType) -> [a] -> +assignArgumentsPos :: (Outputable a) => Convention -> (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" +assignArgumentsPos conv arg_ty reps = map cvt assignments + where -- The calling conventions (CgCallConv.hs) are complicated, to say the least + regs = case (reps, conv) of + (_, NativeNodeCall) -> getRegsWithNode + (_, NativeDirectCall) -> getRegsWithoutNode + ([_], NativeReturn) -> allRegs + (_, NativeReturn) -> getRegsWithNode + (_, GC) -> getRegsWithNode + (_, PrimOpCall) -> allRegs + ([_], PrimOpReturn) -> allRegs + (_, PrimOpReturn) -> getRegsWithNode + (_, Slow) -> noRegs + _ -> pprPanic "Unknown calling convention" (ppr conv) (sizes, assignments) = unzip $ assignArguments' reps (sum sizes) regs assignArguments' [] _ _ = [] assignArguments' (r:rs) offset avails = @@ -92,29 +92,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 +166,15 @@ 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 = + (RegisterParam (v gcp), off, 0, (vs, fs, ds, ls)) +assign_bits_reg _ w off _ (vs, fs, ds, l:ls) + | widthInBits w > widthInBits wordWidth = + (RegisterParam l, off, 0, (vs, fs, ds, ls)) +assign_bits_reg assign_slot w off _ regs@(_, _, _, _) = 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))