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

stage2 AArch64: introduce ldr_ptr_stack Mir instruction

Browse Source
This commit is contained in:
joachimschmidt557 2022-09-20 18:07:00 +02:00
parent 230bafa1ab
commit 5838fe89c1
No known key found for this signature in database
GPG Key ID: E0B575BE2884ACC5
3 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/arch/aarch64/CodeGen.zig
View File

@ -4472,16 +4472,11 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void
} }
}, },
.ptr_stack_offset => |off| { .ptr_stack_offset => |off| {
// TODO: maybe addressing from sp instead of fp
const imm12 = math.cast(u12, off) orelse
return self.fail("TODO larger stack offsets", .{});
_ = try self.addInst(.{ _ = try self.addInst(.{
.tag = .sub_immediate, .tag = .ldr_ptr_stack,
.data = .{ .rr_imm12_sh = .{ .data = .{ .load_store_stack = .{
.rd = reg, .rt = reg,
.rn = .x29, .offset = @intCast(u32, off),
.imm12 = imm12,
} }, } },
}); });
}, },

59
src/arch/aarch64/Emit.zig
View File

@ -150,6 +150,7 @@ pub fn emitMir(
.ldp => try emit.mirLoadStoreRegisterPair(inst), .ldp => try emit.mirLoadStoreRegisterPair(inst),
.stp => try emit.mirLoadStoreRegisterPair(inst), .stp => try emit.mirLoadStoreRegisterPair(inst),
.ldr_ptr_stack => try emit.mirLoadStoreStack(inst),
.ldr_stack => try emit.mirLoadStoreStack(inst), .ldr_stack => try emit.mirLoadStoreStack(inst),
.ldrb_stack => try emit.mirLoadStoreStack(inst), .ldrb_stack => try emit.mirLoadStoreStack(inst),
.ldrh_stack => try emit.mirLoadStoreStack(inst), .ldrh_stack => try emit.mirLoadStoreStack(inst),
@ -159,8 +160,8 @@ pub fn emitMir(
.strb_stack => try emit.mirLoadStoreStack(inst), .strb_stack => try emit.mirLoadStoreStack(inst),
.strh_stack => try emit.mirLoadStoreStack(inst), .strh_stack => try emit.mirLoadStoreStack(inst),
.ldr_stack_argument => try emit.mirLoadStackArgument(inst),
.ldr_ptr_stack_argument => try emit.mirLoadStackArgument(inst), .ldr_ptr_stack_argument => try emit.mirLoadStackArgument(inst),
.ldr_stack_argument => try emit.mirLoadStackArgument(inst),
.ldrb_stack_argument => try emit.mirLoadStackArgument(inst), .ldrb_stack_argument => try emit.mirLoadStackArgument(inst),
.ldrh_stack_argument => try emit.mirLoadStackArgument(inst), .ldrh_stack_argument => try emit.mirLoadStackArgument(inst),
.ldrsb_stack_argument => try emit.mirLoadStackArgument(inst), .ldrsb_stack_argument => try emit.mirLoadStackArgument(inst),
@ -1003,23 +1004,43 @@ fn mirLoadStoreStack(emit: *Emit, inst: Mir.Inst.Index) !void {
const rt = load_store_stack.rt; const rt = load_store_stack.rt;
const raw_offset = emit.stack_size - load_store_stack.offset; const raw_offset = emit.stack_size - load_store_stack.offset;
const offset = switch (tag) { switch (tag) {
.ldrb_stack, .ldrsb_stack, .strb_stack => blk: { .ldr_ptr_stack => {
if (math.cast(u12, raw_offset)) |imm| { const offset = if (math.cast(u12, raw_offset)) |imm| imm else {
break :blk Instruction.LoadStoreOffset.imm(imm); return emit.fail("TODO load stack argument ptr with larger offset", .{});
} else { };
switch (tag) {
.ldr_ptr_stack => try emit.writeInstruction(Instruction.add(rt, .sp, offset, false)),
else => unreachable,
}
},
.ldrb_stack, .ldrsb_stack, .strb_stack => {
const offset = if (math.cast(u12, raw_offset)) |imm| Instruction.LoadStoreOffset.imm(imm) else {
return emit.fail("TODO load/store stack byte with larger offset", .{}); return emit.fail("TODO load/store stack byte with larger offset", .{});
};
switch (tag) {
.ldrb_stack => try emit.writeInstruction(Instruction.ldrb(rt, .sp, offset)),
.ldrsb_stack => try emit.writeInstruction(Instruction.ldrsb(rt, .sp, offset)),
.strb_stack => try emit.writeInstruction(Instruction.strb(rt, .sp, offset)),
else => unreachable,
} }
}, },
.ldrh_stack, .ldrsh_stack, .strh_stack => blk: { .ldrh_stack, .ldrsh_stack, .strh_stack => {
assert(std.mem.isAlignedGeneric(u32, raw_offset, 2)); // misaligned stack entry assert(std.mem.isAlignedGeneric(u32, raw_offset, 2)); // misaligned stack entry
if (math.cast(u12, @divExact(raw_offset, 2))) |imm| { const offset = if (math.cast(u12, @divExact(raw_offset, 2))) |imm| Instruction.LoadStoreOffset.imm(imm) else {
break :blk Instruction.LoadStoreOffset.imm(imm);
} else {
return emit.fail("TODO load/store stack halfword with larger offset", .{}); return emit.fail("TODO load/store stack halfword with larger offset", .{});
};
switch (tag) {
.ldrh_stack => try emit.writeInstruction(Instruction.ldrh(rt, .sp, offset)),
.ldrsh_stack => try emit.writeInstruction(Instruction.ldrsh(rt, .sp, offset)),
.strh_stack => try emit.writeInstruction(Instruction.strh(rt, .sp, offset)),
else => unreachable,
} }
}, },
.ldr_stack, .str_stack => blk: { .ldr_stack, .str_stack => {
const alignment: u32 = switch (rt.size()) { const alignment: u32 = switch (rt.size()) {
32 => 4, 32 => 4,
64 => 8, 64 => 8,
@ -1027,24 +1048,16 @@ fn mirLoadStoreStack(emit: *Emit, inst: Mir.Inst.Index) !void {
}; };
assert(std.mem.isAlignedGeneric(u32, raw_offset, alignment)); // misaligned stack entry assert(std.mem.isAlignedGeneric(u32, raw_offset, alignment)); // misaligned stack entry
if (math.cast(u12, @divExact(raw_offset, alignment))) |imm| { const offset = if (math.cast(u12, @divExact(raw_offset, alignment))) |imm| Instruction.LoadStoreOffset.imm(imm) else {
break :blk Instruction.LoadStoreOffset.imm(imm);
} else {
return emit.fail("TODO load/store stack with larger offset", .{}); return emit.fail("TODO load/store stack with larger offset", .{});
}
},
else => unreachable,
}; };
switch (tag) { switch (tag) {
.ldr_stack => try emit.writeInstruction(Instruction.ldr(rt, .sp, offset)), .ldr_stack => try emit.writeInstruction(Instruction.ldr(rt, .sp, offset)),
.ldrb_stack => try emit.writeInstruction(Instruction.ldrb(rt, .sp, offset)),
.ldrh_stack => try emit.writeInstruction(Instruction.ldrh(rt, .sp, offset)),
.ldrsb_stack => try emit.writeInstruction(Instruction.ldrsb(rt, .sp, offset)),
.ldrsh_stack => try emit.writeInstruction(Instruction.ldrsh(rt, .sp, offset)),
.str_stack => try emit.writeInstruction(Instruction.str(rt, .sp, offset)), .str_stack => try emit.writeInstruction(Instruction.str(rt, .sp, offset)),
.strb_stack => try emit.writeInstruction(Instruction.strb(rt, .sp, offset)), else => unreachable,
.strh_stack => try emit.writeInstruction(Instruction.strh(rt, .sp, offset)), }
},
else => unreachable, else => unreachable,
} }
} }

2
src/arch/aarch64/Mir.zig
View File

@ -92,6 +92,8 @@ pub const Inst = struct {
load_memory_ptr_direct, load_memory_ptr_direct,
/// Load Pair of Registers /// Load Pair of Registers
ldp, ldp,
/// Pseudo-instruction: Load pointer to stack item
ldr_ptr_stack,
/// Pseudo-instruction: Load pointer to stack argument /// Pseudo-instruction: Load pointer to stack argument
ldr_ptr_stack_argument, ldr_ptr_stack_argument,
/// Pseudo-instruction: Load from stack /// Pseudo-instruction: Load from stack