diff options
| author | gracefu <81774659+gracefuu@users.noreply.github.com> | 2021-04-11 23:27:43 +0800 |
|---|---|---|
| committer | gracefu <81774659+gracefuu@users.noreply.github.com> | 2021-04-16 15:21:17 +0800 |
| commit | dc136627251c920713536807e0da922c140ca588 (patch) | |
| tree | 58b4bb3a70f40a573ad6995bdaf29e322d204725 /src/codegen.zig | |
| parent | 1e63e8d8b6559855eca6efac6eec18f0546ecafd (diff) | |
| download | zig-dc136627251c920713536807e0da922c140ca588.tar.gz zig-dc136627251c920713536807e0da922c140ca588.zip | |
stage2 x86_64: force 64 bit mode when loading address of GOT
Co-authored-by: joachimschmidt557 <joachim.schmidt557@outlook.com>
Diffstat (limited to 'src/codegen.zig')
| -rw-r--r-- | src/codegen.zig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/codegen.zig b/src/codegen.zig index 6e734dad90..ee2f5403cc 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -2422,13 +2422,13 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type { log.debug("got_addr = 0x{x}", .{got_addr}); switch (arch) { .x86_64 => { - try self.genSetReg(inst.base.src, Type.initTag(.u32), .rax, .{ .memory = got_addr }); + try self.genSetReg(inst.base.src, Type.initTag(.u64), .rax, .{ .memory = got_addr }); // callq *%rax try self.code.ensureCapacity(self.code.items.len + 2); self.code.appendSliceAssumeCapacity(&[2]u8{ 0xff, 0xd0 }); }, .aarch64 => { - try self.genSetReg(inst.base.src, Type.initTag(.u32), .x30, .{ .memory = got_addr }); + try self.genSetReg(inst.base.src, Type.initTag(.u64), .x30, .{ .memory = got_addr }); // blr x30 writeInt(u32, try self.code.addManyAsArray(4), Instruction.blr(.x30).toU32()); }, @@ -3862,7 +3862,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type { if (self.bin_file.options.pie) { // RIP-relative displacement to the entry in the GOT table. const abi_size = ty.abiSize(self.target.*); - const encoder = try X8664Encoder.init(self.code, 7); + const encoder = try X8664Encoder.init(self.code, 10); // LEA reg, [<offset>] @@ -3870,7 +3870,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type { // After we encode the instruction, we will know that the displacement bytes // for [<offset>] will be at self.code.items.len - 4. encoder.rex(.{ - .w = abi_size == 8, + .w = true, // force 64 bit because loading an address (to the GOT) .r = reg.isExtended(), }); encoder.opcode_1byte(0x8D); |