mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-10 19:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86_64: clean up call semantics in codegen

Browse Source
This commit is contained in:
Jakub Konka 2023-03-05 18:55:04 +01:00
parent f14831ec73
commit ea3b3e94ab
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86_64/CodeGen.zig
View File

@ -4091,11 +4091,11 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier
if (self.bin_file.cast(link.File.Elf)) |elf_file| {
const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl);
const atom = elf_file.getAtom(atom_index);
const got_addr = @intCast(u32, atom.getOffsetTableAddress(elf_file));
const got_addr = @intCast(i32, atom.getOffsetTableAddress(elf_file));
_ = try self.addInst(.{
.tag = .call,
.ops = Mir.Inst.Ops.encode(.{ .flags = 0b01 }),
.data = .{ .imm = got_addr },
.data = .{ .disp = got_addr },
});
} else if (self.bin_file.cast(link.File.Coff)) |coff_file| {
const atom_index = try coff_file.getOrCreateAtomForDecl(func.owner_decl);
@ -4142,7 +4142,7 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier
_ = try self.addInst(.{
.tag = .call,
.ops = Mir.Inst.Ops.encode(.{ .flags = 0b01 }),
.data = .{ .imm = @intCast(u32, fn_got_addr) },
.data = .{ .disp = @intCast(i32, fn_got_addr) },
});
} else unreachable;
} else if (func_value.castTag(.extern_fn)) |func_payload| {

4
src/arch/x86_64/Emit.zig
View File

@ -340,9 +340,9 @@ fn mirJmpCall(emit: *Emit, mnemonic: Instruction.Mnemonic, inst: Mir.Inst.Index)
},
0b01 => {
if (ops.reg1 == .none) {
const imm = emit.mir.instructions.items(.data)[inst].imm;
const disp = emit.mir.instructions.items(.data)[inst].disp;
return emit.encode(mnemonic, .{
.op1 = .{ .imm = imm },
.op1 = .{ .mem = Memory.sib(.qword, .{ .disp = disp }) },
});
}
return emit.encode(mnemonic, .{