From f6e027da32caabdea57bae9ee806abe1d9e3ac68 Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sun, 8 Oct 2023 00:02:19 -0400 Subject: [PATCH] x86_64: fix conversions between floats and 128-bit integers --- src/arch/x86_64/CodeGen.zig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index a637254838..b2f03a993f 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -11470,9 +11470,13 @@ fn airFloatFromInt(self: *Self, inst: Air.Inst.Index) !void { const result = result: { if (switch (dst_bits) { 16, 80, 128 => true, - 32, 64 => src_size > 8 and src_size < 16, + 32, 64 => src_size > 8, else => unreachable, }) { + if (src_bits > 128) return self.fail("TODO implement airFloatFromInt from {} to {}", .{ + src_ty.fmt(mod), dst_ty.fmt(mod), + }); + var callee: ["__floatun?i?f".len]u8 = undefined; break :result try self.genCall(.{ .lib = .{ .return_type = dst_ty.toIntern(), @@ -11488,10 +11492,6 @@ fn airFloatFromInt(self: *Self, inst: Air.Inst.Index) !void { } }, &.{src_ty}, &.{.{ .air_ref = ty_op.operand }}); } - if (src_size > 8) return self.fail("TODO implement airFloatFromInt from {} to {}", .{ - src_ty.fmt(mod), dst_ty.fmt(mod), - }); - const src_mcv = try self.resolveInst(ty_op.operand); const src_reg = if (src_mcv.isRegister()) src_mcv.getReg().? @@ -11549,9 +11549,13 @@ fn airIntFromFloat(self: *Self, inst: Air.Inst.Index) !void { const result = result: { if (switch (src_bits) { 16, 80, 128 => true, - 32, 64 => dst_size > 8 and dst_size < 16, + 32, 64 => dst_size > 8, else => unreachable, }) { + if (dst_bits > 128) return self.fail("TODO implement airIntFromFloat from {} to {}", .{ + src_ty.fmt(mod), dst_ty.fmt(mod), + }); + var callee: ["__fixuns?f?i".len]u8 = undefined; break :result try self.genCall(.{ .lib = .{ .return_type = dst_ty.toIntern(), @@ -11567,10 +11571,6 @@ fn airIntFromFloat(self: *Self, inst: Air.Inst.Index) !void { } }, &.{src_ty}, &.{.{ .air_ref = ty_op.operand }}); } - if (dst_size > 8) return self.fail("TODO implement airIntFromFloat from {} to {}", .{ - src_ty.fmt(mod), dst_ty.fmt(mod), - }); - const src_mcv = try self.resolveInst(ty_op.operand); const src_reg = if (src_mcv.isRegister()) src_mcv.getReg().?