Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

.fingerprint = 0x6002b2b610072fc5,

.minimum_zig_version = "0.15.0-dev.1092+d772c0627",
.minimum_zig_version = "0.17.0",

.dependencies = .{
.plthook = .{
Expand Down
27 changes: 15 additions & 12 deletions src/runtimes/func_import.zig
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,26 @@ pub fn defineFuncImportTable(comptime prefix: []const u8, comptime defns: type)
comptime {
const Type = std.builtin.Type;
const defns_fields = @typeInfo(defns).@"struct".fields;
var fields: [defns_fields.len]Type.StructField = undefined;
for (defns_fields, &fields) |defn, *field| {
var field_names: [defns_fields.len][]const u8 = undefined;
var field_types: [defns_fields.len]type = undefined;
var field_attrs: [defns_fields.len]Type.Struct.FieldAttributes = undefined;
for (defns_fields, &field_names, &field_types, &field_attrs) |defn, *fname, *ftype, *fattrs| {
const T = ?*const defn.type;
field.* = .{
.name = defn.name,
.type = T,
.is_comptime = false,
fname.* = defn.name;
ftype.* = T;
fattrs.* = .{
.@"comptime" = false,
.@"align" = null,
.default_value_ptr = @ptrCast(&@as(T, null)),
.alignment = 0,
};
}
const AddrTable = @Type(.{ .@"struct" = Type.Struct{
.fields = &fields,
.decls = &.{},
.is_tuple = false,
const AddrTable = @Struct(.{
.layout = .auto,
} });
.BackingInt = null,
.field_names = &field_names,
.field_types = &field_types,
.field_attrs = &field_attrs,
});

return struct {
pub var addrs: AddrTable = .{};
Expand Down
20 changes: 13 additions & 7 deletions src/util/paths.zig
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ pub fn exists(path: [*:0]const os_char, comptime filter: enum { file, directory
}
}

/// https://codebrowser.dev/glibc/glibc/dlfcn/dlfcn.h.html#86
const Dl_info = extern struct {
dli_fname: ?[*:0]const u8,
dli_fbase: ?*anyopaque,
dli_sname: ?[*:0]const u8,
dli_saddr: ?*anyopaque,
};

/// https://codebrowser.dev/glibc/glibc/dlfcn/dlfcn.h.html#96
extern fn dladdr(address: *const anyopaque, info: *Dl_info) c_int;

pub const ModulePathBuf = struct {
buf: if (builtin.os.tag == .windows) [std.os.windows.PATH_MAX_WIDE]u16 else void,

Expand All @@ -48,14 +59,9 @@ pub const ModulePathBuf = struct {
}
return self.buf[0..rc :0];
} else {
const dlfcn = @cImport({
@cDefine("_GNU_SOURCE", {});
@cInclude("dlfcn.h");
});

var info: dlfcn.Dl_info = undefined;
var info: Dl_info = undefined;

if (dlfcn.dladdr(module, &info) == 0) {
if (dladdr(module, &info) == 0) {
return null;
}
self.* = .{ .buf = {} };
Expand Down
Loading