authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-02-03 14:31:16+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-02-03 14:31:16+01:00
logf4e0641450032004b9200a4d5fa754e189a123f3
tree9aaeba50b3fe5b62c9ac75708519e1d41420ceea
parente52af268569e0005fb0c40c30154c50591e2fc6c

x64: use freeze/unfreeze api; TODO for PIE


2 files changed, 34 insertions(+), 26 deletions(-)

src/arch/x86_64/CodeGen.zig+34-23
......@@ -1685,6 +1685,7 @@ fn airLoad(self: *Self, inst: Air.Inst.Index) !void {
16851685
16861686fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type) InnerError!void {
16871687 _ = ptr_ty;
1688 const abi_size = value_ty.abiSize(self.target.*);
16881689 switch (ptr) {
16891690 .none => unreachable,
16901691 .undef => unreachable,
......@@ -1705,6 +1706,9 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
17051706 return self.fail("TODO implement storing to MCValue.embedded_in_code", .{});
17061707 },
17071708 .register => |reg| {
1709 self.register_manager.freezeRegs(&.{reg});
1710 defer self.register_manager.unfreezeRegs(&.{reg});
1711
17081712 switch (value) {
17091713 .none => unreachable,
17101714 .undef => unreachable,
......@@ -1713,7 +1717,6 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
17131717 .compare_flags_unsigned => unreachable,
17141718 .compare_flags_signed => unreachable,
17151719 .immediate => |imm| {
1716 const abi_size = value_ty.abiSize(self.target.*);
17171720 switch (abi_size) {
17181721 1, 2, 4 => {
17191722 // TODO this is wasteful!
......@@ -1760,7 +1763,6 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
17601763 }
17611764 },
17621765 .register => |src_reg| {
1763 const abi_size = value_ty.abiSize(self.target.*);
17641766 _ = try self.addInst(.{
17651767 .tag = .mov,
17661768 .ops = (Mir.Ops{
......@@ -1777,9 +1779,16 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
17771779 }
17781780 },
17791781 .memory => |addr| {
1782 if (self.bin_file.options.pie) {
1783 return self.fail("TODO implement storing to memory when targeting PIE", .{});
1784 }
1785
17801786 // TODO: in case the address fits in an imm32 we can use [ds:imm32]
17811787 // instead of wasting an instruction copying the address to a register
17821788
1789 if (value.isRegister()) self.register_manager.freezeRegs(&.{value.register});
1790 defer if (value.isRegister()) self.register_manager.unfreezeRegs(&.{value.register});
1791
17831792 const addr_reg = try self.copyToTmpRegister(ptr_ty, .{ .immediate = addr });
17841793 // to get the actual address of the value we want to modify we have to go through the GOT
17851794 // mov reg, [reg]
......@@ -1793,37 +1802,39 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type
17931802 .data = .{ .imm = 0 },
17941803 });
17951804
1796 const abi_size = value_ty.abiSize(self.target.*);
17971805 switch (value) {
17981806 .immediate => |imm| {
1807 if (abi_size > 8) {
1808 return self.fail("TODO saving imm to memory for abi_size {}", .{abi_size});
1809 }
1810
17991811 const payload = try self.addExtra(Mir.ImmPair{
18001812 .dest_off = 0,
18011813 .operand = @intCast(u32, imm),
18021814 });
1815 const flags: u2 = switch (abi_size) {
1816 1 => 0b00,
1817 2 => 0b01,
1818 4 => 0b10,
1819 8 => 0b11,
1820 else => unreachable,
1821 };
1822 if (flags == 0b11) {
1823 const top_bits: u32 = @intCast(u32, imm >> 32);
1824 const can_extend = if (value_ty.isUnsignedInt())
1825 (top_bits == 0) and (imm & 0x8000_0000) == 0
1826 else
1827 top_bits == 0xffff_ffff;
1828
1829 if (!can_extend) {
1830 return self.fail("TODO imm64 would get incorrectly sign extended", .{});
1831 }
1832 }
18031833 _ = try self.addInst(.{
18041834 .tag = .mov_mem_imm,
18051835 .ops = (Mir.Ops{
18061836 .reg1 = addr_reg.to64(),
1807 .flags = switch (abi_size) {
1808 1 => 0b00,
1809 2 => 0b01,
1810 4 => 0b10,
1811 8 => flag: {
1812 const top_bits: u32 = @intCast(u32, imm >> 32);
1813 const can_extend = if (value_ty.isUnsignedInt())
1814 (top_bits == 0) and (imm & 0x8000_0000) == 0
1815 else
1816 top_bits == 0xffff_ffff;
1817
1818 if (!can_extend) {
1819 return self.fail("TODO imm64 would get incorrectly sign extended", .{});
1820 }
1821 break :flag 0b11;
1822 },
1823 else => {
1824 return self.fail("TODO saving imm to memory for abi_size {}", .{abi_size});
1825 },
1826 },
1837 .flags = flags,
18271838 }).encode(),
18281839 .data = .{ .payload = payload },
18291840 });
test/behavior/bugs/1486.zig-3
......@@ -1,13 +1,10 @@
11const std = @import("std");
2const builtin = @import("builtin");
32const expect = std.testing.expect;
43
54const ptr = &global;
65var global: usize = 123;
76
87test "constant pointer to global variable causes runtime load" {
9 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
10
118 global = 1234;
129 try expect(&global == ptr);
1310 try expect(ptr.* == 1234);