authorgravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-17 23:03:41+01:00
committergravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-25 19:21:34+01:00
log16e49663329007c7f9c33086f4938c1450b1ebbd
treed300c4b16bff3ea197a1b5305a0fc1b5c88edc07
parent061d6699c0231cb33f3b47de727ab54be6d20389
signature Commit is signed but in an unrecognized format.

stage2 AArch64: remove MCValue.embedded_in_code

1 files changed, 1 insertions(+), 32 deletions(-)

src/arch/aarch64/CodeGen.zig+1-32
......@@ -115,11 +115,6 @@ const MCValue = union(enum) {
115115 /// A pointer-sized integer that fits in a register.
116116 /// If the type is a pointer, this is the pointer address in virtual address space.
117117 immediate: u64,
118 /// The constant was emitted into the code, at this offset.
119 /// If the type is a pointer, it means the pointer address is embedded in the code.
120 embedded_in_code: usize,
121 /// The value is a pointer to a constant which was emitted into the code, at this offset.
122 ptr_embedded_in_code: usize,
123118 /// The value is in a target-specific register.
124119 register: Register,
125120 /// The value is in memory at a hard-coded address.
......@@ -147,7 +142,7 @@ const MCValue = union(enum) {
147142
148143 fn isMemory(mcv: MCValue) bool {
149144 return switch (mcv) {
150 .embedded_in_code, .memory, .stack_offset => true,
145 .memory, .stack_offset => true,
151146 else => false,
152147 };
153148 }
......@@ -166,12 +161,10 @@ const MCValue = union(enum) {
166161 .dead => unreachable,
167162
168163 .immediate,
169 .embedded_in_code,
170164 .memory,
171165 .compare_flags_unsigned,
172166 .compare_flags_signed,
173167 .ptr_stack_offset,
174 .ptr_embedded_in_code,
175168 .undef,
176169 => false,
177170
......@@ -1966,12 +1959,6 @@ fn load(self: *Self, dst_mcv: MCValue, ptr: MCValue, ptr_ty: Type) InnerError!vo
19661959 .compare_flags_signed => unreachable,
19671960 .immediate => |imm| try self.setRegOrMem(elem_ty, dst_mcv, .{ .memory = imm }),
19681961 .ptr_stack_offset => |off| try self.setRegOrMem(elem_ty, dst_mcv, .{ .stack_offset = off }),
1969 .ptr_embedded_in_code => |off| {
1970 try self.setRegOrMem(elem_ty, dst_mcv, .{ .embedded_in_code = off });
1971 },
1972 .embedded_in_code => {
1973 return self.fail("TODO implement loading from MCValue.embedded_in_code", .{});
1974 },
19751962 .register => |addr_reg| {
19761963 self.register_manager.freezeRegs(&.{addr_reg});
19771964 defer self.register_manager.unfreezeRegs(&.{addr_reg});
......@@ -1980,7 +1967,6 @@ fn load(self: *Self, dst_mcv: MCValue, ptr: MCValue, ptr_ty: Type) InnerError!vo
19801967 .dead => unreachable,
19811968 .undef => unreachable,
19821969 .compare_flags_signed, .compare_flags_unsigned => unreachable,
1983 .embedded_in_code => unreachable,
19841970 .register => |dst_reg| {
19851971 try self.genLdrRegister(dst_reg, addr_reg, elem_size);
19861972 },
......@@ -2243,12 +2229,6 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
22432229 .ptr_stack_offset => |off| {
22442230 try self.genSetStack(value_ty, off, value);
22452231 },
2246 .ptr_embedded_in_code => |off| {
2247 try self.setRegOrMem(value_ty, .{ .embedded_in_code = off }, value);
2248 },
2249 .embedded_in_code => {
2250 return self.fail("TODO implement storing to MCValue.embedded_in_code", .{});
2251 },
22522232 .register => |addr_reg| {
22532233 self.register_manager.freezeRegs(&.{addr_reg});
22542234 defer self.register_manager.unfreezeRegs(&.{addr_reg});
......@@ -2461,7 +2441,6 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallOptions.
24612441 .immediate => unreachable,
24622442 .unreach => unreachable,
24632443 .dead => unreachable,
2464 .embedded_in_code => unreachable,
24652444 .memory => unreachable,
24662445 .compare_flags_signed => unreachable,
24672446 .compare_flags_unsigned => unreachable,
......@@ -2477,9 +2456,6 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallOptions.
24772456 .ptr_stack_offset => {
24782457 return self.fail("TODO implement calling with MCValue.ptr_stack_offset arg", .{});
24792458 },
2480 .ptr_embedded_in_code => {
2481 return self.fail("TODO implement calling with MCValue.ptr_embedded_in_code arg", .{});
2482 },
24832459 }
24842460 }
24852461
......@@ -3337,15 +3313,10 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
33373313 .compare_flags_signed,
33383314 .immediate,
33393315 .ptr_stack_offset,
3340 .ptr_embedded_in_code,
33413316 => {
33423317 const reg = try self.copyToTmpRegister(ty, mcv);
33433318 return self.genSetStack(ty, stack_offset, MCValue{ .register = reg });
33443319 },
3345 .embedded_in_code => |code_offset| {
3346 _ = code_offset;
3347 return self.fail("TODO implement set stack variable from embedded_in_code", .{});
3348 },
33493320 .register => |reg| {
33503321 const adj_off = stack_offset + abi_size;
33513322
......@@ -3448,7 +3419,6 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro
34483419fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void {
34493420 switch (mcv) {
34503421 .dead => unreachable,
3451 .ptr_embedded_in_code => unreachable,
34523422 .unreach, .none => return, // Nothing to do.
34533423 .undef => {
34543424 if (!self.wantSafety())
......@@ -3586,7 +3556,6 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void
35863556 else => unreachable,
35873557 }
35883558 },
3589 else => return self.fail("TODO implement genSetReg for aarch64 {}", .{mcv}),
35903559 }
35913560}
35923561