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.

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

Rollup of 17 pull requests #49051

Merged
merged 47 commits into from
Mar 16, 2018
Merged
Changes from 2 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
2bc3f5b
borrowck-asm: enable on mips
jcowgill Jan 23, 2018
1376bf8
tools/compiletest: add mips64 to ARCH_LIST
jcowgill Jan 25, 2018
6f55819
test: remove useless ignore-mips*el headers
jcowgill Jan 25, 2018
dcc438d
test: ignore mips64 in abi-main-signature-16bit-c-int.rs
jcowgill Jan 25, 2018
59199eb
test: remove duplicate ignore-aarch64 from stack-probes test
jcowgill Mar 9, 2018
bceb94e
test: ignore stack probe tests on mips*
jcowgill Mar 9, 2018
e0863c5
test: ignore mips* in x86_mmx test
jcowgill Mar 9, 2018
54467ae
test: ignore asm tests on mips* which won't work
jcowgill Mar 9, 2018
fb806fd
test: fix repr-transparent-aggregates test on mips64
jcowgill Mar 9, 2018
ff227c4
rustbuild: Remove ThinLTO-related configuration
alexcrichton Mar 9, 2018
a67e072
Dedupe rand
Eijebong Mar 12, 2018
74f5dd0
rustc: Start a custom cabi module for wasm32
alexcrichton Mar 12, 2018
0511077
rustc: Add `sha` to the x86 feature whitelist
alexcrichton Mar 12, 2018
0ca9a4c
Move librustdoc readme to rustc guide
mark-i-m Mar 13, 2018
a48224b
Add a section for using assertions into doc tests.
Songbird0 Mar 12, 2018
decbb83
Add test for issue 48941
ExpHP Mar 13, 2018
dc96467
Fix ICE on malformed plugin attributes
ExpHP Mar 13, 2018
12ac032
Implement import renaming with `_` (RFC 2166)
petrochenkov Mar 10, 2018
b4b7ccb
Add crate name to "main function not found" error message.
ehuss Mar 3, 2018
19b5113
rustc_trans: fix small aggregate returns for big-endian mips64 FFI
Mar 14, 2018
6aa4dcb
Add empty main() to tests where it is missing.
ehuss Mar 12, 2018
b08e6d3
Add suggestion where to add main function.
ehuss Mar 12, 2018
2f1b34c
Add backticks to `main` not found errors.
ehuss Mar 13, 2018
16d424f
Some tweaks to "type parameters from outer function" diagnostic
estebank Mar 14, 2018
5257275
Update E0601 test for new message format.
ehuss Mar 14, 2018
b6ec75f
Remove unnecessary "`" in error message E0307 (invalid self type).
kennytm Mar 15, 2018
6fbdaf4
unstabilize FusedIterator for Flatten since Flatten is unstable
Centril Mar 15, 2018
9e64946
setting ABORTING_MALLOC for asmjs backend
Mar 14, 2018
a45b79d
Rollup merge of #48706 - ehuss:main-not-found-in-crate, r=estebank
kennytm Mar 15, 2018
da88827
Rollup merge of #48875 - jcowgill:mips-test-fixes, r=sanxiyn
kennytm Mar 15, 2018
68a602e
Rollup merge of #48892 - alexcrichton:thinlto-again, r=Mark-Simulacrum
kennytm Mar 15, 2018
e1d19df
Rollup merge of #48922 - petrochenkov:asunder, r=nikomatsakis
kennytm Mar 15, 2018
35b008c
Rollup merge of #48957 - Eijebong:rand, r=michaelwoerister
kennytm Mar 15, 2018
292c6ca
Rollup merge of #48959 - alexcrichton:signext, r=eddyb
kennytm Mar 15, 2018
97b489e
Rollup merge of #48961 - Songbird0:rustdoc_doctests_assertions, r=Gui…
kennytm Mar 15, 2018
bf270bb
Rollup merge of #48965 - alexcrichton:add-sha-feature, r=eddyb
kennytm Mar 15, 2018
5e991e1
Improve `AddrParseError` documentation.
Songbird0 Mar 8, 2018
4d5cd21
Coherence diagnostic tweaks
estebank Mar 15, 2018
5a7aa6c
Rollup merge of #49007 - estebank:follow-up-47574, r=oli-obk
kennytm Mar 15, 2018
77cf02d
Rollup merge of #49024 - draganmladjenovic:mips64_cabi_sret, r=sanxiyn
kennytm Mar 15, 2018
55a0075
Rollup merge of #49042 - kennytm:fix-e0307-typo, r=rkruppe
kennytm Mar 15, 2018
90230ce
Rollup merge of #49050 - snf:fix_oom_asmjs, r=alexcrichton
kennytm Mar 15, 2018
6fbd033
Rollup merge of #48853 - Songbird0:addrparseerror_documentation_impro…
kennytm Mar 15, 2018
64490ff
Rollup merge of #48990 - ExpHP:dont-drop-the-bomb, r=estebank
kennytm Mar 15, 2018
a199fb2
Rollup merge of #49037 - estebank:coherence-tweaks, r=nikomatsakis
kennytm Mar 15, 2018
fb49ae0
Rollup merge of #49049 - Centril:fix/flatten-fusediterator, r=bluss
kennytm Mar 15, 2018
db2f0ae
Rollup merge of #48972 - mark-i-m:rustdoc_readme, r=QuietMisdreavus
kennytm Mar 15, 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
14 changes: 1 addition & 13 deletions src/librustc_trans/cabi_mips64.rs
Original file line number Diff line number Diff line change
@@ -28,18 +28,6 @@ fn extend_integer_width_mips(arg: &mut ArgType, bits: u64) {
arg.extend_integer_width_to(bits);
}

fn bits_to_int_reg(bits: u64) -> Reg {
if bits <= 8 {
Reg::i8()
} else if bits <= 16 {
Reg::i16()
} else if bits <= 32 {
Reg::i32()
} else {
Reg::i64()
}
}

fn float_reg<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, ret: &ArgType<'tcx>, i: usize) -> Option<Reg> {
match ret.layout.field(cx, i).abi {
layout::Abi::Scalar(ref scalar) => match scalar.value {
@@ -82,7 +70,7 @@ fn classify_ret_ty<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, ret: &mut ArgType<'tcx>)

// Cast to a uniform int structure
ret.cast_to(Uniform {
unit: bits_to_int_reg(bits),
unit: Reg::i64(),
total: size
});
} else {