-slot_size reg =
- ((machRepByteWidth (localRegRep reg) - 1) `div` wORD_SIZE) + 1
-
-slot_size' :: MachRep -> Int
-slot_size' reg = ((machRepByteWidth reg - 1) `div` wORD_SIZE) + 1
-
-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, 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, off + size, size, ([], [], [], [])) where size = slot_size' reg
+slot_size reg = slot_size' (typeWidth (localRegType reg))
+-}
+
+slot_size' :: Width -> Int
+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 :: 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 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_neg :: SlotAssigner
+assign_slot_neg width off _regs =
+ (StackParam $ off, off + size, size, ([], [], [], [])) where size = slot_size' width
+
+-- 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 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 _ W128 _ _ _ = panic "W128 is not a supported register type"
+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))
+assign_float_reg _ W64 off (vs, fs, d:ds, ls) = (RegisterParam $ d, off, 0, (vs, fs, ds, ls))
+assign_float_reg _ W80 _ _ = panic "F80 is not a supported register type"
+assign_float_reg assign_slot width off r = assign_slot width off r