X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmCallConv.hs;h=fa619af206aa5e5f1411d9824e3d282c359aa482;hp=5476eb8fa2c0ab660bf1198042489dd9525b8d0f;hb=e6243a818496aad82b6f47511d3bd9bc800f747d;hpb=176fa33f17dd78355cc572e006d2ab26898e2c69 diff --git a/compiler/cmm/CmmCallConv.hs b/compiler/cmm/CmmCallConv.hs index 5476eb8..fa619af 100644 --- a/compiler/cmm/CmmCallConv.hs +++ b/compiler/cmm/CmmCallConv.hs @@ -17,6 +17,7 @@ module CmmCallConv ( import Cmm import SMRep +import ZipCfgCmmRep (Convention(..)) import Constants import StaticFlags (opt_Unregisterised) @@ -30,36 +31,48 @@ data ParamLocation a = RegisterParam GlobalReg | StackParam a +instance (Outputable a) => Outputable (ParamLocation a) where + ppr (RegisterParam g) = ppr g + ppr (StackParam p) = ppr p + type ArgumentFormat a b = [(a, ParamLocation b)] -- Stack parameters are returned as word offsets. assignArguments :: (a -> CmmType) -> [a] -> ArgumentFormat a WordOff assignArguments f reps = assignments where + availRegs = getRegs False (sizes, assignments) = unzip $ assignArguments' reps (negate (sum sizes)) availRegs assignArguments' [] offset availRegs = [] assignArguments' (r:rs) offset availRegs = (size,(r,assignment)):assignArguments' rs new_offset remaining where (assignment, new_offset, size, remaining) = - assign_reg False assign_slot_up (f r) offset availRegs + assign_reg assign_slot_neg (f r) offset availRegs -- | 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 we reserve different --- global registers in each case. -assignArgumentsPos :: Bool -> (a -> CmmType) -> [a] -> ArgumentFormat a ByteOff -assignArgumentsPos isCall arg_ty reps = map cvt assignments +-- 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] -> + ArgumentFormat a ByteOff +assignArgumentsPos conv isCall arg_ty reps = map cvt assignments where - (sizes, assignments) = unzip $ assignArguments' reps 0 availRegs + regs = case conv of Native -> getRegs isCall + GC -> getRegs False + PrimOp -> noStack + Slow -> noRegs + _ -> panic "unrecognized calling convention" + (sizes, assignments) = unzip $ assignArguments' reps (sum sizes) regs assignArguments' [] _ _ = [] assignArguments' (r:rs) offset avails = - (size,(r,assignment)):assignArguments' rs new_offset remaining + (size, (r,assignment)):assignArguments' rs new_offset remaining where (assignment, new_offset, size, remaining) = - assign_reg isCall assign_slot_down (arg_ty r) offset avails + assign_reg assign_slot_pos (arg_ty r) offset avails cvt (l, RegisterParam r) = (l, RegisterParam r) cvt (l, StackParam off) = (l, StackParam $ off * wORD_SIZE) @@ -94,12 +107,18 @@ useDoubleRegs | opt_Unregisterised = 0 useLongRegs | opt_Unregisterised = 0 | otherwise = mAX_Real_Long_REG -availRegs = (regList VanillaReg useVanillaRegs, - regList FloatReg useFloatRegs, - regList DoubleReg useDoubleRegs, - regList LongReg useLongRegs) +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 = (map VanillaReg any, map FloatReg any, map DoubleReg any, map LongReg any) + where any = [1 .. ] +noRegs = ([], [], [], []) -- Round the size of a local register up to the nearest word. slot_size :: LocalReg -> Int @@ -111,37 +130,37 @@ slot_size' reg = ((widthInBytes reg - 1) `div` wORD_SIZE) + 1 type Assignment = (ParamLocation WordOff, WordOff, WordOff, AvailRegs) type SlotAssigner = Width -> Int -> AvailRegs -> Assignment -assign_reg :: Bool -> SlotAssigner -> CmmType -> WordOff -> AvailRegs -> Assignment -assign_reg isCall slot ty off avails - | isFloatType ty = assign_float_reg slot width off avails - | otherwise = assign_bits_reg isCall slot width off gcp avails +assign_reg :: SlotAssigner -> CmmType -> WordOff -> AvailRegs -> Assignment +assign_reg slot ty off avails + | isFloatType ty = assign_float_reg slot width off avails + | otherwise = assign_bits_reg slot width off gcp avails where width = typeWidth ty gcp | isGcPtrType ty = VGcPtr | otherwise = VNonGcPtr --- Assigning a slot on a stack that grows up: +-- Assigning a slot using negative offsets from the stack pointer. -- JD: I don't know why this convention stops using all the registers -- after running out of one class of registers. -assign_slot_up :: SlotAssigner -assign_slot_up width off regs = +assign_slot_neg :: SlotAssigner +assign_slot_neg width off regs = (StackParam $ off, off + size, size, ([], [], [], [])) where size = slot_size' width --- Assigning a slot on a stack that grows down: -assign_slot_down :: SlotAssigner -assign_slot_down width off regs = - (StackParam $ off + size, off + size, size, ([], [], [], [])) +-- Assigning a slot using positive offsets into a CallArea. +assign_slot_pos :: SlotAssigner +assign_slot_pos width off regs = + (StackParam $ off, off - size, size, ([], [], [], [])) where size = slot_size' width --- On calls, `node` is used to hold the closure that is entered, so we can't --- pass arguments in that register. -assign_bits_reg _ _ W128 _ _ _ = panic "I128 is not a supported register type" -assign_bits_reg isCall assign_slot w off gcp regs@(v:vs, fs, ds, ls) = - if isCall && v gcp == node then - assign_bits_reg isCall assign_slot w off gcp (vs, fs, ds, ls) - else if widthInBits w <= widthInBits wordWidth then +-- 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 _ 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 gcp regs@([], _, _, _) = + assign_slot w off regs assign_float_reg _ W32 off (vs, f:fs, ds, ls) = (RegisterParam $ f, off, 0, (vs, fs, ds, ls)) assign_float_reg _ W64 off (vs, fs, d:ds, ls) = (RegisterParam $ d, off, 0, (vs, fs, ds, ls))