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

7
selfhost/cmd/w6c/main.combined.ww
View File

@@ -23181,8 +23181,9 @@ fn slurp(path: *u8) (*u8, u64) = {
case let e: os.oserror => { os.close(fd); return nil, 0u64; };
};
let nz: u64 = n: u64;
let buf: *u8 = rt.malloc(nz + 1u64): *u8;
let rr: (i64 | os.oserror) = os.readall(fd, buf, nz);
let buf: []u8 = alloc([], nz + 1u64)!;
buf.len = (nz + 1u64): i32;
let rr: (i64 | os.oserror) = os.readall(fd, buf.ptr, nz);
os.close(fd);
let got: i64 = 0i64;
match (rr) {
@@ -23191,7 +23192,7 @@ fn slurp(path: *u8) (*u8, u64) = {
};
if (got != n) { return nil, 0u64; };
buf[nz] = 0u8;
return buf, nz;
return buf.ptr, nz;
};
export fn main(argc: i32, argv: **u8) i32 = {

7
selfhost/cmd/w6c/main.ww
View File

@@ -62,8 +62,9 @@ fn slurp(path: *u8) (*u8, u64) = {
case let e: os.oserror => { os.close(fd); return nil, 0u64; };
};
let nz: u64 = n: u64;
let buf: *u8 = rt.malloc(nz + 1u64): *u8;
let rr: (i64 | os.oserror) = os.readall(fd, buf, nz);
let buf: []u8 = alloc([], nz + 1u64)!;
buf.len = (nz + 1u64): i32;
let rr: (i64 | os.oserror) = os.readall(fd, buf.ptr, nz);
os.close(fd);
let got: i64 = 0i64;
match (rr) {
@@ -72,7 +73,7 @@ fn slurp(path: *u8) (*u8, u64) = {
};
if (got != n) { return nil, 0u64; };
buf[nz] = 0u8;
return buf, nz;
return buf.ptr, nz;
};
export fn main(argc: i32, argv: **u8) i32 = {