mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-07 23:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2 ARM: airStructFieldVal for more MCValues

Browse Source
This commit is contained in:
joachimschmidt557 2022-02-08 13:21:54 +01:00
parent 6b0c950cb8
commit 8fe9d2f986
No known key found for this signature in database
GPG Key ID: E0B575BE2884ACC5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/arm/CodeGen.zig
View File

@ -1703,9 +1703,18 @@ fn airStructFieldVal(self: *Self, inst: Air.Inst.Index) !void {
const struct_field_offset = @intCast(u32, struct_ty.structFieldOffset(index, self.target.*)); const struct_field_offset = @intCast(u32, struct_ty.structFieldOffset(index, self.target.*));
const struct_field_ty = struct_ty.structFieldType(index); const struct_field_ty = struct_ty.structFieldType(index);
const struct_field_size = @intCast(u32, struct_field_ty.abiSize(self.target.*)); const struct_field_size = @intCast(u32, struct_field_ty.abiSize(self.target.*));
const adjusted_field_offset = struct_size - struct_field_offset - struct_field_size;
switch (mcv) { switch (mcv) {
.dead, .unreach => unreachable,
.stack_argument_offset => |off| {
break :result MCValue{ .stack_argument_offset = off + adjusted_field_offset };
},
.stack_offset => |off| { .stack_offset => |off| {
break :result MCValue{ .stack_offset = off + struct_size - struct_field_offset - struct_field_size }; break :result MCValue{ .stack_offset = off + adjusted_field_offset };
},
.memory => |addr| {
break :result MCValue{ .memory = addr + adjusted_field_offset };
}, },
else => return self.fail("TODO implement codegen struct_field_val for {}", .{mcv}), else => return self.fail("TODO implement codegen struct_field_val for {}", .{mcv}),
} }

4
test/behavior/struct.zig
View File

@ -174,16 +174,12 @@ const MemberFnTestFoo = struct {
}; };
test "call member function directly" { test "call member function directly" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
const instance = MemberFnTestFoo{ .x = 1234 }; const instance = MemberFnTestFoo{ .x = 1234 };
const result = MemberFnTestFoo.member(instance); const result = MemberFnTestFoo.member(instance);
try expect(result == 1234); try expect(result == 1234);
} }
test "store member function in variable" { test "store member function in variable" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
const instance = MemberFnTestFoo{ .x = 1234 }; const instance = MemberFnTestFoo{ .x = 1234 };
const memberFn = MemberFnTestFoo.member; const memberFn = MemberFnTestFoo.member;
const result = memberFn(instance); const result = memberFn(instance);