xeos
/
wasmi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify float impl macro

This commit is contained in:
Julius Rakow 2018-08-26 13:11:28 +02:00
parent 86b1d3cf56
commit cf67b161ce
No known key found for this signature in database
GPG Key ID: 9AABD9B859435A93
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/value.rs
View File

@ -747,25 +747,22 @@ impl_integer!(i64);
impl_integer!(u64); impl_integer!(u64);
macro_rules! impl_float { macro_rules! impl_float {
($type:ident, $int_type:ident) => { ($type:ident, $fXX:ident, $iXX:ident) => {
impl_float!($type, $type, $int_type);
};
($type:ident, $intermediate:ident, $int_type:ident) => {
impl Float<$type> for $type { impl Float<$type> for $type {
fn abs(self) -> $type { fn abs(self) -> $type {
$intermediate::abs(self.into()).into() $fXX::abs(self.into()).into()
} }
fn floor(self) -> $type { fn floor(self) -> $type {
$intermediate::floor(self.into()).into() $fXX::floor(self.into()).into()
} }
fn ceil(self) -> $type { fn ceil(self) -> $type {
$intermediate::ceil(self.into()).into() $fXX::ceil(self.into()).into()
} }
fn trunc(self) -> $type { fn trunc(self) -> $type {
$intermediate::trunc(self.into()).into() $fXX::trunc(self.into()).into()
} }
fn round(self) -> $type { fn round(self) -> $type {
$intermediate::round(self.into()).into() $fXX::round(self.into()).into()
} }
fn nearest(self) -> $type { fn nearest(self) -> $type {
let round = self.round(); let round = self.round();
@ -783,20 +780,26 @@ macro_rules! impl_float {
} }
} }
fn sqrt(self) -> $type { fn sqrt(self) -> $type {
$intermediate::sqrt(self.into()).into() $fXX::sqrt(self.into()).into()
} }
// This instruction corresponds to what is sometimes called "minNaN" in other languages. // This instruction corresponds to what is sometimes called "minNaN" in other languages.
fn min(self, other: $type) -> $type { fn min(self, other: $type) -> $type {
if self.is_nan() || other.is_nan() { if self.is_nan() {
return ::core::$intermediate::NAN.into(); return self;
}
if other.is_nan() {
return other;
} }
self.min(other) self.min(other)
} }
// This instruction corresponds to what is sometimes called "maxNaN" in other languages. // This instruction corresponds to what is sometimes called "maxNaN" in other languages.
fn max(self, other: $type) -> $type { fn max(self, other: $type) -> $type {
if self.is_nan() || other.is_nan() { if self.is_nan() {
return ::core::$intermediate::NAN.into(); return self;
}
if other.is_nan() {
return other;
} }
self.max(other) self.max(other)
@ -808,9 +811,9 @@ macro_rules! impl_float {
return self; return self;
} }
let sign_mask: $int_type = 1 << ((size_of::<$int_type>() << 3) - 1); let sign_mask: $iXX = 1 << ((size_of::<$iXX>() << 3) - 1);
let self_int: $int_type = self.transmute_into(); let self_int: $iXX = self.transmute_into();
let other_int: $int_type = other.transmute_into(); let other_int: $iXX = other.transmute_into();
let is_self_sign_set = (self_int & sign_mask) != 0; let is_self_sign_set = (self_int & sign_mask) != 0;
let is_other_sign_set = (other_int & sign_mask) != 0; let is_other_sign_set = (other_int & sign_mask) != 0;
if is_self_sign_set == is_other_sign_set { if is_self_sign_set == is_other_sign_set {
@ -825,7 +828,7 @@ macro_rules! impl_float {
}; };
} }
impl_float!(f32, i32); impl_float!(f32, f32, i32);
impl_float!(f64, i64); impl_float!(f64, f64, i64);
impl_float!(F32, f32, i32); impl_float!(F32, f32, i32);
impl_float!(F64, f64, i64); impl_float!(F64, f64, i64);