authorgravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-18 12:19:22+01:00
committergravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-18 12:19:22+01:00
logc32e2c4d3cc66e8984f83a1d26265c64ec9a0f19
treee987d2d250a2894671405174d098d10d565cdeb6
parent3ecba7d7a2f527d4f579a1156e26cd2f0c14c2a0
signaturelock-open Commit is signed but in an unrecognized format.

stage2 ARM: remove MCValue.embedded_in_code

1 files changed, 2 insertions(+), 29 deletions(-)

src/arch/arm/CodeGen.zig+2-29
......@@ -118,11 +118,6 @@ const MCValue = union(enum) {
118118 /// A pointer-sized integer that fits in a register.
119119 /// If the type is a pointer, this is the pointer address in virtual address space.
120120 immediate: u32,
121 /// The constant was emitted into the code, at this offset.
122 /// If the type is a pointer, it means the pointer address is embedded in the code.
123 embedded_in_code: usize,
124 /// The value is a pointer to a constant which was emitted into the code, at this offset.
125 ptr_embedded_in_code: usize,
126121 /// The value is in a target-specific register.
127122 register: Register,
128123 /// The value is in memory at a hard-coded address.
......@@ -144,7 +139,7 @@ const MCValue = union(enum) {
144139
145140 fn isMemory(mcv: MCValue) bool {
146141 return switch (mcv) {
147 .embedded_in_code, .memory, .stack_offset, .stack_argument_offset => true,
142 .memory, .stack_offset, .stack_argument_offset => true,
148143 else => false,
149144 };
150145 }
......@@ -163,12 +158,10 @@ const MCValue = union(enum) {
163158 .dead => unreachable,
164159
165160 .immediate,
166 .embedded_in_code,
167161 .memory,
168162 .compare_flags_unsigned,
169163 .compare_flags_signed,
170164 .ptr_stack_offset,
171 .ptr_embedded_in_code,
172165 .undef,
173166 .stack_argument_offset,
174167 => false,
......@@ -1662,9 +1655,6 @@ fn load(self: *Self, dst_mcv: MCValue, ptr: MCValue, ptr_ty: Type) InnerError!vo
16621655 .compare_flags_signed => unreachable,
16631656 .immediate => |imm| try self.setRegOrMem(elem_ty, dst_mcv, .{ .memory = imm }),
16641657 .ptr_stack_offset => |off| try self.setRegOrMem(elem_ty, dst_mcv, .{ .stack_offset = off }),
1665 .ptr_embedded_in_code => |off| {
1666 try self.setRegOrMem(elem_ty, dst_mcv, .{ .embedded_in_code = off });
1667 },
16681658 .register => |reg| {
16691659 self.register_manager.freezeRegs(&.{reg});
16701660 defer self.register_manager.unfreezeRegs(&.{reg});
......@@ -1673,7 +1663,6 @@ fn load(self: *Self, dst_mcv: MCValue, ptr: MCValue, ptr_ty: Type) InnerError!vo
16731663 .dead => unreachable,
16741664 .undef => unreachable,
16751665 .compare_flags_signed, .compare_flags_unsigned => unreachable,
1676 .embedded_in_code => unreachable,
16771666 .register => |dst_reg| {
16781667 try self.genLdrRegister(dst_reg, reg, elem_ty);
16791668 },
......@@ -1711,7 +1700,6 @@ fn load(self: *Self, dst_mcv: MCValue, ptr: MCValue, ptr_ty: Type) InnerError!vo
17111700 }
17121701 },
17131702 .memory,
1714 .embedded_in_code,
17151703 .stack_offset,
17161704 .stack_argument_offset,
17171705 => {
......@@ -1767,9 +1755,6 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
17671755 .ptr_stack_offset => |off| {
17681756 try self.genSetStack(value_ty, off, value);
17691757 },
1770 .ptr_embedded_in_code => |off| {
1771 try self.setRegOrMem(value_ty, .{ .embedded_in_code = off }, value);
1772 },
17731758 .register => |addr_reg| {
17741759 self.register_manager.freezeRegs(&.{addr_reg});
17751760 defer self.register_manager.unfreezeRegs(&.{addr_reg});
......@@ -1829,7 +1814,6 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
18291814 }
18301815 },
18311816 .memory,
1832 .embedded_in_code,
18331817 .stack_offset,
18341818 .stack_argument_offset,
18351819 => {
......@@ -2712,12 +2696,10 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallOptions.
27122696 .immediate => unreachable,
27132697 .unreach => unreachable,
27142698 .dead => unreachable,
2715 .embedded_in_code => unreachable,
27162699 .memory => unreachable,
27172700 .compare_flags_signed => unreachable,
27182701 .compare_flags_unsigned => unreachable,
27192702 .ptr_stack_offset => unreachable,
2720 .ptr_embedded_in_code => unreachable,
27212703 .register => |reg| {
27222704 try self.register_manager.getReg(reg, null);
27232705 try self.genSetReg(arg_ty, reg, arg_mcv);
......@@ -3616,7 +3598,6 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
36163598 .compare_flags_signed,
36173599 .immediate,
36183600 .ptr_stack_offset,
3619 .ptr_embedded_in_code,
36203601 => {
36213602 const reg = try self.copyToTmpRegister(ty, mcv);
36223603 return self.genSetStack(ty, stack_offset, MCValue{ .register = reg });
......@@ -3669,7 +3650,6 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
36693650 }
36703651 },
36713652 .memory,
3672 .embedded_in_code,
36733653 .stack_argument_offset,
36743654 .stack_offset,
36753655 => {
......@@ -3716,7 +3696,6 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
37163696 } },
37173697 });
37183698 },
3719 .embedded_in_code => return self.fail("TODO genSetStack with src={}", .{mcv}),
37203699 else => unreachable,
37213700 }
37223701
......@@ -3736,7 +3715,6 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
37363715fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void {
37373716 switch (mcv) {
37383717 .dead => unreachable,
3739 .ptr_embedded_in_code => unreachable,
37403718 .unreach, .none => return, // Nothing to do.
37413719 .undef => {
37423720 if (!self.wantSafety())
......@@ -3996,7 +3974,6 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void
39963974 } },
39973975 });
39983976 },
3999 else => return self.fail("TODO implement getSetReg for arm {}", .{mcv}),
40003977 }
40013978}
40023979
......@@ -4060,7 +4037,6 @@ fn genSetStackArgument(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) I
40604037 .stack_offset,
40614038 .memory,
40624039 .stack_argument_offset,
4063 .embedded_in_code,
40644040 => {
40654041 if (abi_size <= 4) {
40664042 const reg = try self.copyToTmpRegister(ty, mcv);
......@@ -4086,9 +4062,7 @@ fn genSetStackArgument(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) I
40864062 try self.genSetReg(ptr_ty, src_reg, .{ .ptr_stack_offset = off });
40874063 },
40884064 .memory => |addr| try self.genSetReg(ptr_ty, src_reg, .{ .immediate = @intCast(u32, addr) }),
4089 .stack_argument_offset,
4090 .embedded_in_code,
4091 => return self.fail("TODO genSetStackArgument src={}", .{mcv}),
4065 .stack_argument_offset => return self.fail("TODO genSetStackArgument src={}", .{mcv}),
40924066 else => unreachable,
40934067 }
40944068
......@@ -4117,7 +4091,6 @@ fn genSetStackArgument(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) I
41174091 .compare_flags_signed,
41184092 .immediate,
41194093 .ptr_stack_offset,
4120 .ptr_embedded_in_code,
41214094 => {
41224095 const reg = try self.copyToTmpRegister(ty, mcv);
41234096 return self.genSetStackArgument(ty, stack_offset, MCValue{ .register = reg });