fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-07-24 20:02:04 +00:00
Code Issues Projects Releases Wiki Activity

Style fixes and fix missing canonicalization at function call.

Browse Source
This commit is contained in:
losfair
2020-03-18 00:42:10 +08:00
parent 1ddf3a1c4e
commit 1d9f0c53e1
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/singlepass-backend/src/codegen_x64.rs
View File

@@ -270,7 +270,8 @@ impl FloatValue {
fn promote(self, depth: usize) -> FloatValue { fn promote(self, depth: usize) -> FloatValue {
FloatValue { FloatValue {
canonicalization: match self.canonicalization { canonicalization: match self.canonicalization {
Some(_) => Some(CanonicalizeType::F64), Some(CanonicalizeType::F32) => Some(CanonicalizeType::F64),
Some(CanonicalizeType::F64) => panic!("cannot promote F64"),
None => None, None => None,
}, },
depth, depth,
@@ -280,7 +281,8 @@ impl FloatValue {
fn demote(self, depth: usize) -> FloatValue { fn demote(self, depth: usize) -> FloatValue {
FloatValue { FloatValue {
canonicalization: match self.canonicalization { canonicalization: match self.canonicalization {
Some(_) => Some(CanonicalizeType::F32), Some(CanonicalizeType::F64) => Some(CanonicalizeType::F32),
Some(CanonicalizeType::F32) => panic!("cannot demote F32"),
None => None, None => None,
}, },
depth, depth,
@@ -288,6 +290,8 @@ impl FloatValue {
} }
} }
/// Type of a pending canonicalization floating point value.
/// Sometimes we don't have the type information elsewhere and therefore we need to track it here.
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
enum CanonicalizeType { enum CanonicalizeType {
F32, F32,
@@ -2685,9 +2689,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
} }
fn feed_local(&mut self, ty: WpType, n: usize, _loc: u32) -> Result<(), CodegenError> { fn feed_local(&mut self, ty: WpType, n: usize, _loc: u32) -> Result<(), CodegenError> {
for _ in 0..n { self.local_types.extend(iter::repeat(ty).take(n));
self.local_types.push(ty);
}
Ok(()) Ok(())
} }
@@ -6877,8 +6879,21 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
self.machine.release_locations_only_osr_state(params.len()); self.machine.release_locations_only_osr_state(params.len());
while let Some(x) = self.fp_stack.last() { while let Some(fp) = self.fp_stack.last() {
if x.depth >= self.value_stack.len() { if fp.depth >= self.value_stack.len() {
let index = fp.depth - self.value_stack.len();
if a.arch_supports_canonicalize_nan()
&& self.config.nan_canonicalization
&& fp.canonicalization.is_some()
{
Self::canonicalize_nan(
a,
&mut self.machine,
fp.canonicalization.unwrap().to_size(),
params[index],
params[index],
);
}
self.fp_stack.pop().unwrap(); self.fp_stack.pop().unwrap();
} else { } else {
break; break;
@@ -6935,8 +6950,21 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
.collect(); .collect();
self.machine.release_locations_only_regs(&params); self.machine.release_locations_only_regs(&params);
while let Some(x) = self.fp_stack.last() { while let Some(fp) = self.fp_stack.last() {
if x.depth >= self.value_stack.len() { if fp.depth >= self.value_stack.len() {
let index = fp.depth - self.value_stack.len();
if a.arch_supports_canonicalize_nan()
&& self.config.nan_canonicalization
&& fp.canonicalization.is_some()
{
Self::canonicalize_nan(
a,
&mut self.machine,
fp.canonicalization.unwrap().to_size(),
params[index],
params[index],
);
}
self.fp_stack.pop().unwrap(); self.fp_stack.pop().unwrap();
} else { } else {
break; break;