mirror of
https://github.com/ziglang/zig.git
synced 2026-01-06 13:33:21 +00:00
macho: move (lazy)binding tables into imports module
This commit is contained in:
Jakub Konka
parent
46b2a08d06
commit
5e913c9c2c
@ -25,6 +25,7 @@ const Trie = @import("MachO/Trie.zig");
|
||||
const CodeSignature = @import("MachO/CodeSignature.zig");
|
||||
|
||||
usingnamespace @import("MachO/commands.zig");
|
||||
usingnamespace @import("MachO/imports.zig");
|
||||
|
||||
pub const base_tag: File.Tag = File.Tag.macho;
|
||||
|
||||
@ -104,6 +105,11 @@ string_table: std.ArrayListUnmanaged(u8) = .{},
|
||||
/// table needs to be rewritten.
|
||||
offset_table: std.ArrayListUnmanaged(u64) = .{},
|
||||
|
||||
/// Table of binding info entries.
|
||||
binding_info_table: BindingInfoTable = .{},
|
||||
/// Table of lazy binding info entries.
|
||||
lazy_binding_info_table: LazyBindingInfoTable = .{},
|
||||
|
||||
error_flags: File.ErrorFlags = File.ErrorFlags{},
|
||||
|
||||
cmd_table_dirty: bool = false,
|
||||
@ -826,8 +832,25 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
|
||||
}
|
||||
|
||||
// Parse dyld info
|
||||
try self.parseBindingInfo();
|
||||
try self.parseLazyBindingInfo();
|
||||
var symbols_by_name = std.StringHashMap(u16).init(self.base.allocator);
|
||||
defer symbols_by_name.deinit();
|
||||
try symbols_by_name.ensureCapacity(@intCast(u32, self.undef_symbols.items.len));
|
||||
|
||||
for (self.undef_symbols.items) |sym, i| {
|
||||
const name = self.string_table.items[sym.n_strx..];
|
||||
const len = blk: {
|
||||
var end: usize = 0;
|
||||
while (true) {
|
||||
if (name[end] == @as(u8, 0)) break;
|
||||
end += 1;
|
||||
}
|
||||
break :blk end;
|
||||
};
|
||||
symbols_by_name.putAssumeCapacityNoClobber(name[0..len], @intCast(u16, i));
|
||||
}
|
||||
|
||||
try self.parseBindingInfoTable(symbols_by_name);
|
||||
try self.parseLazyBindingInfoTable(symbols_by_name);
|
||||
// Write updated load commands and the header
|
||||
try self.writeLoadCommands();
|
||||
try self.writeHeader();
|
||||
@ -900,6 +923,8 @@ fn darwinArchString(arch: std.Target.Cpu.Arch) []const u8 {
|
||||
}
|
||||
|
||||
pub fn deinit(self: *MachO) void {
|
||||
self.binding_info_table.deinit(self.base.allocator);
|
||||
self.lazy_binding_info_table.deinit(self.base.allocator);
|
||||
self.pie_fixups.deinit(self.base.allocator);
|
||||
self.text_block_free_list.deinit(self.base.allocator);
|
||||
self.offset_table.deinit(self.base.allocator);
|
||||
@ -2094,186 +2119,27 @@ fn parseStringTable(self: *MachO) !void {
|
||||
assert(nread == buffer.len);
|
||||
|
||||
try self.string_table.ensureCapacity(self.base.allocator, symtab.strsize);
|
||||
|
||||
self.string_table.appendSliceAssumeCapacity(buffer);
|
||||
}
|
||||
|
||||
fn parseBindingInfo(self: *MachO) !void {
|
||||
fn parseBindingInfoTable(self: *MachO, symbols_by_name: std.StringHashMap(u16)) !void {
|
||||
const dyld_info = self.load_commands.items[self.dyld_info_cmd_index.?].DyldInfoOnly;
|
||||
var buffer = try self.base.allocator.alloc(u8, dyld_info.bind_size);
|
||||
defer self.base.allocator.free(buffer);
|
||||
const nread = try self.base.file.?.preadAll(buffer, dyld_info.bind_off);
|
||||
assert(nread == buffer.len);
|
||||
|
||||
try parseBindingInfos(self, buffer);
|
||||
|
||||
if (try parseAndFixupBindingInfoBuffer(self.base.allocator, buffer)) {
|
||||
try self.base.file.?.pwriteAll(buffer, dyld_info.bind_off);
|
||||
}
|
||||
var stream = std.io.fixedBufferStream(buffer);
|
||||
try self.binding_info_table.read(self.base.allocator, symbols_by_name, stream.reader());
|
||||
}
|
||||
|
||||
fn parseLazyBindingInfo(self: *MachO) !void {
|
||||
fn parseLazyBindingInfoTable(self: *MachO, symbols_by_name: std.StringHashMap(u16)) !void {
|
||||
const dyld_info = self.load_commands.items[self.dyld_info_cmd_index.?].DyldInfoOnly;
|
||||
var buffer = try self.base.allocator.alloc(u8, dyld_info.lazy_bind_size);
|
||||
defer self.base.allocator.free(buffer);
|
||||
const nread = try self.base.file.?.preadAll(buffer, dyld_info.lazy_bind_off);
|
||||
assert(nread == buffer.len);
|
||||
|
||||
try parseBindingInfos(self, buffer);
|
||||
|
||||
if (try parseAndFixupBindingInfoBuffer(self.base.allocator, buffer)) {
|
||||
try self.base.file.?.pwriteAll(buffer, dyld_info.lazy_bind_off);
|
||||
}
|
||||
}
|
||||
|
||||
fn parseAndFixupBindingInfoBuffer(allocator: *Allocator, buffer: []u8) !bool {
|
||||
var stream = std.io.fixedBufferStream(buffer);
|
||||
var reader = stream.reader();
|
||||
var done = false;
|
||||
var fixups = std.ArrayList(usize).init(allocator);
|
||||
defer fixups.deinit();
|
||||
|
||||
while (true) {
|
||||
const inst = reader.readByte() catch |err| switch (err) {
|
||||
error.EndOfStream => break,
|
||||
else => return err,
|
||||
};
|
||||
const imm: u8 = inst & macho.BIND_IMMEDIATE_MASK;
|
||||
const opcode: u8 = inst & macho.BIND_OPCODE_MASK;
|
||||
switch (opcode) {
|
||||
macho.BIND_OPCODE_DONE => {
|
||||
done = true; // TODO There appear to be multiple BIND_OPCODE_DONE in lazy binding info...
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM => {
|
||||
var next = try reader.readByte();
|
||||
while (next != @as(u8, 0)) {
|
||||
next = try reader.readByte();
|
||||
}
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
|
||||
const uleb_enc = try std.leb.readULEB128(u64, reader);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_SPECIAL_IMM => {
|
||||
// We note the position in the stream to fixup later.
|
||||
const pos = try reader.context.getPos();
|
||||
try fixups.append(pos - 1);
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
assert(done);
|
||||
|
||||
var buffer_dirty = false;
|
||||
try stream.seekTo(0);
|
||||
var writer = stream.writer();
|
||||
for (fixups.items) |pos| {
|
||||
try writer.context.seekTo(pos);
|
||||
const inst = macho.BIND_OPCODE_SET_DYLIB_ORDINAL_IMM | 1;
|
||||
_ = try writer.write(&[_]u8{inst});
|
||||
buffer_dirty = true;
|
||||
}
|
||||
|
||||
return buffer_dirty;
|
||||
}
|
||||
|
||||
const BindingEntry = struct {
|
||||
symbol: ?u16 = null,
|
||||
offset: i64,
|
||||
dylib_ordinal: ?i64 = null,
|
||||
segment: u8,
|
||||
bind_type: u8,
|
||||
};
|
||||
|
||||
fn parseBindingInfos(self: *MachO, buffer: []u8) !void {
|
||||
var symbolsByName = std.StringHashMap(u16).init(self.base.allocator);
|
||||
defer symbolsByName.deinit();
|
||||
try symbolsByName.ensureCapacity(@intCast(u32, self.undef_symbols.items.len));
|
||||
|
||||
for (self.undef_symbols.items) |sym, i| {
|
||||
const name = self.string_table.items[sym.n_strx..];
|
||||
const len = blk: {
|
||||
var end: usize = 0;
|
||||
while (true) {
|
||||
if (name[end] == @as(u8, 0)) break;
|
||||
end += 1;
|
||||
}
|
||||
break :blk end;
|
||||
};
|
||||
symbolsByName.putAssumeCapacityNoClobber(name[0..len], @intCast(u16, i));
|
||||
}
|
||||
|
||||
var stream = std.io.fixedBufferStream(buffer);
|
||||
var reader = stream.reader();
|
||||
var done = false;
|
||||
|
||||
var name = std.ArrayList(u8).init(self.base.allocator);
|
||||
defer name.deinit();
|
||||
|
||||
var entries = std.ArrayList(BindingEntry).init(self.base.allocator);
|
||||
defer entries.deinit();
|
||||
var dylib_ordinal: i64 = 0;
|
||||
|
||||
var entry: BindingEntry = .{
|
||||
.offset = 0,
|
||||
.segment = 0,
|
||||
.bind_type = 0,
|
||||
};
|
||||
|
||||
while (true) {
|
||||
const inst = reader.readByte() catch |err| switch (err) {
|
||||
error.EndOfStream => break,
|
||||
else => return err,
|
||||
};
|
||||
const imm: u8 = inst & macho.BIND_IMMEDIATE_MASK;
|
||||
const opcode: u8 = inst & macho.BIND_OPCODE_MASK;
|
||||
|
||||
switch (opcode) {
|
||||
macho.BIND_OPCODE_DO_BIND => {
|
||||
if (entry.dylib_ordinal == null) {
|
||||
entry.dylib_ordinal = dylib_ordinal;
|
||||
}
|
||||
try entries.append(entry);
|
||||
entry = .{
|
||||
.offset = 0,
|
||||
.segment = 0,
|
||||
.bind_type = 0,
|
||||
};
|
||||
},
|
||||
macho.BIND_OPCODE_DONE => {
|
||||
done = true;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM => {
|
||||
name.shrinkRetainingCapacity(0);
|
||||
var next = try reader.readByte();
|
||||
while (next != @as(u8, 0)) {
|
||||
try name.append(next);
|
||||
next = try reader.readByte();
|
||||
}
|
||||
std.debug.print("name={}\n", .{name.items});
|
||||
entry.symbol = symbolsByName.get(name.items[0..]);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
|
||||
entry.segment = imm;
|
||||
entry.offset = try std.leb.readILEB128(i64, reader);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_SPECIAL_IMM, macho.BIND_OPCODE_SET_DYLIB_ORDINAL_IMM => {
|
||||
entry.dylib_ordinal = imm;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB => {
|
||||
dylib_ordinal = try std.leb.readILEB128(i64, reader);
|
||||
entry.dylib_ordinal = dylib_ordinal;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_TYPE_IMM => {
|
||||
entry.bind_type = imm;
|
||||
},
|
||||
else => {
|
||||
std.log.warn("unhandled BIND_OPCODE_: 0x{x}", .{opcode});
|
||||
},
|
||||
}
|
||||
}
|
||||
assert(done);
|
||||
|
||||
for (entries.items) |e| {
|
||||
std.debug.print("entry={}\n", .{e});
|
||||
}
|
||||
try self.lazy_binding_info_table.read(self.base.allocator, symbols_by_name, stream.reader());
|
||||
}
|
||||
|
||||
180
src/link/MachO/imports.zig
Normal file
180
src/link/MachO/imports.zig
Normal file
@ -0,0 +1,180 @@
|
||||
const std = @import("std");
|
||||
const leb = std.leb;
|
||||
const macho = std.macho;
|
||||
const mem = std.mem;
|
||||
|
||||
const assert = std.debug.assert;
|
||||
const Allocator = mem.Allocator;
|
||||
|
||||
pub const BindingInfoTable = struct {
|
||||
dylib_ordinal: i64 = 0,
|
||||
binding_type: u8 = macho.BIND_TYPE_POINTER,
|
||||
entries: std.ArrayListUnmanaged(Entry) = .{},
|
||||
|
||||
pub const Entry = struct {
|
||||
/// Id of the symbol in the undef symbol table.
|
||||
/// Can be null.
|
||||
symbol: ?u16 = null,
|
||||
|
||||
/// Id of the segment where to bind this symbol to.
|
||||
segment: u8,
|
||||
|
||||
/// Offset of this symbol wrt to the segment id encoded in `segment`.
|
||||
offset: i64,
|
||||
};
|
||||
|
||||
pub fn deinit(self: *BindingInfoTable, allocator: *Allocator) void {
|
||||
self.entries.deinit(allocator);
|
||||
}
|
||||
|
||||
pub fn read(self: *BindingInfoTable, allocator: *Allocator, symbols_by_name: anytype, reader: anytype) !void {
|
||||
var name = std.ArrayList(u8).init(allocator);
|
||||
defer name.deinit();
|
||||
|
||||
var entry: Entry = .{
|
||||
.segment = 0,
|
||||
.offset = 0,
|
||||
};
|
||||
|
||||
var dylib_ordinal_set = false;
|
||||
var done = false;
|
||||
while (true) {
|
||||
const inst = reader.readByte() catch |err| switch (err) {
|
||||
error.EndOfStream => break,
|
||||
else => return err,
|
||||
};
|
||||
const imm: u8 = inst & macho.BIND_IMMEDIATE_MASK;
|
||||
const opcode: u8 = inst & macho.BIND_OPCODE_MASK;
|
||||
|
||||
switch (opcode) {
|
||||
macho.BIND_OPCODE_DO_BIND => {
|
||||
try self.entries.append(allocator, entry);
|
||||
entry = .{
|
||||
.segment = 0,
|
||||
.offset = 0,
|
||||
};
|
||||
},
|
||||
macho.BIND_OPCODE_DONE => {
|
||||
done = true;
|
||||
break;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM => {
|
||||
name.shrinkRetainingCapacity(0);
|
||||
var next = try reader.readByte();
|
||||
while (next != @as(u8, 0)) {
|
||||
try name.append(next);
|
||||
next = try reader.readByte();
|
||||
}
|
||||
entry.symbol = symbols_by_name.get(name.items[0..]);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
|
||||
entry.segment = imm;
|
||||
entry.offset = try leb.readILEB128(i64, reader);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_SPECIAL_IMM, macho.BIND_OPCODE_SET_DYLIB_ORDINAL_IMM => {
|
||||
assert(!dylib_ordinal_set);
|
||||
self.dylib_ordinal = imm;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB => {
|
||||
assert(!dylib_ordinal_set);
|
||||
self.dylib_ordinal = try leb.readILEB128(i64, reader);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_TYPE_IMM => {
|
||||
self.binding_type = imm;
|
||||
},
|
||||
else => {
|
||||
std.log.warn("unhandled BIND_OPCODE_: 0x{x}", .{opcode});
|
||||
},
|
||||
}
|
||||
}
|
||||
assert(done);
|
||||
}
|
||||
|
||||
pub fn write(self: BindingInfoTable, writer: anytype) !void {}
|
||||
};
|
||||
|
||||
pub const LazyBindingInfoTable = struct {
|
||||
entries: std.ArrayListUnmanaged(Entry) = .{},
|
||||
|
||||
pub const Entry = struct {
|
||||
/// Id of the symbol in the undef symbol table.
|
||||
symbol: u16,
|
||||
|
||||
/// Offset of this symbol wrt to the segment id encoded in `segment`.
|
||||
offset: i64,
|
||||
|
||||
/// Id of the dylib where this symbol is expected to reside.
|
||||
/// Positive ordinals point at dylibs imported with LC_LOAD_DYLIB,
|
||||
/// 0 means this binary, -1 the main executable, and -2 flat lookup.
|
||||
dylib_ordinal: i64,
|
||||
|
||||
/// Id of the segment where to bind this symbol to.
|
||||
segment: u8,
|
||||
};
|
||||
|
||||
pub fn deinit(self: *LazyBindingInfoTable, allocator: *Allocator) void {
|
||||
self.entries.deinit(allocator);
|
||||
}
|
||||
|
||||
pub fn read(self: *LazyBindingInfoTable, allocator: *Allocator, symbols_by_name: anytype, reader: anytype) !void {
|
||||
var name = std.ArrayList(u8).init(allocator);
|
||||
defer name.deinit();
|
||||
|
||||
var entry: Entry = .{
|
||||
.symbol = 0,
|
||||
.offset = 0,
|
||||
.segment = 0,
|
||||
.dylib_ordinal = 0,
|
||||
};
|
||||
|
||||
var done = false;
|
||||
while (true) {
|
||||
const inst = reader.readByte() catch |err| switch (err) {
|
||||
error.EndOfStream => break,
|
||||
else => return err,
|
||||
};
|
||||
const imm: u8 = inst & macho.BIND_IMMEDIATE_MASK;
|
||||
const opcode: u8 = inst & macho.BIND_OPCODE_MASK;
|
||||
|
||||
switch (opcode) {
|
||||
macho.BIND_OPCODE_DO_BIND => {
|
||||
try self.entries.append(allocator, entry);
|
||||
},
|
||||
macho.BIND_OPCODE_DONE => {
|
||||
done = true;
|
||||
entry = .{
|
||||
.symbol = 0,
|
||||
.offset = 0,
|
||||
.segment = 0,
|
||||
.dylib_ordinal = 0,
|
||||
};
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM => {
|
||||
name.shrinkRetainingCapacity(0);
|
||||
var next = try reader.readByte();
|
||||
while (next != @as(u8, 0)) {
|
||||
try name.append(next);
|
||||
next = try reader.readByte();
|
||||
}
|
||||
entry.symbol = symbols_by_name.get(name.items[0..]) orelse unreachable;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
|
||||
entry.segment = imm;
|
||||
entry.offset = try leb.readILEB128(i64, reader);
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_SPECIAL_IMM, macho.BIND_OPCODE_SET_DYLIB_ORDINAL_IMM => {
|
||||
entry.dylib_ordinal = imm;
|
||||
},
|
||||
macho.BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB => {
|
||||
entry.dylib_ordinal = try leb.readILEB128(i64, reader);
|
||||
},
|
||||
else => {
|
||||
std.log.warn("unhandled BIND_OPCODE_: 0x{x}", .{opcode});
|
||||
},
|
||||
}
|
||||
}
|
||||
assert(done);
|
||||
}
|
||||
|
||||
pub fn write(self: LazyBindingInfoTable, writer: anytype) !void {}
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user