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

cmd: α/γ-4 rt.malloc → alloc([], N)! (w6a/w6c/w6l file slurps + sized bufs)

Browse Source 
Phase 0 #8 fourth α-batch. 10 α/γ conversions across 6 files:
 - w6a/main.ww slurp (1)
 - w6c/main.ww slurp (1)
 - w6l/dyn.ww slurpso (1)
 - w6l/obj.ww slurp (1)
 - w6l/dynout.ww filebuf at :661 (1; threads .ptr through ~50
   dwr*/dbcopy callees — that's the 139-line w6l/dynout diff)
 - w6l/out.ww hdr at :92 (1)
 - w6l/main.ww 4 sites: bufp + γ {inputs, libdirs, lflags} (4)

Deferred:
 - w6l/main.ww 3× 16/8/20-byte δ fixed-bufs at :67/:106/:176 →
   stack-promote in a separate sub-task.
 - w6l/obj.ww :113/:135 β text-buffer growth → memio.dynamic refactor.

Pattern unchanged from 47918d3/00d88ff/e9eb67d: `alloc([], N: u64)!` +
`buf.len = N: i32;` + `buf.ptr` for callees taking `*u8`. γ uses
element-count (was bytes): `maxinputs: u64` not `maxinputs*8u64`.

Verified 132/132 + 995_self_rebuild byte-identity. Advances #45.
This commit is contained in:
Hojun-Cho
2026-05-21 01:59:58 +09:00
parent e9eb67de04
commit 368b85ea33
10 changed files with 270 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
selfhost/cmd/w6l/out.ww
View File

@@ -89,7 +89,8 @@ export fn emitelf(l: *lnk, fd: i32, base: u64, entry: u64) i32 = {
let datafilelen: u64 = l.datalen - bsslen;
// One contiguous header buffer covering [0..0x1000), then .text.
let hdr: *u8 = rt.malloc(TEXT_OFF): *u8; // zero-initialised by mmap
let hdr: []u8 = alloc([], TEXT_OFF)!;
hdr.len = TEXT_OFF: i32;
// --- Ehdr (64 bytes) ---
hdr[0u64] = 127u8; // 0x7f
@@ -99,45 +100,45 @@ export fn emitelf(l: *lnk, fd: i32, base: u64, entry: u64) i32 = {
hdr[4u64] = ELFCLASS64;
hdr[5u64] = ELFDATA2LSB;
hdr[6u64] = EV_CURRENT: u8;
wru16(hdr, 16u64, ET_EXEC); // e_type
wru16(hdr, 18u64, EM_X86_64_W); // e_machine
wru32(hdr, 20u64, EV_CURRENT); // e_version
wru64(hdr, 24u64, entry); // e_entry
wru64(hdr, 32u64, 64u64); // e_phoff = sizeof(Ehdr)
wru64(hdr, 40u64, 0u64); // e_shoff
wru32(hdr, 48u64, 0u32); // e_flags
wru16(hdr, 52u64, 64u16); // e_ehsize
wru16(hdr, 54u64, 56u16); // e_phentsize
if (hasdata) { wru16(hdr, 56u64, 2u16); }
else { wru16(hdr, 56u64, 1u16); };
wru16(hdr, 58u64, 0u16); // e_shentsize
wru16(hdr, 60u64, 0u16); // e_shnum
wru16(hdr, 62u64, 0u16); // e_shstrndx
wru16(hdr.ptr, 16u64, ET_EXEC); // e_type
wru16(hdr.ptr, 18u64, EM_X86_64_W); // e_machine
wru32(hdr.ptr, 20u64, EV_CURRENT); // e_version
wru64(hdr.ptr, 24u64, entry); // e_entry
wru64(hdr.ptr, 32u64, 64u64); // e_phoff = sizeof(Ehdr)
wru64(hdr.ptr, 40u64, 0u64); // e_shoff
wru32(hdr.ptr, 48u64, 0u32); // e_flags
wru16(hdr.ptr, 52u64, 64u16); // e_ehsize
wru16(hdr.ptr, 54u64, 56u16); // e_phentsize
if (hasdata) { wru16(hdr.ptr, 56u64, 2u16); }
else { wru16(hdr.ptr, 56u64, 1u16); };
wru16(hdr.ptr, 58u64, 0u16); // e_shentsize
wru16(hdr.ptr, 60u64, 0u16); // e_shnum
wru16(hdr.ptr, 62u64, 0u16); // e_shstrndx
// --- Phdr #1 (R+X) at offset 64 ---
wru32(hdr, 64u64, PT_LOAD);
wru32(hdr, 68u64, PF_R | PF_X);
wru64(hdr, 72u64, 0u64); // p_offset
wru64(hdr, 80u64, base); // p_vaddr
wru64(hdr, 88u64, base); // p_paddr
wru64(hdr, 96u64, rxend); // p_filesz
wru64(hdr, 104u64, rxend); // p_memsz
wru64(hdr, 112u64, TEXT_OFF); // p_align
wru32(hdr.ptr, 64u64, PT_LOAD);
wru32(hdr.ptr, 68u64, PF_R | PF_X);
wru64(hdr.ptr, 72u64, 0u64); // p_offset
wru64(hdr.ptr, 80u64, base); // p_vaddr
wru64(hdr.ptr, 88u64, base); // p_paddr
wru64(hdr.ptr, 96u64, rxend); // p_filesz
wru64(hdr.ptr, 104u64, rxend); // p_memsz
wru64(hdr.ptr, 112u64, TEXT_OFF); // p_align
if (hasdata) {
// --- Phdr #2 (R+W) at offset 64+56=120 ---
wru32(hdr, 120u64, PT_LOAD);
wru32(hdr, 124u64, PF_R | PF_W);
wru64(hdr, 128u64, dataoff); // p_offset
wru64(hdr, 136u64, base + dataoff); // p_vaddr
wru64(hdr, 144u64, base + dataoff); // p_paddr
wru64(hdr, 152u64, datafilelen); // p_filesz
wru64(hdr, 160u64, l.datalen); // p_memsz
wru64(hdr, 168u64, PAGE_SZ); // p_align
wru32(hdr.ptr, 120u64, PT_LOAD);
wru32(hdr.ptr, 124u64, PF_R | PF_W);
wru64(hdr.ptr, 128u64, dataoff); // p_offset
wru64(hdr.ptr, 136u64, base + dataoff); // p_vaddr
wru64(hdr.ptr, 144u64, base + dataoff); // p_paddr
wru64(hdr.ptr, 152u64, datafilelen); // p_filesz
wru64(hdr.ptr, 160u64, l.datalen); // p_memsz
wru64(hdr.ptr, 168u64, PAGE_SZ); // p_align
};
// Write [0..0x1000) then .text.
let r1: (i64 | os.oserror) = os.writeall(fd, hdr, TEXT_OFF);
let r1: (i64 | os.oserror) = os.writeall(fd, hdr.ptr, TEXT_OFF);
let n1: i64 = 0i64;
match (r1) {
case let v: i64 => n1 = v;