T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch NaN explicitly in expand_fcvt_to_uint().

Browse Source 
When the input is a NaN, we need to generate a different trap code, so
use the new trapff instruction to generate such a trap after the first
floating point comparison.
This commit is contained in:
Jakob Stoklund Olesen
2018-02-20 14:44:57 -08:00
parent b9b1d0fcd5
commit c846ec1626
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/cretonne/src/isa/intel/enc_tables.rs
View File

@@ -449,21 +449,43 @@ fn expand_fcvt_to_uint(
ir::types::F64 => pos.ins().f64const(Ieee64::pow2(ty.lane_bits() - 1)), ir::types::F64 => pos.ins().f64const(Ieee64::pow2(ty.lane_bits() - 1)),
_ => panic!("Can't convert {}", xty), _ => panic!("Can't convert {}", xty),
}; };
let is_large = pos.ins().fcmp(FloatCC::GreaterThanOrEqual, x, pow2nm1); let is_large = pos.ins().ffcmp(x, pow2nm1);
pos.ins().brnz(is_large, large, &[]); pos.ins().brff(
FloatCC::GreaterThanOrEqual,
is_large,
large,
&[],
);
// Now we know that x < 2^(N-1) or x is NaN. // We need to generate a specific trap code when `x` is NaN, so reuse the flags from the
// previous comparison.
pos.ins().trapff(
FloatCC::Unordered,
is_large,
ir::TrapCode::BadConversionToInteger,
);
// Now we know that x < 2^(N-1) and not NaN.
let sres = pos.ins().x86_cvtt2si(ty, x); let sres = pos.ins().x86_cvtt2si(ty, x);
let is_neg = pos.ins().icmp_imm(IntCC::SignedLessThan, sres, 0); let is_neg = pos.ins().ifcmp_imm(sres, 0);
pos.ins().brz(is_neg, done, &[sres]); pos.ins().brif(
pos.ins().trap(ir::TrapCode::BadConversionToInteger); IntCC::SignedGreaterThanOrEqual,
is_neg,
done,
&[sres],
);
pos.ins().trap(ir::TrapCode::IntegerOverflow);
// Handle the case where x >= 2^(N-1) and not NaN. // Handle the case where x >= 2^(N-1) and not NaN.
pos.insert_ebb(large); pos.insert_ebb(large);
let adjx = pos.ins().fsub(x, pow2nm1); let adjx = pos.ins().fsub(x, pow2nm1);
let lres = pos.ins().x86_cvtt2si(ty, adjx); let lres = pos.ins().x86_cvtt2si(ty, adjx);
let is_neg = pos.ins().icmp_imm(IntCC::SignedLessThan, lres, 0); let is_neg = pos.ins().ifcmp_imm(lres, 0);
pos.ins().trapnz(is_neg, ir::TrapCode::IntegerOverflow); pos.ins().trapif(
IntCC::SignedLessThan,
is_neg,
ir::TrapCode::IntegerOverflow,
);
let lfinal = pos.ins().iadd_imm(lres, 1 << (ty.lane_bits() - 1)); let lfinal = pos.ins().iadd_imm(lres, 1 << (ty.lane_bits() - 1));
// Recycle the original instruction as a jump. // Recycle the original instruction as a jump.