selfhost/cmd/w6l: drop l_* prefix from exports + snake fields/helpers
This commit is contained in:
@@ -6,20 +6,20 @@
|
||||
use mem;
|
||||
|
||||
type lsym = struct {
|
||||
name: str,
|
||||
val: u64, // offset within combined .text once linked
|
||||
defined: i32, // 1 if some lobj defines this symbol
|
||||
owner: *lobj,
|
||||
idx_in_owner: i32,
|
||||
// Dynamic-linking fields. Set by l_resolve when an undefined sym
|
||||
// is provided by some loaded lso. plt_idx and dynsym_idx default
|
||||
// to -1 (set explicitly by l_resolve, not by amalloc-zeroing).
|
||||
is_dyn: i32,
|
||||
dyn_lib: *lso,
|
||||
dyn_version: str, // matched export's version; len 0 if none
|
||||
plt_idx: i32,
|
||||
dynsym_idx: i32,
|
||||
snext: *lsym,
|
||||
name: str,
|
||||
val: u64, // offset within combined .text once linked
|
||||
defined: i32, // 1 if some lobj defines this symbol
|
||||
owner: *lobj,
|
||||
idxinowner: i32,
|
||||
// Dynamic-linking fields. Set by resolve when an undefined sym
|
||||
// is provided by some loaded lso. pltidx and dynsymidx default
|
||||
// to -1 (set explicitly by resolve, not by amalloc-zeroing).
|
||||
isdyn: i32,
|
||||
dynlib: *lso,
|
||||
dynversion: str, // matched export's version; len 0 if none
|
||||
pltidx: i32,
|
||||
dynsymidx: i32,
|
||||
snext: *lsym,
|
||||
};
|
||||
|
||||
type lrel = struct {
|
||||
@@ -31,17 +31,17 @@ type lrel = struct {
|
||||
};
|
||||
|
||||
type lobj = struct {
|
||||
path: str,
|
||||
buf: *u8, // object bytes
|
||||
len: u64,
|
||||
text_off: u64, // offset of .text in combined output
|
||||
text_size: u64,
|
||||
onext: *lobj,
|
||||
path: str,
|
||||
buf: *u8, // object bytes
|
||||
len: u64,
|
||||
textoff: u64, // offset of .text in combined output
|
||||
textsize: u64,
|
||||
onext: *lobj,
|
||||
};
|
||||
|
||||
// lexport — one entry per GLOBAL/WEAK symbol exported by a loaded .so.
|
||||
// Stored as a chain in the order the .so's dynsym presents them, so
|
||||
// l_so_provides_v's first-match semantics agree with the C version.
|
||||
// soprovides_v's first-match semantics agree with the C version.
|
||||
type lexport = struct {
|
||||
name: str,
|
||||
version: str, // len 0 for unversioned globals
|
||||
@@ -65,7 +65,7 @@ type lnk = struct {
|
||||
textcap: u64,
|
||||
textlen: u64,
|
||||
errs: i32,
|
||||
dyn_n: i32, // number of syms routed through PLT
|
||||
dynn: i32, // number of syms routed through PLT
|
||||
};
|
||||
|
||||
fn streq(a: str, b: str) bool = {
|
||||
@@ -78,7 +78,7 @@ fn streq(a: str, b: str) bool = {
|
||||
return true;
|
||||
};
|
||||
|
||||
export fn l_intern(l: *lnk, name: str) *lsym = {
|
||||
export fn intern(l: *lnk, name: str) *lsym = {
|
||||
let s: *lsym = l.syms;
|
||||
for (s != nil) {
|
||||
if (streq(s.name, name)) { return s; };
|
||||
@@ -91,7 +91,7 @@ export fn l_intern(l: *lnk, name: str) *lsym = {
|
||||
return n;
|
||||
};
|
||||
|
||||
export fn l_lookup(l: *lnk, name: str) *lsym = {
|
||||
export fn lookup(l: *lnk, name: str) *lsym = {
|
||||
let s: *lsym = l.syms;
|
||||
for (s != nil) {
|
||||
if (streq(s.name, name)) { return s; };
|
||||
|
||||
Reference in New Issue
Block a user