authorgravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-02-08 20:15:09+01:00
committergravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-02-14 22:09:44+01:00
log8bfc4b2f9cf4798fe7731288c652145803ef1998
treecbe64a7980eede2d2748f051bd69c549479e0c4a
parentf47245865eea35fa0b08cb2a87e3620fa904dd88
signaturelock-open Commit is signed but in an unrecognized format.

stage2 AArch64: extract store out of airStore for recursive calls

1 files changed, 20 insertions(+), 13 deletions(-)

src/arch/aarch64/CodeGen.zig+20-13
......@@ -1611,11 +1611,7 @@ fn airLoad(self: *Self, inst: Air.Inst.Index) !void {
16111611 return self.finishAir(inst, result, .{ ty_op.operand, .none, .none });
16121612}
16131613
1614fn airStore(self: *Self, inst: Air.Inst.Index) !void {
1615 const bin_op = self.air.instructions.items(.data)[inst].bin_op;
1616 const ptr = try self.resolveInst(bin_op.lhs);
1617 const value = try self.resolveInst(bin_op.rhs);
1618 const elem_ty = self.air.typeOf(bin_op.rhs);
1614fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type) InnerError!void {
16191615 switch (ptr) {
16201616 .none => unreachable,
16211617 .undef => unreachable,
......@@ -1624,13 +1620,13 @@ fn airStore(self: *Self, inst: Air.Inst.Index) !void {
16241620 .compare_flags_unsigned => unreachable,
16251621 .compare_flags_signed => unreachable,
16261622 .immediate => |imm| {
1627 try self.setRegOrMem(elem_ty, .{ .memory = imm }, value);
1623 try self.setRegOrMem(value_ty, .{ .memory = imm }, value);
16281624 },
16291625 .ptr_stack_offset => |off| {
1630 try self.genSetStack(elem_ty, off, value);
1626 try self.genSetStack(value_ty, off, value);
16311627 },
16321628 .ptr_embedded_in_code => |off| {
1633 try self.setRegOrMem(elem_ty, .{ .embedded_in_code = off }, value);
1629 try self.setRegOrMem(value_ty, .{ .embedded_in_code = off }, value);
16341630 },
16351631 .embedded_in_code => {
16361632 return self.fail("TODO implement storing to MCValue.embedded_in_code", .{});
......@@ -1638,13 +1634,24 @@ fn airStore(self: *Self, inst: Air.Inst.Index) !void {
16381634 .register => {
16391635 return self.fail("TODO implement storing to MCValue.register", .{});
16401636 },
1641 .memory => {
1642 return self.fail("TODO implement storing to MCValue.memory", .{});
1643 },
1644 .stack_offset => {
1645 return self.fail("TODO implement storing to MCValue.stack_offset", .{});
1637 .memory,
1638 .stack_offset,
1639 => {
1640 const addr_reg = try self.copyToTmpRegister(ptr_ty, ptr);
1641 try self.store(.{ .register = addr_reg }, value, ptr_ty, value_ty);
16461642 },
16471643 }
1644}
1645
1646fn airStore(self: *Self, inst: Air.Inst.Index) !void {
1647 const bin_op = self.air.instructions.items(.data)[inst].bin_op;
1648 const ptr = try self.resolveInst(bin_op.lhs);
1649 const value = try self.resolveInst(bin_op.rhs);
1650 const ptr_ty = self.air.typeOf(bin_op.lhs);
1651 const value_ty = self.air.typeOf(bin_op.rhs);
1652
1653 try self.store(ptr, value, ptr_ty, value_ty);
1654
16481655 return self.finishAir(inst, .dead, .{ bin_op.lhs, bin_op.rhs, .none });
16491656}
16501657