authorgravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-12 22:30:28+01:00
committergravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-16 20:19:58+01:00
logca1ffb0951a0bd039ac435435a5c396f26c6d141
tree9eca24e25d8b17395a61c21dcc65ddcafbab1bd0
parent1f313b3d7c757a8cdc5a52a1986f0f694b7ffc5f
signaturelock-open Commit is signed but in an unrecognized format.

stage2 ARM: genSetStack for stack_argument_offset

16 files changed, 27 insertions(+), 50 deletions(-)

src/arch/arm/CodeGen.zig+18-26
......@@ -2876,35 +2876,19 @@ fn airCondBr(self: *Self, inst: Air.Inst.Index) !void {
28762876 const condition = Condition.fromCompareOperatorUnsigned(cmp_op);
28772877 break :blk condition.negate();
28782878 },
2879 .register => |reg| blk: {
2880 try self.spillCompareFlagsIfOccupied();
2881
2882 // cmp reg, 1
2883 // bne ...
2884 _ = try self.addInst(.{
2885 .tag = .cmp,
2886 .cond = .al,
2887 .data = .{ .rr_op = .{
2888 .rd = .r0,
2889 .rn = reg,
2890 .op = Instruction.Operand.imm(1, 0),
2891 } },
2892 });
2879 else => blk: {
2880 const reg = switch (cond) {
2881 .register => |r| r,
2882 else => try self.copyToTmpRegister(Type.bool, cond),
2883 };
28932884
2894 break :blk .ne;
2895 },
2896 .stack_offset,
2897 .memory,
2898 .stack_argument_offset,
2899 => blk: {
29002885 try self.spillCompareFlagsIfOccupied();
29012886
2902 const reg = try self.copyToTmpRegister(Type.initTag(.bool), cond);
2903
29042887 // cmp reg, 1
29052888 // bne ...
29062889 _ = try self.addInst(.{
29072890 .tag = .cmp,
2891 .cond = .al,
29082892 .data = .{ .rr_op = .{
29092893 .rd = .r0,
29102894 .rn = reg,
......@@ -2914,7 +2898,6 @@ fn airCondBr(self: *Self, inst: Air.Inst.Index) !void {
29142898
29152899 break :blk .ne;
29162900 },
2917 else => return self.fail("TODO implement condbr {} when condition is {s}", .{ self.target.cpu.arch, @tagName(cond) }),
29182901 };
29192902
29202903 break :reloc try self.addInst(.{
......@@ -3603,9 +3586,18 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
36033586 try self.genSetReg(ptr_ty, src_reg, .{ .ptr_stack_offset = off });
36043587 },
36053588 .memory => |addr| try self.genSetReg(ptr_ty, src_reg, .{ .immediate = @intCast(u32, addr) }),
3606 .embedded_in_code,
3607 .stack_argument_offset,
3608 => return self.fail("TODO genSetStack with src={}", .{mcv}),
3589 .stack_argument_offset => |unadjusted_off| {
3590 const adj_off = unadjusted_off + abi_size;
3591
3592 _ = try self.addInst(.{
3593 .tag = .ldr_ptr_stack_argument,
3594 .data = .{ .r_stack_offset = .{
3595 .rt = src_reg,
3596 .stack_offset = adj_off,
3597 } },
3598 });
3599 },
3600 .embedded_in_code => return self.fail("TODO genSetStack with src={}", .{mcv}),
36093601 else => unreachable,
36103602 }
36113603
src/arch/arm/Emit.zig+7
......@@ -112,6 +112,7 @@ pub fn emitMir(
112112 .str => try emit.mirLoadStore(inst),
113113 .strb => try emit.mirLoadStore(inst),
114114
115 .ldr_ptr_stack_argument => try emit.mirLoadStackArgument(inst),
115116 .ldr_stack_argument => try emit.mirLoadStackArgument(inst),
116117 .ldrb_stack_argument => try emit.mirLoadStackArgument(inst),
117118 .ldrh_stack_argument => try emit.mirLoadStackArgument(inst),
......@@ -597,6 +598,12 @@ fn mirLoadStackArgument(emit: *Emit, inst: Mir.Inst.Index) !void {
597598
598599 const raw_offset = emit.prologue_stack_space - r_stack_offset.stack_offset;
599600 switch (tag) {
601 .ldr_ptr_stack_argument => {
602 const operand = Instruction.Operand.fromU32(raw_offset) orelse
603 return emit.fail("TODO mirLoadStack larger offsets", .{});
604
605 try emit.writeInstruction(Instruction.add(cond, r_stack_offset.rt, .fp, operand));
606 },
600607 .ldr_stack_argument,
601608 .ldrb_stack_argument,
602609 => {
src/arch/arm/Mir.zig+2
......@@ -54,6 +54,8 @@ pub const Inst = struct {
5454 eor,
5555 /// Load Register
5656 ldr,
57 /// Pseudo-instruction: Load pointer to stack argument offset
58 ldr_ptr_stack_argument,
5759 /// Load Register
5860 ldr_stack_argument,
5961 /// Load Register Byte
test/behavior/array.zig-1
......@@ -202,7 +202,6 @@ fn doSomeMangling(array: *[4]u8) void {
202202
203203test "implicit cast zero sized array ptr to slice" {
204204 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
205 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
206205
207206 {
208207 var b = "".*;
test/behavior/bitcast.zig-1
......@@ -269,7 +269,6 @@ test "bitcast passed as tuple element" {
269269
270270test "triple level result location with bitcast sandwich passed as tuple element" {
271271 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
272 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
273272
274273 const S = struct {
275274 fn foo(args: anytype) !void {
test/behavior/bugs/1421.zig-1
......@@ -9,7 +9,6 @@ const S = struct {
99};
1010
1111test "functions with return type required to be comptime are generic" {
12 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1312 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
1413 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
1514 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
test/behavior/bugs/2692.zig-1
......@@ -6,7 +6,6 @@ fn foo(a: []u8) void {
66
77test "address of 0 length array" {
88 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
9 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
109 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
1110
1211 var pt: [0]u8 = undefined;
test/behavior/bugs/5474.zig-4
......@@ -49,15 +49,11 @@ fn constant() !void {
4949}
5050
5151test "pointer-to-array constness for zero-size elements, var" {
52 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
53
5452 try mutable();
5553 comptime try mutable();
5654}
5755
5856test "pointer-to-array constness for zero-size elements, const" {
59 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
60
6157 try constant();
6258 comptime try constant();
6359}
test/behavior/bugs/828.zig-1
......@@ -30,7 +30,6 @@ fn constCount(comptime cb: *const CountBy, comptime unused: u32) void {
3030}
3131
3232test "comptime struct return should not return the same instance" {
33 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
3433 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
3534
3635 //the first parameter must be passed by reference to trigger the bug
test/behavior/cast.zig-3
......@@ -1129,7 +1129,6 @@ fn returnNullLitFromOptionalTypeErrorRef() anyerror!?*A {
11291129test "peer type resolution: [0]u8 and []const u8" {
11301130 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
11311131 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
1132 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11331132
11341133 try expect(peerTypeEmptyArrayAndSlice(true, "hi").len == 0);
11351134 try expect(peerTypeEmptyArrayAndSlice(false, "hi").len == 1);
......@@ -1278,8 +1277,6 @@ test "assignment to optional pointer result loc" {
12781277}
12791278
12801279test "cast between *[N]void and []void" {
1281 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1282
12831280 var a: [4]void = undefined;
12841281 var b: []void = &a;
12851282 try expect(b.len == 4);
test/behavior/optional.zig-1
......@@ -26,7 +26,6 @@ pub const EmptyStruct = struct {};
2626
2727test "optional pointer to size zero struct" {
2828 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
29 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
3029
3130 var e = EmptyStruct{};
3231 var o: ?*EmptyStruct = &e;
test/behavior/sizeof_and_typeof.zig-1
......@@ -186,7 +186,6 @@ test "@sizeOf(T) == 0 doesn't force resolving struct size" {
186186}
187187
188188test "@TypeOf() has no runtime side effects" {
189 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
190189 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
191190 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
192191 const S = struct {
test/behavior/slice.zig-2
......@@ -70,7 +70,6 @@ test "comptime slice of undefined pointer of length 0" {
7070test "implicitly cast array of size 0 to slice" {
7171 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
7272 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
73 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
7473
7574 var msg = [_]u8{};
7675 try assertLenIsZero(&msg);
......@@ -206,7 +205,6 @@ const y = x[0x100..];
206205test "compile time slice of pointer to hard coded address" {
207206 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
208207 if (builtin.zig_backend == .stage1) return error.SkipZigTest;
209 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
210208 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
211209 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
212210
test/behavior/struct.zig-2
......@@ -926,7 +926,6 @@ test "anonymous struct literal syntax" {
926926
927927test "fully anonymous struct" {
928928 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
929 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
930929
931930 const S = struct {
932931 fn doTheTest() !void {
......@@ -951,7 +950,6 @@ test "fully anonymous struct" {
951950
952951test "fully anonymous list literal" {
953952 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
954 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
955953
956954 const S = struct {
957955 fn doTheTest() !void {
test/behavior/struct_contains_null_ptr_itself.zig-1
......@@ -3,7 +3,6 @@ const expect = std.testing.expect;
33const builtin = @import("builtin");
44
55test "struct contains null pointer which contains original struct" {
6 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
76 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
87 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
98 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
test/behavior/var_args.zig-5
......@@ -14,7 +14,6 @@ fn add(args: anytype) i32 {
1414
1515test "add arbitrary args" {
1616 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
17 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1817
1918 try expect(add(.{ @as(i32, 1), @as(i32, 2), @as(i32, 3), @as(i32, 4) }) == 10);
2019 try expect(add(.{@as(i32, 1234)}) == 1234);
......@@ -27,14 +26,12 @@ fn readFirstVarArg(args: anytype) void {
2726
2827test "send void arg to var args" {
2928 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
30 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
3129
3230 readFirstVarArg(.{{}});
3331}
3432
3533test "pass args directly" {
3634 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
37 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
3835 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
3936
4037 try expect(addSomeStuff(.{ @as(i32, 1), @as(i32, 2), @as(i32, 3), @as(i32, 4) }) == 10);
......@@ -89,7 +86,6 @@ fn foo2(args: anytype) bool {
8986
9087test "array of var args functions" {
9188 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
92 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
9389
9490 try expect(foos[0](.{}));
9591 try expect(!foos[1](.{}));
......@@ -97,7 +93,6 @@ test "array of var args functions" {
9793
9894test "pass zero length array to var args param" {
9995 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
100 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
10196
10297 doNothingWithFirstArg(.{""});
10398}