From 4ed34cdcea058c3273a0d0162e1a9c5f63e8ed4a Mon Sep 17 00:00:00 2001 From: MerryMage Date: Thu, 25 Jun 2020 19:33:12 +0100 Subject: [PATCH] emit_x64_floating_point: Introduce ICODE --- src/backend/x64/emit_x64_floating_point.cpp | 29 +++++---------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/backend/x64/emit_x64_floating_point.cpp b/src/backend/x64/emit_x64_floating_point.cpp index 21b13481..6ab4f24a 100644 --- a/src/backend/x64/emit_x64_floating_point.cpp +++ b/src/backend/x64/emit_x64_floating_point.cpp @@ -61,18 +61,8 @@ constexpr u64 f64_max_s64_lim = 0x43e0000000000000u; // 2^63 as a double (actual constexpr u64 f64_min_u64 = 0x0000000000000000u; // 0 as a double constexpr u64 f64_max_u64_lim = 0x43f0000000000000u; // 2^64 as a double (actual maximum unrepresentable) -template -T ChooseOnFsize([[maybe_unused]] T f32, [[maybe_unused]] T f64) { - static_assert(fsize == 32 || fsize == 64, "fsize must be either 32 or 64"); - - if constexpr (fsize == 32) { - return f32; - } else { - return f64; - } -} - -#define FCODE(NAME) (code.*ChooseOnFsize(&Xbyak::CodeGenerator::NAME##s, &Xbyak::CodeGenerator::NAME##d)) +#define FCODE(NAME) [&]{ if constexpr (fsize == 32) return [&](auto... args){ code.NAME##s(args...); }; else return [&](auto... args){ code.NAME##d(args...); }; }() +#define ICODE(NAME) [&]{ if constexpr (fsize == 32) return [&](auto... args){ code.NAME##d(args...); }; else return [&](auto... args){ code.NAME##q(args...); }; }() std::optional ConvertRoundingModeToX64Immediate(FP::RoundingMode rounding_mode) { switch (rounding_mode) { @@ -148,17 +138,10 @@ Xbyak::Label ProcessNaN(BlockOfCode& code, Xbyak::Xmm a) { template void PostProcessNaN(BlockOfCode& code, Xbyak::Xmm result, Xbyak::Xmm tmp) { - if constexpr (fsize == 32) { - code.movaps(tmp, result); - code.cmpunordps(tmp, tmp); - code.pslld(tmp, 31); - code.xorps(result, tmp); - } else { - code.movaps(tmp, result); - code.cmpunordpd(tmp, tmp); - code.psllq(tmp, 63); - code.xorps(result, tmp); - } + code.movaps(tmp, result); + FCODE(cmpunordp)(tmp, tmp); + ICODE(psll)(tmp, fsize - 1); + code.xorps(result, tmp); } // This is necessary because x86 and ARM differ in they way they return NaNs from floating point operations