Commit c256603eaef162e7df004d3508bbd4f2ec3470eb | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-02-08 21:04:38+01:00
committer	GitHub <noreply@github.com> 2022-02-08 21:04:38+01:00
log	c256603eaef162e7df004d3508bbd4f2ec3470eb
tree	60fd2c37a73f090facfacb89e72e394be37d07ed
parent	37fea3e3ddc1f7d266d95789c3b1005291bcb96b
parent	8fe9d2f9867101fc8d6a91c6e10c6f3b644ce6a8
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #10839 from joachimschmidt557/stage2-arm

stage2 ARM: genTypedValue for all integer types

7 files changed, 27 insertions(+), 27 deletions(-)

src
- arch
  - arm
    CodeGen.zig
test
- behavior
  - align.zig
  - bugs
    1277.zig
    1310.zig
    2006.zig
  - cast.zig
  - struct.zig

src/arch/arm/CodeGen.zig+27-8

 @@ -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_ty = struct_ty.structFieldType(index);
         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) {
+            .dead, .unreach => unreachable,
+            .stack_argument_offset => |off| {
+                break :result MCValue{ .stack_argument_offset = off + adjusted_field_offset };
+            },
             .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}),
         }
 @@ -3180,7 +3189,6 @@ fn setRegOrMem(self: *Self, ty: Type, loc: MCValue, val: MCValue) !void {
 fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerError!void {
     switch (mcv) {
         .dead => unreachable,
-        .ptr_stack_offset => unreachable,
         .ptr_embedded_in_code => unreachable,
         .unreach, .none => return, // Nothing to do.
         .undef => {
 @@ -3194,6 +3202,10 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
                 else => return self.fail("TODO implement memset", .{}),
             }
         },
+        .ptr_stack_offset => {
+            const reg = try self.copyToTmpRegister(ty, mcv);
+            return self.genSetStack(ty, stack_offset, MCValue{ .register = reg });
+        },
         .compare_flags_unsigned,
         .compare_flags_signed,
         .immediate,
 @@ -3858,9 +3870,7 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl: *Module.Decl) InnerError!MCVa
         const got_addr = got.p_vaddr + decl.link.elf.offset_table_index * ptr_bytes;
         return MCValue{ .memory = got_addr };
     } else if (self.bin_file.cast(link.File.MachO)) |_| {
-        // TODO I'm hacking my way through here by repurposing .memory for storing
+        unreachable; // unsupported architecture for MachO
-        // index to the GOT target symbol index.
-        return MCValue{ .memory = decl.link.macho.local_sym_index };
     } else if (self.bin_file.cast(link.File.Coff)) |coff_file| {
         const got_addr = coff_file.offset_table_virtual_address + decl.link.coff.offset_table_index * ptr_bytes;
         return MCValue{ .memory = got_addr };
 @@ -3929,10 +3939,19 @@ fn genTypedValue(self: *Self, typed_value: TypedValue) InnerError!MCValue {
         },
         .Int => {
             const info = typed_value.ty.intInfo(self.target.*);
-            if (info.bits > ptr_bits or info.signedness == .signed) {
+            if (info.bits <= ptr_bits) {
-                return self.fail("TODO const int bigger than ptr and signed int", .{});
+                const unsigned = switch (info.signedness) {
+                    .signed => blk: {
+                        const signed = @intCast(i32, typed_value.val.toSignedInt());
+                        break :blk @bitCast(u32, signed);
+                    },
+                    .unsigned => @intCast(u32, typed_value.val.toUnsignedInt()),
+                };
+                return MCValue{ .immediate = unsigned };
+            } else {
+                return self.lowerUnnamedConst(typed_value);
             }
-            return MCValue{ .immediate = @intCast(u32, typed_value.val.toUnsignedInt()) };
         },
         .Bool => {
             return MCValue{ .immediate = @boolToInt(typed_value.val.toBool()) };

test/behavior/align.zig-2

...	@@ -93,8 +93,6 @@ test "@ptrCast preserves alignment of bigger source" {	...	@@ -93,8 +93,6 @@ test "@ptrCast preserves alignment of bigger source" {
93	}	93	}
94		94
95	test "alignstack" {	95	test "alignstack" {
96	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
97
98	try expect(fnWithAlignedStack() == 1234);	96	try expect(fnWithAlignedStack() == 1234);
99	}	97	}
100		98

test/behavior/bugs/1277.zig-1

...	@@ -12,6 +12,5 @@ fn f() i32 {	...	@@ -12,6 +12,5 @@ fn f() i32 {
12	}	12	}
13		13
14	test "don't emit an LLVM global for a const function when it's in an optional in a struct" {	14	test "don't emit an LLVM global for a const function when it's in an optional in a struct" {
15	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
16	try std.testing.expect(s.f.?() == 1234);	15	try std.testing.expect(s.f.?() == 1234);
17	}	16	}

test/behavior/bugs/1310.zig-1

...	@@ -23,6 +23,5 @@ fn agent_callback(_vm: []VM, options: []u8) callconv(.C) i32 {	...	@@ -23,6 +23,5 @@ fn agent_callback(_vm: []VM, options: []u8) callconv(.C) i32 {
23	}	23	}
24		24
25	test "fixed" {	25	test "fixed" {
26	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
27	try expect(agent_callback(undefined, undefined) == 11);	26	try expect(agent_callback(undefined, undefined) == 11);
28	}	27	}

test/behavior/bugs/2006.zig-1

...	@@ -7,7 +7,6 @@ const S = struct {	...	@@ -7,7 +7,6 @@ const S = struct {
7	};	7	};
8	test "bug 2006" {	8	test "bug 2006" {
9	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;	9	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
10	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
11	if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;	10	if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
12	var a: S = undefined;	11	var a: S = undefined;
13	a = S{ .p = undefined };	12	a = S{ .p = undefined };

test/behavior/cast.zig-4

...	@@ -35,8 +35,6 @@ fn peerTypeTAndOptionalT(c: bool, b: bool) ?usize {	...	@@ -35,8 +35,6 @@ fn peerTypeTAndOptionalT(c: bool, b: bool) ?usize {
35	}	35	}
36		36
37	test "resolve undefined with integer" {	37	test "resolve undefined with integer" {
38	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
39
40	try testResolveUndefWithInt(true, 1234);	38	try testResolveUndefWithInt(true, 1234);
41	comptime try testResolveUndefWithInt(true, 1234);	39	comptime try testResolveUndefWithInt(true, 1234);
42	}	40	}
...	@@ -205,8 +203,6 @@ test "implicit cast from [N]T to [c]T" {	...	@@ -205,8 +203,6 @@ test "implicit cast from [N]T to [c]T" {
205	}	203	}
206		204
207	test "usize to void" {	205	test "usize to void" {
208	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
209
210	var i = @as(usize, 0);	206	var i = @as(usize, 0);
211	var v = @ptrCast(*void, &i);	207	var v = @ptrCast(*void, &i);
212	v.* = {};	208	v.* = {};

test/behavior/struct.zig-10

 @@ -114,8 +114,6 @@ test "struct byval assign" {
 }
 test "call struct static method" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
     const result = StructWithNoFields.add(3, 4);
     try expect(result == 7);
 }
 @@ -176,16 +174,12 @@ const MemberFnTestFoo = struct {
 };
 test "call member function directly" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
     const instance = MemberFnTestFoo{ .x = 1234 };
     const result = MemberFnTestFoo.member(instance);
     try expect(result == 1234);
 }
 test "store member function in variable" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
     const instance = MemberFnTestFoo{ .x = 1234 };
     const memberFn = MemberFnTestFoo.member;
     const result = memberFn(instance);
 @@ -193,8 +187,6 @@ test "store member function in variable" {
 }
 test "member functions" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
     const r = MemberFnRand{ .seed = 1234 };
     try expect(r.getSeed() == 1234);
 }
 @@ -244,8 +236,6 @@ test "call method with mutable reference to struct with no fields" {
 }
 test "usingnamespace within struct scope" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
     const S = struct {
         usingnamespace struct {
             pub fn inner() i32 {