Commit de39c5f67ffec18b9a5aa51e84dbf5f04ce013bc | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-07-26 18:41:29-07:00
committer	GitHub <noreply@github.com> 2025-07-26 18:41:29-07:00
log	de39c5f67ffec18b9a5aa51e84dbf5f04ce013bc
tree	8f34a4d8425c6acf69de936e3100ab77e9528bbb
parent	a51cdf3b24c25959ee55a38428dc0da42a8be81c
parent	3194a4d22b755393296a4db4c85d7b54ea83e96d
signature	Signed by PGP key B5690EEEBB952194

Merge pull request #24587 from jacobly0/x86_64

x86_64: fix some bugs

2 files changed, 40 insertions(+), 21 deletions(-)

src
- arch
  - x86_64
    CodeGen.zig
test
- behavior
  - switch.zig

src/arch/x86_64/CodeGen.zig+30-21

 @@ -1103,11 +1103,7 @@ const FormatAirData = struct {
     inst: Air.Inst.Index,
 };
 fn formatAir(data: FormatAirData, w: *std.io.Writer) Writer.Error!void {
-    // not acceptable implementation because it ignores `w`:
+    data.self.air.writeInst(w, data.inst, data.self.pt, data.self.liveness);
-    //data.self.air.dumpInst(data.inst, data.self.pt, data.self.liveness);
-    _ = data;
-    _ = w;
-    @panic("TODO: unimplemented");
 }
 fn fmtAir(self: *CodeGen, inst: Air.Inst.Index) std.fmt.Formatter(FormatAirData, formatAir) {
     return .{ .data = .{ .self = self, .inst = inst } };
 @@ -179300,10 +179296,13 @@ fn lowerSwitchBr(
         } else undefined;
         const table_start: u31 = @intCast(cg.mir_table.items.len);
         {
-            const condition_index_reg = if (condition_index.isRegister())
+            const condition_index_reg = condition_index_reg: {
-                condition_index.getReg().?
+                if (condition_index.isRegister()) {
-            else
+                    const condition_index_reg = condition_index.getReg().?;
-                try cg.copyToTmpRegister(.usize, condition_index);
+                    if (condition_index_reg.isClass(.general_purpose)) break :condition_index_reg condition_index_reg;
+                }
+                break :condition_index_reg try cg.copyToTmpRegister(.usize, condition_index);
+            };
             const condition_index_lock = cg.register_manager.lockReg(condition_index_reg);
             defer if (condition_index_lock) |lock| cg.register_manager.unlockReg(lock);
             try cg.truncateRegister(condition_ty, condition_index_reg);
 @@ -191921,18 +191920,15 @@ const Select = struct {
                 error.InvalidInstruction => {
                     const fixes = @tagName(mir_tag[0]);
                     const fixes_blank = std.mem.indexOfScalar(u8, fixes, '_').?;
-                    return s.cg.fail(
+                    return s.cg.fail("invalid instruction: '{s}{s}{s} {s} {s} {s} {s}'", .{
-                        "invalid instruction: '{s}{s}{s} {s} {s} {s} {s}'",
+                        fixes[0..fixes_blank],
-                        .{
+                        @tagName(mir_tag[1]),
-                            fixes[0..fixes_blank],
+                        fixes[fixes_blank + 1 ..],
-                            @tagName(mir_tag[1]),
+                        @tagName(mir_ops[0]),
-                            fixes[fixes_blank + 1 ..],
+                        @tagName(mir_ops[1]),
-                            @tagName(mir_ops[0]),
+                        @tagName(mir_ops[2]),
-                            @tagName(mir_ops[1]),
+                        @tagName(mir_ops[3]),
-                            @tagName(mir_ops[2]),
+                    });
-                            @tagName(mir_ops[3]),
-                        },
-                    );
                 },
                 else => |e| return e,
             };
 @@ -194424,6 +194420,18 @@ fn select(
             while (true) for (pattern.src[0..src_temps.len], src_temps) |src_pattern, *src_temp| {
                 if (try src_pattern.convert(src_temp, cg)) break;
             } else break;
+            var src_locks: [s_src_temps.len][2]?RegisterLock = @splat(@splat(null));
+            for (src_locks[0..src_temps.len], src_temps) |*locks, src_temp| {
+                const regs: [2]Register = switch (src_temp.tracking(cg).short) {
+                    else => continue,
+                    .register => |reg| .{ reg, .none },
+                    .register_pair => |regs| regs,
+                };
+                for (regs, locks) |reg, *lock| {
+                    if (reg == .none) continue;
+                    lock.* = cg.register_manager.lockRegIndex(RegisterManager.indexOfRegIntoTracked(reg) orelse continue);
+                }
+            }
             @memcpy(s_src_temps[0..src_temps.len], src_temps);
             std.mem.swap(Temp, &s_src_temps[pattern.commute[0]], &s_src_temps[pattern.commute[1]]);
 @@ -194442,6 +194450,7 @@ fn select(
             }
             assert(s.top == 0);
+            for (src_locks) |locks| for (locks) |lock| if (lock) |reg| cg.register_manager.unlockReg(reg);
             for (tmp_locks) |locks| for (locks) |lock| if (lock) |reg| cg.register_manager.unlockReg(reg);
             for (dst_locks) |locks| for (locks) |lock| if (lock) |reg| cg.register_manager.unlockReg(reg);
             caller_preserved: {

test/behavior/switch.zig+10

...	@@ -1072,3 +1072,13 @@ test "switch on a signed value smaller than the smallest prong value" {	...	@@ -1072,3 +1072,13 @@ test "switch on a signed value smaller than the smallest prong value" {
1072	else => {},	1072	else => {},
1073	}	1073	}
1074	}	1074	}
		1075
		1076	test "switch on 8-bit mod result" {
		1077	var x: u8 = undefined;
		1078	x = 16;
		1079	switch (x % 4) {
		1080	0 => {},
		1081	1, 2, 3 => return error.TestFailed,
		1082	else => unreachable,
		1083	}
		1084	}