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

os: graduate filesize/readall/writeall to (i64 | oserror)

Browse Source 
`type oserror = i64` carries -errno (Hare's errors::errno-shaped
named-i64). The three convenience wrappers move off the i64 = -1
sentinel and onto the tagged-union surface.

Callers updated across the selfhost (wwdump, w6c, w6a, w6l, ww
driver). The slurp paths in w6c/w6a/w6l/wwdump now match on the
filesize and readall results; the ELF-emitting writeall sites in
w6a/obj.ww are wrapped through two small local helpers (`wrn` for
"wrote N bytes ok?", `wrdrop` for fire-and-forget) so the existing
11-callsite write loop stays readable.

selfhost/test/smoke.ww kept using raw os.read instead of
os.readall: the 990 cgen-match probe compiles smoke.ww standalone
(no `use` expansion), and cross-module type references like
`os.oserror` can't be resolved in that mode.

Two selfhost-side gaps surfaced and got plugged:
- lib/ww/parse/parse.ww parsetype now collapses dotted type names
  (`pkg.Type` → single N_TNAME with the joined string), mirroring C
  parsetype's dotted-path loop. Local `joindotted` helper because
  there's no arena-based string-concat in the selfhost lib yet.
- selfhost/cmd/wcc/check.ww name-resolver applies the dotted-prefix
  rule from cmd/wcc/check.c's resolve_typename: split at the last
  dot, look up the head as a `use` import, then the leaf as a type.
