Hojun-Cho/ww
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

w6a,w6l: char-literals for ELF/archive magic bytes (Wave-1)

Browse Source 
byte-id-neutral: every magic-decimal sub is value-equivalent to its
ASCII char-literal. 0x7F (ELF byte-0), ELFCLASS64=2, NUL sentinels,
and hex/itoa radix arithmetic kept decimal (no char identity).
Regenerated w6a/w6l main.combined.ww (the only two embedders).
This commit is contained in:
Hojun-Cho
2026-06-02 20:41:51 +09:00
parent 5987e389b9
commit 2131ae0dee
6 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
selfhost/cmd/w6l/dyn.ww
View File

@@ -120,7 +120,7 @@ fn dbasename(p: *u8) *u8 = {
let i: u64 = n;
for (i > 0u64) {
i -= 1u64;
if (p[i] == 47u8) { // '/'
if (p[i] == '/') {
return p + i + 1u64;
};
};
@@ -191,9 +191,9 @@ export fn loadso(l: *lnk, path: *u8) i32 = {
return -1;
};
if (buf[0u64] != 127u8) { return soerr("not ELF"); };
if (buf[1u64] != 69u8) { return soerr("not ELF"); };
if (buf[2u64] != 76u8) { return soerr("not ELF"); };
if (buf[3u64] != 70u8) { return soerr("not ELF"); };
if (buf[1u64] != 'E') { return soerr("not ELF"); };
if (buf[2u64] != 'L') { return soerr("not ELF"); };
if (buf[3u64] != 'F') { return soerr("not ELF"); };
if (buf[4u64] != 2u8) { return soerr("not ELFCLASS64"); };
if (du16(buf, EH_EMACHINE) != EM_X86_64_SO) {
return soerr("not amd64");

82
selfhost/cmd/w6l/main.combined.ww
View File

@@ -3156,14 +3156,14 @@ type armember = struct {
fn isarchive(p: *u8, len: u64) bool = {
if (len < 8u64) { return false; };
if (p[0u64] != 33u8) { return false; }; // '!'
if (p[1u64] != 60u8) { return false; }; // '<'
if (p[2u64] != 97u8) { return false; }; // 'a'
if (p[3u64] != 114u8) { return false; }; // 'r'
if (p[4u64] != 99u8) { return false; }; // 'c'
if (p[5u64] != 104u8) { return false; }; // 'h'
if (p[6u64] != 62u8) { return false; }; // '>'
if (p[7u64] != 10u8) { return false; }; // '\n'
if (p[0u64] != '!') { return false; };
if (p[1u64] != '<') { return false; };
if (p[2u64] != 'a') { return false; };
if (p[3u64] != 'r') { return false; };
if (p[4u64] != 'c') { return false; };
if (p[5u64] != 'h') { return false; };
if (p[6u64] != '>') { return false; };
if (p[7u64] != '\n') { return false; };
return true;
};
@@ -3187,9 +3187,9 @@ fn arfield(p: *u8, n: u64) u64 = {
fn elfglobals(buf: *u8, len: u64) *defent = {
if (len < EHDR_SIZE) { return nil; };
if (buf[0u64] != 127u8) { return nil; };
if (buf[1u64] != 69u8) { return nil; };
if (buf[2u64] != 76u8) { return nil; };
if (buf[3u64] != 70u8) { return nil; };
if (buf[1u64] != 'E') { return nil; };
if (buf[2u64] != 'L') { return nil; };
if (buf[3u64] != 'F') { return nil; };
let shoff: u64 = rdu64(buf, EHDR_SHOFF);
let shnum: u32 = rdu16(buf, EHDR_SHNUM): u32;
@@ -3291,7 +3291,7 @@ fn loadarchive(l: *lnk, path: *u8, buf: *u8, len: u64) i32 = {
let first: u8 = buf[pos];
// Skip the symbol table ('/'), long-name table ('//'), and
// any padding entries (NUL or space leading byte).
if (first != 47u8) { if (first != 0u8) { if (first != 32u8) {
if (first != '/') { if (first != 0u8) { if (first != ' ') {
let m: *armember = alloc(armember { size = hdrsize })!;
let mbs: []u8 = alloc([], hdrsize)!;
let mb: *u8 = mbs.ptr;
@@ -3349,9 +3349,9 @@ fn loadimage(l: *lnk, path: *u8, buf: *u8, len: u64) i32 = {
if (len < EHDR_SIZE) { return -1; };
// magic: 0x7f, 'E', 'L', 'F'
if (buf[0u64] != 127u8) { return -1; };
if (buf[1u64] != 69u8) { return -1; };
if (buf[2u64] != 76u8) { return -1; };
if (buf[3u64] != 70u8) { return -1; };
if (buf[1u64] != 'E') { return -1; };
if (buf[2u64] != 'L') { return -1; };
if (buf[3u64] != 'F') { return -1; };
if (buf[4u64] != 2u8) { return -1; }; // ELFCLASS64
if (rdu16(buf, EHDR_TYPE) != ET_REL: u16) { return -1; };
if (rdu16(buf, EHDR_MACHINE) != EM_X86_64: u16) { return -1; };
@@ -3684,7 +3684,7 @@ fn dbasename(p: *u8) *u8 = {
let i: u64 = n;
for (i > 0u64) {
i -= 1u64;
if (p[i] == 47u8) { // '/'
if (p[i] == '/') {
return p + i + 1u64;
};
};
@@ -3755,9 +3755,9 @@ export fn loadso(l: *lnk, path: *u8) i32 = {
return -1;
};
if (buf[0u64] != 127u8) { return soerr("not ELF"); };
if (buf[1u64] != 69u8) { return soerr("not ELF"); };
if (buf[2u64] != 76u8) { return soerr("not ELF"); };
if (buf[3u64] != 70u8) { return soerr("not ELF"); };
if (buf[1u64] != 'E') { return soerr("not ELF"); };
if (buf[2u64] != 'L') { return soerr("not ELF"); };
if (buf[3u64] != 'F') { return soerr("not ELF"); };
if (buf[4u64] != 2u8) { return soerr("not ELFCLASS64"); };
if (du16(buf, EH_EMACHINE) != EM_X86_64_SO) {
return soerr("not amd64");
@@ -5078,13 +5078,13 @@ fn buildpath(dst: *u8, dir: *u8, name: *u8, ext: str) u64 = {
let nn: u64 = cstrlen(name);
let k: u64 = 0u64;
for (k < dn) { dst[i] = dir[k]; i += 1u64; k += 1u64; };
dst[i] = 47u8; // '/'
dst[i] = '/';
i += 1u64;
dst[i] = 108u8; // 'l'
dst[i] = 'l';
i += 1u64;
dst[i] = 105u8; // 'i'
dst[i] = 'i';
i += 1u64;
dst[i] = 98u8; // 'b'
dst[i] = 'b';
i += 1u64;
k = 0u64;
for (k < nn) { dst[i] = name[k]; i += 1u64; k += 1u64; };
@@ -5128,13 +5128,13 @@ fn buildpathv(dst: *u8, dir: *u8, name: *u8, v: u64) u64 = {
let nn: u64 = cstrlen(name);
let k: u64 = 0u64;
for (k < dn) { dst[i] = dir[k]; i += 1u64; k += 1u64; };
dst[i] = 47u8; i += 1u64;
dst[i] = 108u8; i += 1u64;
dst[i] = 105u8; i += 1u64;
dst[i] = 98u8; i += 1u64;
dst[i] = '/'; i += 1u64;
dst[i] = 'l'; i += 1u64;
dst[i] = 'i'; i += 1u64;
dst[i] = 'b'; i += 1u64;
k = 0u64;
for (k < nn) { dst[i] = name[k]; i += 1u64; k += 1u64; };
dst[i] = 46u8; i += 1u64; dst[i] = 115u8; i += 1u64; dst[i] = 111u8; i += 1u64; dst[i] = 46u8; i += 1u64;
dst[i] = '.'; i += 1u64; dst[i] = 's'; i += 1u64; dst[i] = 'o'; i += 1u64; dst[i] = '.'; i += 1u64;
i = appenddec(dst, i, v);
dst[i] = 0u8;
return i;
@@ -5150,18 +5150,18 @@ fn islinkable(path: *u8) bool = {
if (n < 4i64) { return false; };
// archive: "!<arch>\n"
if (n >= 8i64) {
if (mp[0u64] == 33u8) { if (mp[1u64] == 60u8) {
if (mp[2u64] == 97u8) { if (mp[3u64] == 114u8) {
if (mp[4u64] == 99u8) { if (mp[5u64] == 104u8) {
if (mp[6u64] == 62u8) { if (mp[7u64] == 10u8) {
if (mp[0u64] == '!') { if (mp[1u64] == '<') {
if (mp[2u64] == 'a') { if (mp[3u64] == 'r') {
if (mp[4u64] == 'c') { if (mp[5u64] == 'h') {
if (mp[6u64] == '>') { if (mp[7u64] == '\n') {
return true;
}; }; }; }; }; }; }; };
};
// ELF: "\x7fELF"
if (mp[0u64] == 127u8) {
if (mp[1u64] == 69u8) {
if (mp[2u64] == 76u8) {
if (mp[3u64] == 70u8) { return true; };
if (mp[1u64] == 'E') {
if (mp[2u64] == 'L') {
if (mp[3u64] == 'F') { return true; };
};
};
};
@@ -5219,9 +5219,9 @@ fn isso(path: *u8) i32 = {
os.close(fd);
if (n < 20i64) { return 0; };
if (mp[0u64] != 127u8) { return 0; };
if (mp[1u64] != 69u8) { return 0; };
if (mp[2u64] != 76u8) { return 0; };
if (mp[3u64] != 70u8) { return 0; };
if (mp[1u64] != 'E') { return 0; };
if (mp[2u64] != 'L') { return 0; };
if (mp[3u64] != 'F') { return 0; };
// e_type at offset 16, u16 little-endian
let t: u16 = (mp[16u64]: u16) | ((mp[17u64]: u16) << 8u16);
if (t == 3u16) { return 1; };
@@ -5267,9 +5267,9 @@ export fn main(argc: i32, argv: **u8) i32 = {
};
lflags[nlflags] = argv[i];
nlflags += 1;
} else { if (a[0u64] == 45u8) {
} else { if (a[0u64] == '-') {
// -L<dir> joined form.
if (a[1u64] == 76u8) {
if (a[1u64] == 'L') {
if (a[2u64] != 0u8) {
libdirs[nlibdirs] = a + 2u64;
nlibdirs += 1;
@@ -5277,7 +5277,7 @@ export fn main(argc: i32, argv: **u8) i32 = {
os.write(2, "w6l: bare -L\n".ptr, 12u64);
return 2;
};
} else { if (a[1u64] == 108u8) {
} else { if (a[1u64] == 'l') {
if (a[2u64] != 0u8) {
lflags[nlflags] = a + 2u64;
nlflags += 1;

44
selfhost/cmd/w6l/main.ww
View File

@@ -36,13 +36,13 @@ fn buildpath(dst: *u8, dir: *u8, name: *u8, ext: str) u64 = {
let nn: u64 = cstrlen(name);
let k: u64 = 0u64;
for (k < dn) { dst[i] = dir[k]; i += 1u64; k += 1u64; };
dst[i] = 47u8; // '/'
dst[i] = '/';
i += 1u64;
dst[i] = 108u8; // 'l'
dst[i] = 'l';
i += 1u64;
dst[i] = 105u8; // 'i'
dst[i] = 'i';
i += 1u64;
dst[i] = 98u8; // 'b'
dst[i] = 'b';
i += 1u64;
k = 0u64;
for (k < nn) { dst[i] = name[k]; i += 1u64; k += 1u64; };
@@ -86,13 +86,13 @@ fn buildpathv(dst: *u8, dir: *u8, name: *u8, v: u64) u64 = {
let nn: u64 = cstrlen(name);
let k: u64 = 0u64;
for (k < dn) { dst[i] = dir[k]; i += 1u64; k += 1u64; };
dst[i] = 47u8; i += 1u64;
dst[i] = 108u8; i += 1u64;
dst[i] = 105u8; i += 1u64;
dst[i] = 98u8; i += 1u64;
dst[i] = '/'; i += 1u64;
dst[i] = 'l'; i += 1u64;
dst[i] = 'i'; i += 1u64;
dst[i] = 'b'; i += 1u64;
k = 0u64;
for (k < nn) { dst[i] = name[k]; i += 1u64; k += 1u64; };
dst[i] = 46u8; i += 1u64; dst[i] = 115u8; i += 1u64; dst[i] = 111u8; i += 1u64; dst[i] = 46u8; i += 1u64;
dst[i] = '.'; i += 1u64; dst[i] = 's'; i += 1u64; dst[i] = 'o'; i += 1u64; dst[i] = '.'; i += 1u64;
i = appenddec(dst, i, v);
dst[i] = 0u8;
return i;
@@ -108,18 +108,18 @@ fn islinkable(path: *u8) bool = {
if (n < 4i64) { return false; };
// archive: "!<arch>\n"
if (n >= 8i64) {
if (mp[0u64] == 33u8) { if (mp[1u64] == 60u8) {
if (mp[2u64] == 97u8) { if (mp[3u64] == 114u8) {
if (mp[4u64] == 99u8) { if (mp[5u64] == 104u8) {
if (mp[6u64] == 62u8) { if (mp[7u64] == 10u8) {
if (mp[0u64] == '!') { if (mp[1u64] == '<') {
if (mp[2u64] == 'a') { if (mp[3u64] == 'r') {
if (mp[4u64] == 'c') { if (mp[5u64] == 'h') {
if (mp[6u64] == '>') { if (mp[7u64] == '\n') {
return true;
}; }; }; }; }; }; }; };
};
// ELF: "\x7fELF"
if (mp[0u64] == 127u8) {
if (mp[1u64] == 69u8) {
if (mp[2u64] == 76u8) {
if (mp[3u64] == 70u8) { return true; };
if (mp[1u64] == 'E') {
if (mp[2u64] == 'L') {
if (mp[3u64] == 'F') { return true; };
};
};
};
@@ -177,9 +177,9 @@ fn isso(path: *u8) i32 = {
os.close(fd);
if (n < 20i64) { return 0; };
if (mp[0u64] != 127u8) { return 0; };
if (mp[1u64] != 69u8) { return 0; };
if (mp[2u64] != 76u8) { return 0; };
if (mp[3u64] != 70u8) { return 0; };
if (mp[1u64] != 'E') { return 0; };
if (mp[2u64] != 'L') { return 0; };
if (mp[3u64] != 'F') { return 0; };
// e_type at offset 16, u16 little-endian
let t: u16 = (mp[16u64]: u16) | ((mp[17u64]: u16) << 8u16);
if (t == 3u16) { return 1; };
@@ -225,9 +225,9 @@ export fn main(argc: i32, argv: **u8) i32 = {
};
lflags[nlflags] = argv[i];
nlflags += 1;
} else { if (a[0u64] == 45u8) {
} else { if (a[0u64] == '-') {
// -L<dir> joined form.
if (a[1u64] == 76u8) {
if (a[1u64] == 'L') {
if (a[2u64] != 0u8) {
libdirs[nlibdirs] = a + 2u64;
nlibdirs += 1;
@@ -235,7 +235,7 @@ export fn main(argc: i32, argv: **u8) i32 = {
os.write(2, "w6l: bare -L\n".ptr, 12u64);
return 2;
};
} else { if (a[1u64] == 108u8) {
} else { if (a[1u64] == 'l') {
if (a[2u64] != 0u8) {
lflags[nlflags] = a + 2u64;
nlflags += 1;

30
selfhost/cmd/w6l/obj.ww
View File

@@ -209,14 +209,14 @@ type armember = struct {
fn isarchive(p: *u8, len: u64) bool = {
if (len < 8u64) { return false; };
if (p[0u64] != 33u8) { return false; }; // '!'
if (p[1u64] != 60u8) { return false; }; // '<'
if (p[2u64] != 97u8) { return false; }; // 'a'
if (p[3u64] != 114u8) { return false; }; // 'r'
if (p[4u64] != 99u8) { return false; }; // 'c'
if (p[5u64] != 104u8) { return false; }; // 'h'
if (p[6u64] != 62u8) { return false; }; // '>'
if (p[7u64] != 10u8) { return false; }; // '\n'
if (p[0u64] != '!') { return false; };
if (p[1u64] != '<') { return false; };
if (p[2u64] != 'a') { return false; };
if (p[3u64] != 'r') { return false; };
if (p[4u64] != 'c') { return false; };
if (p[5u64] != 'h') { return false; };
if (p[6u64] != '>') { return false; };
if (p[7u64] != '\n') { return false; };
return true;
};
@@ -240,9 +240,9 @@ fn arfield(p: *u8, n: u64) u64 = {
fn elfglobals(buf: *u8, len: u64) *defent = {
if (len < EHDR_SIZE) { return nil; };
if (buf[0u64] != 127u8) { return nil; };
if (buf[1u64] != 69u8) { return nil; };
if (buf[2u64] != 76u8) { return nil; };
if (buf[3u64] != 70u8) { return nil; };
if (buf[1u64] != 'E') { return nil; };
if (buf[2u64] != 'L') { return nil; };
if (buf[3u64] != 'F') { return nil; };
let shoff: u64 = rdu64(buf, EHDR_SHOFF);
let shnum: u32 = rdu16(buf, EHDR_SHNUM): u32;
@@ -344,7 +344,7 @@ fn loadarchive(l: *lnk, path: *u8, buf: *u8, len: u64) i32 = {
let first: u8 = buf[pos];
// Skip the symbol table ('/'), long-name table ('//'), and
// any padding entries (NUL or space leading byte).
if (first != 47u8) { if (first != 0u8) { if (first != 32u8) {
if (first != '/') { if (first != 0u8) { if (first != ' ') {
let m: *armember = alloc(armember { size = hdrsize })!;
let mbs: []u8 = alloc([], hdrsize)!;
let mb: *u8 = mbs.ptr;
@@ -402,9 +402,9 @@ fn loadimage(l: *lnk, path: *u8, buf: *u8, len: u64) i32 = {
if (len < EHDR_SIZE) { return -1; };
// magic: 0x7f, 'E', 'L', 'F'
if (buf[0u64] != 127u8) { return -1; };
if (buf[1u64] != 69u8) { return -1; };
if (buf[2u64] != 76u8) { return -1; };
if (buf[3u64] != 70u8) { return -1; };
if (buf[1u64] != 'E') { return -1; };
if (buf[2u64] != 'L') { return -1; };
if (buf[3u64] != 'F') { return -1; };
if (buf[4u64] != 2u8) { return -1; }; // ELFCLASS64
if (rdu16(buf, EHDR_TYPE) != ET_REL: u16) { return -1; };
if (rdu16(buf, EHDR_MACHINE) != EM_X86_64: u16) { return -1; };