mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-21 21:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

coff: repurpose value field of import Symbol for lib_name offset

Browse Source
This commit is contained in:
Jakub Konka 2023-03-27 20:45:32 +02:00
parent 0dc210f950
commit 2a5c4ea8f0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/link/Coff.zig
View File

@ -64,6 +64,8 @@ globals_free_list: std.ArrayListUnmanaged(u32) = .{},
strtab: StringTable(.strtab) = .{}, strtab: StringTable(.strtab) = .{},
strtab_offset: ?u32 = null, strtab_offset: ?u32 = null,
temp_strtab: StringTable(.temp_strtab) = .{},
got_entries: std.ArrayListUnmanaged(Entry) = .{}, got_entries: std.ArrayListUnmanaged(Entry) = .{},
got_entries_free_list: std.ArrayListUnmanaged(u32) = .{}, got_entries_free_list: std.ArrayListUnmanaged(u32) = .{},
got_entries_table: std.AutoHashMapUnmanaged(SymbolWithLoc, u32) = .{}, got_entries_table: std.AutoHashMapUnmanaged(SymbolWithLoc, u32) = .{},
@ -309,6 +311,7 @@ pub fn deinit(self: *Coff) void {
self.locals_free_list.deinit(gpa); self.locals_free_list.deinit(gpa);
self.globals_free_list.deinit(gpa); self.globals_free_list.deinit(gpa);
self.strtab.deinit(gpa); self.strtab.deinit(gpa);
self.temp_strtab.deinit(gpa);
self.got_entries.deinit(gpa); self.got_entries.deinit(gpa);
self.got_entries_free_list.deinit(gpa); self.got_entries_free_list.deinit(gpa);
self.got_entries_table.deinit(gpa); self.got_entries_table.deinit(gpa);
@ -358,6 +361,8 @@ fn populateMissingMetadata(self: *Coff) !void {
try self.strtab.buffer.ensureUnusedCapacity(gpa, @sizeOf(u32)); try self.strtab.buffer.ensureUnusedCapacity(gpa, @sizeOf(u32));
self.strtab.buffer.appendNTimesAssumeCapacity(0, @sizeOf(u32)); self.strtab.buffer.appendNTimesAssumeCapacity(0, @sizeOf(u32));
try self.temp_strtab.buffer.append(gpa, 0);
// Index 0 is always a null symbol. // Index 0 is always a null symbol.
try self.locals.append(gpa, .{ try self.locals.append(gpa, .{
.name = [_]u8{0} ** 8, .name = [_]u8{0} ** 8,
@ -1526,8 +1531,7 @@ pub fn getDeclVAddr(self: *Coff, decl_index: Module.Decl.Index, reloc_info: link
return 0; return 0;
} }
pub fn getGlobalSymbol(self: *Coff, name: []const u8, lib_name: ?[]const u8) !u32 { pub fn getGlobalSymbol(self: *Coff, name: []const u8, lib_name_name: ?[]const u8) !u32 {
_ = lib_name;
const gop = try self.getOrPutGlobalPtr(name); const gop = try self.getOrPutGlobalPtr(name);
const global_index = self.getGlobalIndex(name).?; const global_index = self.getGlobalIndex(name).?;
@ -1544,6 +1548,12 @@ pub fn getGlobalSymbol(self: *Coff, name: []const u8, lib_name: ?[]const u8) !u3
try self.setSymbolName(sym, name); try self.setSymbolName(sym, name);
sym.storage_class = .EXTERNAL; sym.storage_class = .EXTERNAL;
if (lib_name_name) |lib_name| {
// We repurpose the 'value' of the Symbol struct to store an offset into
// temporary string table where we will store the library name hint.
sym.value = try self.temp_strtab.insert(gpa, lib_name);
}
try self.unresolved.putNoClobber(gpa, global_index, true); try self.unresolved.putNoClobber(gpa, global_index, true);
return global_index; return global_index;