Merge pull request #302 from bjorn3/no_128bit_lang_items

Replace {u,i}128_* lang items with __rust_{u,i}128_* unmangled functions
This commit is contained in:
Alex Crichton 2019-07-19 09:44:00 -05:00 committed by GitHub
commit e578d47247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 113 deletions

View File

@ -90,44 +90,43 @@ where
impl Subo for i128 {} impl Subo for i128 {}
impl Subo for u128 {} impl Subo for u128 {}
u128_lang_items! { intrinsics! {
#[lang = "i128_add"] pub extern "C" fn __rust_i128_add(a: i128, b: i128) -> i128 {
pub fn rust_i128_add(a: i128, b: i128) -> i128 { __rust_u128_add(a as _, b as _) as _
rust_u128_add(a as _, b as _) as _
} }
#[lang = "i128_addo"]
pub fn rust_i128_addo(a: i128, b: i128) -> (i128, bool) { pub extern "C" fn __rust_i128_addo(a: i128, b: i128) -> (i128, bool) {
let mut oflow = 0;
let r = a.addo(b, &mut oflow);
(r, oflow != 0)
}
#[lang = "u128_add"]
pub fn rust_u128_add(a: u128, b: u128) -> u128 {
a.add(b)
}
#[lang = "u128_addo"]
pub fn rust_u128_addo(a: u128, b: u128) -> (u128, bool) {
let mut oflow = 0; let mut oflow = 0;
let r = a.addo(b, &mut oflow); let r = a.addo(b, &mut oflow);
(r, oflow != 0) (r, oflow != 0)
} }
#[lang = "i128_sub"] pub extern "C" fn __rust_u128_add(a: u128, b: u128) -> u128 {
pub fn rust_i128_sub(a: i128, b: i128) -> i128 { a.add(b)
rust_u128_sub(a as _, b as _) as _
} }
#[lang = "i128_subo"]
pub fn rust_i128_subo(a: i128, b: i128) -> (i128, bool) { pub extern "C" fn __rust_u128_addo(a: u128, b: u128) -> (u128, bool) {
let mut oflow = 0;
let r = a.addo(b, &mut oflow);
(r, oflow != 0)
}
pub extern "C" fn __rust_i128_sub(a: i128, b: i128) -> i128 {
__rust_u128_sub(a as _, b as _) as _
}
pub extern "C" fn __rust_i128_subo(a: i128, b: i128) -> (i128, bool) {
let mut oflow = 0; let mut oflow = 0;
let r = a.subo(b, &mut oflow); let r = a.subo(b, &mut oflow);
(r, oflow != 0) (r, oflow != 0)
} }
#[lang = "u128_sub"]
pub fn rust_u128_sub(a: u128, b: u128) -> u128 { pub extern "C" fn __rust_u128_sub(a: u128, b: u128) -> u128 {
a.sub(b) a.sub(b)
} }
#[lang = "u128_subo"]
pub fn rust_u128_subo(a: u128, b: u128) -> (u128, bool) { pub extern "C" fn __rust_u128_subo(a: u128, b: u128) -> (u128, bool) {
let mut oflow = 0; let mut oflow = 0;
let r = a.subo(b, &mut oflow); let r = a.subo(b, &mut oflow);
(r, oflow != 0) (r, oflow != 0)

View File

@ -107,25 +107,14 @@ intrinsics! {
pub extern "C" fn __muloti4(a: i128, b: i128, oflow: &mut i32) -> i128 { pub extern "C" fn __muloti4(a: i128, b: i128, oflow: &mut i32) -> i128 {
a.mulo(b, oflow) a.mulo(b, oflow)
} }
}
u128_lang_items! { pub extern "C" fn __rust_i128_mulo(a: i128, b: i128) -> (i128, bool) {
#[lang = "i128_mul"]
pub fn rust_i128_mul(a: i128, b: i128) -> i128 {
__multi3(a, b)
}
#[lang = "i128_mulo"]
pub fn rust_i128_mulo(a: i128, b: i128) -> (i128, bool) {
let mut oflow = 0; let mut oflow = 0;
let r = __muloti4(a, b, &mut oflow); let r = __muloti4(a, b, &mut oflow);
(r, oflow != 0) (r, oflow != 0)
} }
#[lang = "u128_mul"]
pub fn rust_u128_mul(a: u128, b: u128) -> u128 { pub extern "C" fn __rust_u128_mulo(a: u128, b: u128) -> (u128, bool) {
__multi3(a as _, b as _) as _
}
#[lang = "u128_mulo"]
pub fn rust_u128_mulo(a: u128, b: u128) -> (u128, bool) {
let mut oflow = 0; let mut oflow = 0;
let r = a.mulo(b, &mut oflow); let r = a.mulo(b, &mut oflow);
(r, oflow != 0) (r, oflow != 0)

View File

@ -99,14 +99,3 @@ intrinsics! {
a.divmod(b, rem, |a, b| __divdi3(a, b)) a.divmod(b, rem, |a, b| __divdi3(a, b))
} }
} }
u128_lang_items! {
#[lang = "i128_div"]
pub fn rust_i128_div(a: i128, b: i128) -> i128 {
__divti3(a, b)
}
#[lang = "i128_rem"]
pub fn rust_i128_rem(a: i128, b: i128) -> i128 {
__modti3(a, b)
}
}

View File

@ -103,40 +103,20 @@ intrinsics! {
pub extern "C" fn __lshrti3(a: u128, b: u32) -> u128 { pub extern "C" fn __lshrti3(a: u128, b: u32) -> u128 {
a.lshr(b) a.lshr(b)
} }
}
u128_lang_items! { pub extern "C" fn __rust_i128_shlo(a: i128, b: u128) -> (i128, bool) {
#[lang = "i128_shl"] (__ashlti3(a as _, b as _) as _, b >= 128)
pub fn rust_i128_shl(a: i128, b: u32) -> i128 {
__ashlti3(a as _, b) as _
}
#[lang = "i128_shlo"]
pub fn rust_i128_shlo(a: i128, b: u128) -> (i128, bool) {
(rust_i128_shl(a, b as _), b >= 128)
}
#[lang = "u128_shl"]
pub fn rust_u128_shl(a: u128, b: u32) -> u128 {
__ashlti3(a, b)
}
#[lang = "u128_shlo"]
pub fn rust_u128_shlo(a: u128, b: u128) -> (u128, bool) {
(rust_u128_shl(a, b as _), b >= 128)
} }
#[lang = "i128_shr"] pub extern "C" fn __rust_u128_shlo(a: u128, b: u128) -> (u128, bool) {
pub fn rust_i128_shr(a: i128, b: u32) -> i128 { (__ashlti3(a, b as _), b >= 128)
__ashrti3(a, b)
} }
#[lang = "i128_shro"]
pub fn rust_i128_shro(a: i128, b: u128) -> (i128, bool) { pub extern "C" fn __rust_i128_shro(a: i128, b: u128) -> (i128, bool) {
(rust_i128_shr(a, b as _), b >= 128) (__ashrti3(a, b as _), b >= 128)
} }
#[lang = "u128_shr"]
pub fn rust_u128_shr(a: u128, b: u32) -> u128 { pub extern "C" fn __rust_u128_shro(a: u128, b: u128) -> (u128, bool) {
__lshrti3(a, b) (__lshrti3(a, b as _), b >= 128)
}
#[lang = "u128_shro"]
pub fn rust_u128_shro(a: u128, b: u128) -> (u128, bool) {
(rust_u128_shr(a, b as _), b >= 128)
} }
} }

