authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-25 03:08:04-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-25 16:23:55-04:00
log0cfc0d0d13bd1e9f1a9119324fac624371aecdd3
tree4872b9bb774328133d4c5ca64cd0742de08ac40e
parentd9ce69dc3949fb11c43520096001b7f06e1a96f3

x86_64: implement struct_field_ptr for packed containers

7 files changed, 15 insertions(+), 19 deletions(-)

src/arch/x86_64/CodeGen.zig+15-12
......@@ -3659,34 +3659,37 @@ fn airStore(self: *Self, inst: Air.Inst.Index) !void {
36593659fn airStructFieldPtr(self: *Self, inst: Air.Inst.Index) !void {
36603660 const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;
36613661 const extra = self.air.extraData(Air.StructField, ty_pl.payload).data;
3662 const result = try self.structFieldPtr(inst, extra.struct_operand, extra.field_index);
3662 const result = try self.fieldPtr(inst, extra.struct_operand, extra.field_index);
36633663 return self.finishAir(inst, result, .{ extra.struct_operand, .none, .none });
36643664}
36653665
36663666fn airStructFieldPtrIndex(self: *Self, inst: Air.Inst.Index, index: u8) !void {
36673667 const ty_op = self.air.instructions.items(.data)[inst].ty_op;
3668 const result = try self.structFieldPtr(inst, ty_op.operand, index);
3668 const result = try self.fieldPtr(inst, ty_op.operand, index);
36693669 return self.finishAir(inst, result, .{ ty_op.operand, .none, .none });
36703670}
36713671
3672fn structFieldPtr(self: *Self, inst: Air.Inst.Index, operand: Air.Inst.Ref, index: u32) !MCValue {
3672fn fieldPtr(self: *Self, inst: Air.Inst.Index, operand: Air.Inst.Ref, index: u32) !MCValue {
36733673 if (self.liveness.isUnused(inst)) {
36743674 return MCValue.dead;
36753675 }
36763676
36773677 const mcv = try self.resolveInst(operand);
36783678 const ptr_ty = self.air.typeOf(operand);
3679 const struct_ty = ptr_ty.childType();
3680 if (struct_ty.zigTypeTag() == .Struct and struct_ty.containerLayout() == .Packed) {
3681 return self.fail("TODO structFieldPtr implement packed structs", .{});
3682 }
3683 const struct_field_offset = @intCast(u32, struct_ty.structFieldOffset(index, self.target.*));
3679 const container_ty = ptr_ty.childType();
3680 const field_offset = switch (container_ty.containerLayout()) {
3681 .Auto, .Extern => @intCast(u32, container_ty.structFieldOffset(index, self.target.*)),
3682 .Packed => if (container_ty.zigTypeTag() == .Struct and ptr_ty.ptrInfo().data.host_size == 0)
3683 container_ty.packedStructFieldByteOffset(index, self.target.*)
3684 else
3685 0,
3686 };
36843687
36853688 const dst_mcv: MCValue = result: {
36863689 switch (mcv) {
36873690 .stack_offset => {
36883691 const offset_reg = try self.copyToTmpRegister(ptr_ty, .{
3689 .immediate = struct_field_offset,
3692 .immediate = field_offset,
36903693 });
36913694 const offset_reg_lock = self.register_manager.lockRegAssumeUnused(offset_reg);
36923695 defer self.register_manager.unlockReg(offset_reg_lock);
......@@ -3696,7 +3699,7 @@ fn structFieldPtr(self: *Self, inst: Air.Inst.Index, operand: Air.Inst.Ref, inde
36963699 break :result dst_mcv;
36973700 },
36983701 .ptr_stack_offset => |off| {
3699 const ptr_stack_offset = off - @intCast(i32, struct_field_offset);
3702 const ptr_stack_offset = off - @intCast(i32, field_offset);
37003703 break :result MCValue{ .ptr_stack_offset = ptr_stack_offset };
37013704 },
37023705 .register => |reg| {
......@@ -3704,7 +3707,7 @@ fn structFieldPtr(self: *Self, inst: Air.Inst.Index, operand: Air.Inst.Ref, inde
37043707 defer self.register_manager.unlockReg(reg_lock);
37053708
37063709 const offset_reg = try self.copyToTmpRegister(ptr_ty, .{
3707 .immediate = struct_field_offset,
3710 .immediate = field_offset,
37083711 });
37093712 const offset_reg_lock = self.register_manager.lockRegAssumeUnused(offset_reg);
37103713 defer self.register_manager.unlockReg(offset_reg_lock);
......@@ -3725,7 +3728,7 @@ fn structFieldPtr(self: *Self, inst: Air.Inst.Index, operand: Air.Inst.Ref, inde
37253728 try self.genBinOpMir(.add, ptr_ty, .{ .register = result_reg }, .{ .register = offset_reg });
37263729 break :result MCValue{ .register = result_reg };
37273730 },
3728 else => return self.fail("TODO implement codegen struct_field_ptr for {}", .{mcv}),
3731 else => return self.fail("TODO implement fieldPtr for {}", .{mcv}),
37293732 }
37303733 };
37313734 return dst_mcv;
test/behavior/bugs/12450.zig-1
......@@ -10,7 +10,6 @@ var buffer: [256]u8 = undefined;
1010
1111test {
1212 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
13 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
1413 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
1514 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1615 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
test/behavior/bugs/2578.zig-1
......@@ -14,7 +14,6 @@ fn bar(pointer: ?*anyopaque) void {
1414test "fixed" {
1515 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
1616 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
17 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
1817 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1918
2019 bar(t);
test/behavior/bugs/726.zig-2
......@@ -4,7 +4,6 @@ const builtin = @import("builtin");
44test "@ptrCast from const to nullable" {
55 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
66 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
7 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
87 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
98
109 const c: u8 = 4;
......@@ -15,7 +14,6 @@ test "@ptrCast from const to nullable" {
1514test "@ptrCast from var in empty struct to nullable" {
1615 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1716 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
18 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
1917 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2018
2119 const container = struct {
test/behavior/fn.zig-1
......@@ -96,7 +96,6 @@ test "discard the result of a function that returns a struct" {
9696}
9797
9898test "inline function call that calls optional function pointer, return pointer at callsite interacts correctly with callsite return type" {
99 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
10099 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
101100 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
102101 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
test/behavior/packed-struct.zig-1
......@@ -571,7 +571,6 @@ test "packed struct passed to callconv(.C) function" {
571571test "overaligned pointer to packed struct" {
572572 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
573573 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
574 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
575574
576575 const S = packed struct { a: u32, b: u32 };
577576 var foo: S align(4) = .{ .a = 123, .b = 456 };
test/behavior/struct.zig-1
......@@ -827,7 +827,6 @@ test "non-packed struct with u128 entry in union" {
827827}
828828
829829test "packed struct field passed to generic function" {
830 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
831830 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
832831 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
833832 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO