authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-04-03 14:14:55-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-04-03 15:19:07-04:00
log821eb595f4bd65d003a2cb499c7953f4f57a4c4a
tree2e61ac22da9ad532077157a2fc9cf9a179b64cb7
parent9fd460821f992c51b35a54ba93562af93ac478f6

x86_64: implement cmp_lt_errors_len

3 files changed, 65 insertions(+), 9 deletions(-)

src/arch/x86_64/CodeGen.zig+58-5
......@@ -5650,9 +5650,62 @@ fn airCmpVector(self: *Self, inst: Air.Inst.Index) !void {
56505650
56515651fn airCmpLtErrorsLen(self: *Self, inst: Air.Inst.Index) !void {
56525652 const un_op = self.air.instructions.items(.data)[inst].un_op;
5653 const operand = try self.resolveInst(un_op);
5654 _ = operand;
5655 const result: MCValue = if (self.liveness.isUnused(inst)) .dead else return self.fail("TODO implement airCmpLtErrorsLen for {}", .{self.target.cpu.arch});
5653 const result: MCValue = if (self.liveness.isUnused(inst)) .dead else result: {
5654 const addr_reg = try self.register_manager.allocReg(null, gp);
5655 const addr_lock = self.register_manager.lockRegAssumeUnused(addr_reg);
5656 defer self.register_manager.unlockReg(addr_lock);
5657
5658 if (self.bin_file.cast(link.File.Elf)) |elf_file| {
5659 const atom_index = try elf_file.getOrCreateAtomForLazySymbol(
5660 .{ .kind = .const_data, .ty = Type.anyerror },
5661 4, // dword alignment
5662 );
5663 const got_addr = elf_file.getAtom(atom_index).getOffsetTableAddress(elf_file);
5664 try self.asmRegisterMemory(.mov, addr_reg.to64(), Memory.sib(.qword, .{
5665 .base = .ds,
5666 .disp = @intCast(i32, got_addr),
5667 }));
5668 } else if (self.bin_file.cast(link.File.Coff)) |coff_file| {
5669 const atom_index = try coff_file.getOrCreateAtomForLazySymbol(
5670 .{ .kind = .const_data, .ty = Type.anyerror },
5671 4, // dword alignment
5672 );
5673 const sym_index = coff_file.getAtom(atom_index).getSymbolIndex().?;
5674 try self.genSetReg(Type.usize, addr_reg, .{ .linker_load = .{
5675 .type = .got,
5676 .sym_index = sym_index,
5677 } });
5678 } else if (self.bin_file.cast(link.File.MachO)) |macho_file| {
5679 const atom_index = try macho_file.getOrCreateAtomForLazySymbol(
5680 .{ .kind = .const_data, .ty = Type.anyerror },
5681 4, // dword alignment
5682 );
5683 const sym_index = macho_file.getAtom(atom_index).getSymbolIndex().?;
5684 try self.genSetReg(Type.usize, addr_reg, .{ .linker_load = .{
5685 .type = .got,
5686 .sym_index = sym_index,
5687 } });
5688 } else {
5689 return self.fail("TODO implement airErrorName for x86_64 {s}", .{@tagName(self.bin_file.tag)});
5690 }
5691
5692 try self.spillEflagsIfOccupied();
5693 self.eflags_inst = inst;
5694
5695 const op_ty = self.air.typeOf(un_op);
5696 const op_abi_size = @intCast(u32, op_ty.abiSize(self.target.*));
5697 const op_mcv = try self.resolveInst(un_op);
5698 const dst_reg = switch (op_mcv) {
5699 .register => |reg| reg,
5700 else => try self.copyToTmpRegister(op_ty, op_mcv),
5701 };
5702 try self.asmRegisterMemory(
5703 .cmp,
5704 registerAlias(dst_reg, op_abi_size),
5705 Memory.sib(Memory.PtrSize.fromSize(op_abi_size), .{ .base = addr_reg }),
5706 );
5707 break :result .{ .eflags = .b };
5708 };
56565709 return self.finishAir(inst, result, .{ un_op, .none, .none });
56575710}
56585711
......@@ -8027,12 +8080,12 @@ fn airErrorName(self: *Self, inst: Air.Inst.Index) !void {
80278080 try self.asmRegisterMemory(.mov, start_reg.to32(), Memory.sib(.dword, .{
80288081 .base = addr_reg.to64(),
80298082 .scale_index = .{ .scale = 4, .index = err_reg.to64() },
8030 .disp = 0,
8083 .disp = 4,
80318084 }));
80328085 try self.asmRegisterMemory(.mov, end_reg.to32(), Memory.sib(.dword, .{
80338086 .base = addr_reg.to64(),
80348087 .scale_index = .{ .scale = 4, .index = err_reg.to64() },
8035 .disp = 4,
8088 .disp = 8,
80368089 }));
80378090 try self.asmRegisterRegister(.sub, end_reg.to32(), start_reg.to32());
80388091 try self.asmRegisterMemory(.lea, start_reg.to64(), Memory.sib(.byte, .{
src/codegen.zig+7-3
......@@ -124,13 +124,17 @@ pub fn generateLazySymbol(
124124
125125 if (lazy_sym.kind == .const_data and lazy_sym.ty.isAnyError()) {
126126 const err_names = mod.error_name_list.items;
127 try code.resize(err_names.len * 4);
128 for (err_names, 0..) |err_name, index| {
129 mem.writeInt(u32, code.items[index * 4 ..][0..4], @intCast(u32, code.items.len), endian);
127 mem.writeInt(u32, try code.addManyAsArray(4), @intCast(u32, err_names.len), endian);
128 var offset = code.items.len;
129 try code.resize((1 + err_names.len + 1) * 4);
130 for (err_names) |err_name| {
131 mem.writeInt(u32, code.items[offset..][0..4], @intCast(u32, code.items.len), endian);
132 offset += 4;
130133 try code.ensureUnusedCapacity(err_name.len + 1);
131134 code.appendSliceAssumeCapacity(err_name);
132135 code.appendAssumeCapacity(0);
133136 }
137 mem.writeInt(u32, code.items[offset..][0..4], @intCast(u32, code.items.len), endian);
134138 return Result.ok;
135139 } else return .{ .fail = try ErrorMsg.create(
136140 bin_file.allocator,
test/behavior/cast.zig-1
......@@ -402,7 +402,6 @@ test "expected [*c]const u8, found [*:0]const u8" {
402402
403403test "explicit cast from integer to error type" {
404404 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
405 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
406405 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
407406 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
408407 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO