authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-04-11 23:00:39+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-04-13 11:47:51+02:00
logdbdf8086bd964cec22c44d41702d35643cce412a
tree5cf0d50cc2c1258746a26eb9d4e6bcd4338b2ca9
parent397dd77697934a808b3545c5691399d8d69b841d

x86_64: simplify store() logic when ptr is in memory

1 files changed, 23 insertions(+), 9 deletions(-)

src/arch/x86_64/CodeGen.zig+23-9
......@@ -3867,19 +3867,33 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
38673867 };
38683868 defer if (value_lock) |lock| self.register_manager.unlockReg(lock);
38693869
3870 const addr_reg = try self.register_manager.allocReg(null, gp);
3870 const addr_reg = (try self.register_manager.allocReg(null, gp)).to64();
38713871 const addr_reg_lock = self.register_manager.lockRegAssumeUnused(addr_reg);
38723872 defer self.register_manager.unlockReg(addr_reg_lock);
38733873
3874 try self.loadMemPtrIntoRegister(addr_reg, ptr_ty, ptr);
3875 // Load the pointer, which is stored in memory
3876 try self.asmRegisterMemory(
3877 .mov,
3878 addr_reg.to64(),
3879 Memory.sib(.qword, .{ .base = addr_reg.to64() }),
3880 );
3874 switch (ptr) {
3875 .memory => |addr| {
3876 try self.genSetReg(ptr_ty, addr_reg, .{ .immediate = addr });
3877 // Load the pointer, which is stored in memory
3878 try self.asmRegisterMemory(.mov, addr_reg, Memory.sib(.qword, .{ .base = addr_reg }));
3879 },
3880 .linker_load => |load_struct| {
3881 const atom_index = if (self.bin_file.cast(link.File.MachO)) |macho_file| blk: {
3882 const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl);
3883 break :blk macho_file.getAtom(atom).getSymbolIndex().?;
3884 } else if (self.bin_file.cast(link.File.Coff)) |coff_file| blk: {
3885 const atom = try coff_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl);
3886 break :blk coff_file.getAtom(atom).getSymbolIndex().?;
3887 } else unreachable;
3888 switch (load_struct.type) {
3889 .import => unreachable,
3890 .got, .direct => try self.asmMovLinker(addr_reg, atom_index, load_struct),
3891 }
3892 },
3893 else => unreachable,
3894 }
38813895
3882 const new_ptr = MCValue{ .register = addr_reg.to64() };
3896 const new_ptr = MCValue{ .register = addr_reg };
38833897 try self.store(new_ptr, value, ptr_ty, value_ty);
38843898 },
38853899 }