diff options
| author | Michael D. Adams <adamsmd@cs.indiana.edu> | 2007-08-06 04:48:11 +0000 |
|---|---|---|
| committer | Michael D. Adams <adamsmd@cs.indiana.edu> | 2007-08-06 04:48:11 +0000 |
| commit | 5e27c8850b295db6ac171bb626ce1afd0cd3a1eb (patch) | |
| tree | 8865f0ca8d8389d19f44366bed8c31562562488a /compiler | |
| parent | 3aa061857b4df40fc641ef748d5f651d664b22f2 (diff) | |
| download | haskell-5e27c8850b295db6ac171bb626ce1afd0cd3a1eb.tar.gz | |
Fix the calling convention order in the CPS
It now matches the order used by the existing codeGen.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cmm/CmmCallConv.hs | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/compiler/cmm/CmmCallConv.hs b/compiler/cmm/CmmCallConv.hs index 2a013467b4..41b9d5616e 100644 --- a/compiler/cmm/CmmCallConv.hs +++ b/compiler/cmm/CmmCallConv.hs @@ -25,13 +25,14 @@ data ParamLocation type ArgumentFormat a = [(a, ParamLocation)] assignArguments :: (a -> MachRep) -> [a] -> ArgumentFormat a -assignArguments f reps = assignArguments' reps 0 availRegs +assignArguments f reps = assignments where + (sizes, assignments) = unzip $ assignArguments' reps (negate (sum sizes)) availRegs assignArguments' [] offset availRegs = [] assignArguments' (r:rs) offset availRegs = - (r,assignment):assignArguments' rs new_offset remaining + (size,(r,assignment)):assignArguments' rs new_offset remaining where - (assignment, new_offset, remaining) = + (assignment, new_offset, size, remaining) = assign_reg (f r) offset availRegs argumentsSize :: (a -> MachRep) -> [a] -> WordOff @@ -80,13 +81,13 @@ slot_size reg = slot_size' :: MachRep -> Int slot_size' reg = ((machRepByteWidth reg - 1) `div` wORD_SIZE) + 1 -assign_reg :: MachRep -> WordOff -> AvailRegs -> (ParamLocation, WordOff, AvailRegs) -assign_reg I8 off (v:vs, fs, ds, ls) = (RegisterParam $ v, off, (vs, fs, ds, ls)) -assign_reg I16 off (v:vs, fs, ds, ls) = (RegisterParam $ v, off, (vs, fs, ds, ls)) -assign_reg I32 off (v:vs, fs, ds, ls) = (RegisterParam $ v, off, (vs, fs, ds, ls)) -assign_reg I64 off (vs, fs, ds, l:ls) = (RegisterParam $ l, off, (vs, fs, ds, ls)) +assign_reg :: MachRep -> WordOff -> AvailRegs -> (ParamLocation, WordOff, WordOff, AvailRegs) +assign_reg I8 off (v:vs, fs, ds, ls) = (RegisterParam $ v, off, 0, (vs, fs, ds, ls)) +assign_reg I16 off (v:vs, fs, ds, ls) = (RegisterParam $ v, off, 0, (vs, fs, ds, ls)) +assign_reg I32 off (v:vs, fs, ds, ls) = (RegisterParam $ v, off, 0, (vs, fs, ds, ls)) +assign_reg I64 off (vs, fs, ds, l:ls) = (RegisterParam $ l, off, 0, (vs, fs, ds, ls)) assign_reg I128 off _ = panic "I128 is not a supported register type" -assign_reg F32 off (vs, f:fs, ds, ls) = (RegisterParam $ f, off, (vs, fs, ds, ls)) -assign_reg F64 off (vs, fs, d:ds, ls) = (RegisterParam $ d, off, (vs, fs, ds, ls)) +assign_reg F32 off (vs, f:fs, ds, ls) = (RegisterParam $ f, off, 0, (vs, fs, ds, ls)) +assign_reg F64 off (vs, fs, d:ds, ls) = (RegisterParam $ d, off, 0, (vs, fs, ds, ls)) assign_reg F80 off _ = panic "F80 is not a supported register type" -assign_reg reg off _ = (StackParam $ off - size, off - size, ([], [], [], [])) where size = slot_size' reg +assign_reg reg off _ = (StackParam $ off, off + size, size, ([], [], [], [])) where size = slot_size' reg |