Skip to content

Fix argument register calculation. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MabezDev merged 2 commits into from
Jul 25, 2019
Merged

Fix argument register calculation. #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f53815
Add missing bracers in classify_arg_ty().
0ndorio Jul 25, 2019
28f3d6f
Pass big aggregated arguments indirectly.
0ndorio Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/librustc_target/abi/call/xtensa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,22 @@ fn classify_arg_ty<Ty>(arg: &mut ArgType<'_, Ty>, xlen: u64, remaining_gpr: &mut
// according to the ABI. 2*XLen-aligned varargs are passed in "aligned"
// register pairs, so may consume 3 registers.

let mut stack_required = false;
let arg_size = arg.layout.size;
let alignment = arg.layout.details.align.abi;

if arg_size.bits() > MAX_ARG_IN_REGS_SIZE {
arg.make_indirect();
return;
}

let alignment = arg.layout.details.align.abi;
let mut required_gpr = 1u64; // at least one per arg

if alignment.bits() == 2 * xlen {
required_gpr = 2 + (*remaining_gpr % 2);
} else if arg_size.bits() > xlen && arg_size.bits() <= MAX_ARG_IN_REGS_SIZE {
required_gpr = arg_size.bits() + (xlen - 1) / xlen;
required_gpr = (arg_size.bits() + (xlen - 1)) / xlen;
}

let mut stack_required = false;
if required_gpr > *remaining_gpr {
stack_required = true;
required_gpr = *remaining_gpr;
Expand Down