View File

@ -268,14 +268,3 @@ intrinsics! {
udivmod_inner!(n, d, rem, u128) udivmod_inner!(n, d, rem, u128)
} }
} }
u128_lang_items! {
#[lang = "u128_div"]
pub fn rust_u128_div(a: u128, b: u128) -> u128 {
__udivti3(a, b)
}
#[lang = "u128_rem"]
pub fn rust_u128_rem(a: u128, b: u128) -> u128 {
__umodti3(a, b)
}
}

View File

@ -280,17 +280,3 @@ pub mod win64_128bit_abi_hack {
} }
} }
} }
macro_rules! u128_lang_items {
($(
#[lang = $lang:tt]
pub fn $name:ident( $($argname:ident: $ty:ty),* ) -> $ret:ty {
$($body:tt)*
}
)*) => ($(
#[cfg_attr(not(any(stage0, feature = "no-lang-items")), lang = $lang)]
pub fn $name( $($argname: $ty),* ) -> $ret {
$($body)*
}
)*)
}

View File

@ -707,35 +707,35 @@ fn main() {
// int/addsub.rs // int/addsub.rs
gen( gen(
|(a, b): (MyU128, MyU128)| Some(a.0.wrapping_add(b.0)), |(a, b): (MyU128, MyU128)| Some(a.0.wrapping_add(b.0)),
"builtins::int::addsub::rust_u128_add(a, b)", "builtins::int::addsub::__rust_u128_add(a, b)",
); );
gen( gen(
|(a, b): (MyI128, MyI128)| Some(a.0.wrapping_add(b.0)), |(a, b): (MyI128, MyI128)| Some(a.0.wrapping_add(b.0)),
"builtins::int::addsub::rust_i128_add(a, b)", "builtins::int::addsub::__rust_i128_add(a, b)",
); );
gen( gen(
|(a, b): (MyU128, MyU128)| Some(a.0.overflowing_add(b.0)), |(a, b): (MyU128, MyU128)| Some(a.0.overflowing_add(b.0)),
"builtins::int::addsub::rust_u128_addo(a, b)", "builtins::int::addsub::__rust_u128_addo(a, b)",
); );
gen( gen(
|(a, b): (MyI128, MyI128)| Some(a.0.overflowing_add(b.0)), |(a, b): (MyI128, MyI128)| Some(a.0.overflowing_add(b.0)),
"builtins::int::addsub::rust_i128_addo(a, b)", "builtins::int::addsub::__rust_i128_addo(a, b)",
); );
gen( gen(
|(a, b): (MyU128, MyU128)| Some(a.0.wrapping_sub(b.0)), |(a, b): (MyU128, MyU128)| Some(a.0.wrapping_sub(b.0)),
"builtins::int::addsub::rust_u128_sub(a, b)", "builtins::int::addsub::__rust_u128_sub(a, b)",
); );
gen( gen(
|(a, b): (MyI128, MyI128)| Some(a.0.wrapping_sub(b.0)), |(a, b): (MyI128, MyI128)| Some(a.0.wrapping_sub(b.0)),
"builtins::int::addsub::rust_i128_sub(a, b)", "builtins::int::addsub::__rust_i128_sub(a, b)",
); );
gen( gen(
|(a, b): (MyU128, MyU128)| Some(a.0.overflowing_sub(b.0)), |(a, b): (MyU128, MyU128)| Some(a.0.overflowing_sub(b.0)),
"builtins::int::addsub::rust_u128_subo(a, b)", "builtins::int::addsub::__rust_u128_subo(a, b)",
); );
gen( gen(
|(a, b): (MyI128, MyI128)| Some(a.0.overflowing_sub(b.0)), |(a, b): (MyI128, MyI128)| Some(a.0.overflowing_sub(b.0)),
"builtins::int::addsub::rust_i128_subo(a, b)", "builtins::int::addsub::__rust_i128_subo(a, b)",
); );
// int/mul.rs // int/mul.rs