Skip to content
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

Jump to bottom

Fixes sparc64 cabi fixes. #47541

Merged
merged 3 commits into from
Jan 23, 2018
Merged

Fixes sparc64 cabi fixes. #47541

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4bcfc5
Fixes sparc64 cabi fixes.
psumbera Jan 18, 2018
af632bc
Removed uneeded change.
psumbera Jan 18, 2018
1203b3d
Removed uneeded argument to make_indirect.
psumbera Jan 18, 2018
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
9 changes: 7 additions & 2 deletions src/librustc_trans/cabi_sparc64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fn is_homogeneous_aggregate<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, arg: &mut ArgTyp
let valid_unit = match unit.kind {
RegKind::Integer => false,
RegKind::Float => true,
RegKind::Vector => arg.layout.size.bits() == 128
RegKind::Vector => arg.layout.size.bits() == 256
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be either 128 or 256, or just 256?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second look, is this change needed at all? is_homogeneous_aggregate refers to a very specific shape of struct and this check is for SIMD vectors - which I doubt you are using. The other two changes in this file seem more relevant.

};

if valid_unit {
Expand All @@ -50,7 +50,7 @@ fn classify_ret_ty<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, ret: &mut ArgType<'tcx>)
}
let size = ret.layout.size;
let bits = size.bits();
if bits <= 128 {
if bits <= 256 {
let unit = if bits <= 8 {
Reg::i8()
} else if bits <= 16 {
Expand Down Expand Up @@ -84,6 +84,11 @@ fn classify_arg_ty<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, arg: &mut ArgType<'tcx>)
}

let total = arg.layout.size;
if total.bits() > 128 {
arg.make_indirect(cx);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method call does not need a parameter.

return;
}

arg.cast_to(Uniform {
unit: Reg::i64(),
total
Expand Down