authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-11-25 11:10:17+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-11-26 11:50:09+01:00
log10942e3f86c03d30833cc221371f30b78a4bd710
tree69b9d317cf8d9fe7b58e4a8f67c4250c1911365a
parent2cd84b1b3f0a6e3f030da723ec51f0be33b7a1ed

stage2 macho: Hello, Silicon!

2 files changed, 50 insertions(+), 19 deletions(-)

src/codegen.zig+22-4
...@@ -1689,6 +1689,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {...@@ -1689,6 +1689,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
1689 },1689 },
1690 .aarch64 => {1690 .aarch64 => {
1691 try self.genSetReg(inst.base.src, .x30, .{ .memory = got_addr });1691 try self.genSetReg(inst.base.src, .x30, .{ .memory = got_addr });
1692 // blr x30
1692 writeInt(u32, try self.code.addManyAsArray(4), Instruction.blr(.x30).toU32());1693 writeInt(u32, try self.code.addManyAsArray(4), Instruction.blr(.x30).toU32());
1693 },1694 },
1694 else => unreachable, // unsupported architecture on MachO1695 else => unreachable, // unsupported architecture on MachO
...@@ -2583,10 +2584,27 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {...@@ -2583,10 +2584,27 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2583 },2584 },
2584 .register => return self.fail(src, "TODO implement genSetReg for aarch64 {}", .{mcv}),2585 .register => return self.fail(src, "TODO implement genSetReg for aarch64 {}", .{mcv}),
2585 .memory => |addr| {2586 .memory => |addr| {
2586 // The value is in memory at a hard-coded address.2587 if (self.bin_file.cast(link.File.MachO)) |macho_file| {
2587 // If the type is a pointer, it means the pointer address is at this memory location.2588 // For MachO, the binary, with the exception of object files, has to be a PIE.
2588 try self.genSetReg(src, reg, .{ .immediate = addr });2589 // Therefore we cannot load an absolute address.
2589 mem.writeIntLittle(u32, try self.code.addManyAsArray(4), Instruction.ldr(reg, .{ .rn = reg }).toU32());2590 // Instead, we need to make use of PC-relative addressing.
2591 // if (reg.id() == 0) { // x0 is special-cased
2592 try self.mod_fn.owner_decl.link.macho.addPieFixup(self.bin_file.allocator, .{
2593 .address = addr,
2594 .start = self.code.items.len,
2595 .len = 4,
2596 });
2597 // bl [label]
2598 mem.writeIntLittle(u32, try self.code.addManyAsArray(4), Instruction.bl(0).toU32());
2599 // } else {
2600 // unreachable; // TODO
2601 // }
2602 } else {
2603 // The value is in memory at a hard-coded address.
2604 // If the type is a pointer, it means the pointer address is at this memory location.
2605 try self.genSetReg(src, reg, .{ .immediate = addr });
2606 mem.writeIntLittle(u32, try self.code.addManyAsArray(4), Instruction.ldr(reg, .{ .rn = reg }).toU32());
2607 }
2590 },2608 },
2591 else => return self.fail(src, "TODO implement genSetReg for aarch64 {}", .{mcv}),2609 else => return self.fail(src, "TODO implement genSetReg for aarch64 {}", .{mcv}),
2592 },2610 },
src/link/MachO.zig+28-15
...@@ -7,6 +7,7 @@ const fs = std.fs;...@@ -7,6 +7,7 @@ const fs = std.fs;
7const log = std.log.scoped(.link);7const log = std.log.scoped(.link);
8const macho = std.macho;8const macho = std.macho;
9const codegen = @import("../codegen.zig");9const codegen = @import("../codegen.zig");
10const aarch64 = @import("../codegen/aarch64.zig");
10const math = std.math;11const math = std.math;
11const mem = std.mem;12const mem = std.mem;
1213
...@@ -1020,9 +1021,15 @@ pub fn updateDecl(self: *MachO, module: *Module, decl: *Module.Decl) !void {...@@ -1020,9 +1021,15 @@ pub fn updateDecl(self: *MachO, module: *Module, decl: *Module.Decl) !void {
1020 while (decl.link.macho.pie_fixups.popOrNull()) |fixup| {1021 while (decl.link.macho.pie_fixups.popOrNull()) |fixup| {
1021 const target_addr = fixup.address;1022 const target_addr = fixup.address;
1022 const this_addr = symbol.n_value + fixup.start;1023 const this_addr = symbol.n_value + fixup.start;
1023 const displacement = @intCast(u32, target_addr - this_addr - fixup.len);1024 if (self.base.options.target.cpu.arch == .x86_64) {
1024 var placeholder = code_buffer.items[fixup.start + fixup.len - @sizeOf(u32) ..][0..@sizeOf(u32)];1025 const displacement = @intCast(u32, target_addr - this_addr - fixup.len);
1025 mem.writeIntSliceLittle(u32, placeholder, displacement);1026 var placeholder = code_buffer.items[fixup.start + fixup.len - @sizeOf(u32) ..][0..@sizeOf(u32)];
1027 mem.writeIntSliceLittle(u32, placeholder, displacement);
1028 } else {
1029 const displacement = @intCast(u27, target_addr - this_addr);
1030 var placeholder = code_buffer.items[fixup.start..][0..fixup.len];
1031 mem.writeIntSliceLittle(u32, placeholder, aarch64.Instruction.bl(@intCast(i28, displacement)).toU32());
1032 }
1026 }1033 }
10271034
1028 const text_section = self.sections.items[self.text_section_index.?];1035 const text_section = self.sections.items[self.text_section_index.?];
...@@ -1646,22 +1653,28 @@ fn findFreeSpace(self: *MachO, object_size: u64, min_alignment: u16) u64 {...@@ -1646,22 +1653,28 @@ fn findFreeSpace(self: *MachO, object_size: u64, min_alignment: u16) u64 {
16461653
1647fn writeOffsetTableEntry(self: *MachO, index: usize) !void {1654fn writeOffsetTableEntry(self: *MachO, index: usize) !void {
1648 const sect = &self.sections.items[self.got_section_index.?];1655 const sect = &self.sections.items[self.got_section_index.?];
1649 const endian = self.base.options.target.cpu.arch.endian();
1650
1651 const off = sect.offset + @sizeOf(u64) * index;1656 const off = sect.offset + @sizeOf(u64) * index;
1652 const vmaddr = sect.addr + @sizeOf(u64) * index;1657 const vmaddr = sect.addr + @sizeOf(u64) * index;
1653 const pos_symbol_off = @truncate(u31, vmaddr - self.offset_table.items[index] + 7);
1654 const symbol_off = @bitCast(u32, @intCast(i32, pos_symbol_off) * -1);
16551658
1656 var code: [8]u8 = undefined;1659 var code: [8]u8 = undefined;
1657 // lea %rax, [rip - disp]1660 if (self.base.options.target.cpu.arch == .x86_64) {
1658 code[0] = 0x48;1661 const pos_symbol_off = @intCast(u31, vmaddr - self.offset_table.items[index] + 7);
1659 code[1] = 0x8D;1662 const symbol_off = @bitCast(u32, @intCast(i32, pos_symbol_off) * -1);
1660 code[2] = 0x5;1663 // lea %rax, [rip - disp]
1661 mem.writeInt(u32, code[3..7], symbol_off, endian);1664 code[0] = 0x48;
1662 // ret1665 code[1] = 0x8D;
1663 code[7] = 0xC3;1666 code[2] = 0x5;
16641667 mem.writeIntLittle(u32, code[3..7], symbol_off);
1668 // ret
1669 code[7] = 0xC3;
1670 } else {
1671 const pos_symbol_off = @intCast(u20, vmaddr - self.offset_table.items[index]);
1672 const symbol_off = @intCast(i21, pos_symbol_off) * -1;
1673 // adr .x0 [-disp]
1674 mem.writeIntLittle(u32, code[0..4], aarch64.Instruction.adr(.x1, symbol_off).toU32());
1675 // ret
1676 mem.writeIntLittle(u32, code[4..8], aarch64.Instruction.ret(null).toU32());
1677 }
1665 log.debug("writing offset table entry 0x{x} at 0x{x}\n", .{ self.offset_table.items[index], off });1678 log.debug("writing offset table entry 0x{x} at 0x{x}\n", .{ self.offset_table.items[index], off });
1666 try self.base.file.?.pwriteAll(&code, off);1679 try self.base.file.?.pwriteAll(&code, off);
1667}1680}