This commit is contained in:
Hojun-Cho
2026-05-12 02:25:40 +09:00
parent 5c20c40724
commit fd45aedf6c
19 changed files with 533 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,25 +110,29 @@ export fn lseek(fd: i32, off: i64, whence: i32) i64 = {
return syscall3(SYS_LSEEK, fd: i64, off, whence: i64);
};
// filesize — convenience: returns the byte length of an open fd by
// seeking to the end and back. -1 on error.
export fn filesize(fd: i32) i64 = {
// oserror — the underlying errno from a failed syscall, as a
// negative i64 (Linux's int convention; e.g. -2 = ENOENT). The
// NAMED-i64 alias makes it a distinct variant tag from a "good"
// i64 byte count. Hare's analogue is errors::errno.
export type oserror = i64;
// filesize — byte length of an open fd via lseek-to-end-and-back.
export fn filesize(fd: i32) (i64 | oserror) = {
let end: i64 = lseek(fd, 0i64, SEEK_END);
if (end < 0) { return -1i64; };
if (end < 0) { return end: oserror; };
let r: i64 = lseek(fd, 0i64, SEEK_SET);
if (r < 0) { return -1i64; };
if (r < 0) { return r: oserror; };
return end;
};
// readall — keep reading until `n` bytes have arrived or the fd
// closes early. Returns bytes read (0..=n) or -1 on read error.
// Hare name (io::readall); the buffer is caller-supplied, matching
// the Plan 9 subset convention.
export fn readall(fd: i32, buf: *u8, n: u64) i64 = {
// closes early. Hare name (io::readall); the buffer is caller-
// supplied, matching the Plan 9 subset convention.
export fn readall(fd: i32, buf: *u8, n: u64) (i64 | oserror) = {
let got: u64 = 0u64;
for (got < n) {
let r: i64 = read(fd, buf + got, n - got);
if (r < 0) { return -1i64; };
if (r < 0) { return r: oserror; };
if (r == 0) { return got: i64; }; // short read: caller decides
got += r: u64;
};
@@ -136,13 +140,12 @@ export fn readall(fd: i32, buf: *u8, n: u64) i64 = {
};
// writeall — keep writing until `n` bytes have been accepted or the
// fd refuses progress. Returns bytes written or -1. Hare name
// (io::writeall).
export fn writeall(fd: i32, buf: *u8, n: u64) i64 = {
// fd refuses progress. Hare name (io::writeall).
export fn writeall(fd: i32, buf: *u8, n: u64) (i64 | oserror) = {
let sent: u64 = 0u64;
for (sent < n) {
let r: i64 = write(fd, buf + sent, n - sent);
if (r < 0) { return -1i64; };
if (r < 0) { return r: oserror; };
if (r == 0) { return sent: i64; };
sent += r: u64;
};
@@ -503,11 +506,20 @@ def RELA_ADDEND: u64 = 16u64;
fn slurp(path: *u8) (*u8, u64) = {
let fd: i32 = os.open(path, os.O_RDONLY, 0i32);
if (fd < 0) { return nil, 0u64; };
let n: i64 = os.filesize(fd);
if (n < 0i64) { os.close(fd); return nil, 0u64; };
let szr: (i64 | os.oserror) = os.filesize(fd);
let n: i64 = 0i64;
match (szr) {
case let v: i64 => n = v;
case let e: os.oserror => { os.close(fd); return nil, 0u64; };
};
let buf: *u8 = os.alloc(n: u64): *u8;
let got: i64 = os.readall(fd, buf, n: u64);
let rr: (i64 | os.oserror) = os.readall(fd, buf, n: u64);
os.close(fd);
let got: i64 = 0i64;
match (rr) {
case let v: i64 => got = v;
case let e: os.oserror => return nil, 0u64;
};
if (got != n) { return nil, 0u64; };
return buf, n: u64;
};
@@ -1039,11 +1051,20 @@ fn dbasename(p: *u8) *u8 = {
fn slurpso(path: *u8) (*u8, u64) = {
let fd: i32 = os.open(path, os.O_RDONLY, 0i32);
if (fd < 0) { return nil, 0u64; };
let n: i64 = os.filesize(fd);
if (n < 0i64) { os.close(fd); return nil, 0u64; };
let szr: (i64 | os.oserror) = os.filesize(fd);
let n: i64 = 0i64;
match (szr) {
case let v: i64 => n = v;
case let e: os.oserror => { os.close(fd); return nil, 0u64; };
};
let buf: *u8 = os.alloc(n: u64): *u8;
let got: i64 = os.readall(fd, buf, n: u64);
let rr: (i64 | os.oserror) = os.readall(fd, buf, n: u64);
os.close(fd);
let got: i64 = 0i64;
match (rr) {
case let v: i64 => got = v;
case let e: os.oserror => return nil, 0u64;
};
if (got != n) { return nil, 0u64; };
return buf, n: u64;
};
@@ -2149,9 +2170,10 @@ export fn emitdynelf(l: *lnk, fd: i32, base: u64, entry: u64) i32 = {
dbcopy(filebuf, gotpltoff, gotpltbuf, gotpltsz);
dbcopy(filebuf, dynamicoff, dynamicbuf, dynamicsz);
let wrote: i64 = os.writeall(fd, filebuf, fileend);
if (wrote != fileend: i64) {
return 1;
let wr: (i64 | os.oserror) = os.writeall(fd, filebuf, fileend);
match (wr) {
case let v: i64 => { if (v != fileend: i64) { return 1; }; };
case let e: os.oserror => return 1;
};
return 0;
};
@@ -2249,10 +2271,20 @@ export fn emitelf(l: *lnk, fd: i32, base: u64, entry: u64) i32 = {
wru64(hdr, 112u64, TEXT_OFF); // p_align
// Write [0..0x1000) then .text.
let n1: i64 = os.writeall(fd, hdr, TEXT_OFF);
let r1: (i64 | os.oserror) = os.writeall(fd, hdr, TEXT_OFF);
let n1: i64 = 0i64;
match (r1) {
case let v: i64 => n1 = v;
case let e: os.oserror => return -1;
};
if (n1 != TEXT_OFF: i64) { return -1; };
if (l.textlen > 0u64) {
let n2: i64 = os.writeall(fd, l.text, l.textlen);
let r2: (i64 | os.oserror) = os.writeall(fd, l.text, l.textlen);
let n2: i64 = 0i64;
match (r2) {
case let v: i64 => n2 = v;
case let e: os.oserror => return -1;
};
if (n2 != l.textlen: i64) { return -1; };
};
return 0;