lib: rename stdlib surface to Hare names; add endian/math
Sweeping rename so the lib/ surface mirrors Hare's stdlib spellings. - ascii: rune-taking predicates; ishex -> isxdigit - bufio: rinit -> init; take1/takeline -> readbyte/readline - bytes: indexsub -> index - encoding/utf8: runelen -> runesz - errors: eEOF/eShortRead/... -> eof/underread/... - fmt: errln -> errorln; println/fprintln return i64 - os: readfull/writefull -> readall/writeall; unlink -> remove - path: isabs -> abs; drop lastindex (now strings.rbyteindex) - strconv: u64toa/i64toa -> u64tos/i64tos; parse64/parseu64 -> stoi64/stou64 - strings: drop len/isempty; equal -> compare; indexbyte -> byteindex; +rbyteindex - types: drop numeric helpers (moved to math) - new lib/endian (htonu16/ntohu16), lib/math (absi32/absi64) - net: drop htons (use endian.htonu16) Callers in selfhost/, lib/ww/, cmd/w6c/cgen.c, and test/wcc/700_e2e.c updated to match.
This commit is contained in:
@@ -123,13 +123,13 @@ fn dbasename(p: *u8) *u8 = {
|
||||
|
||||
// ---- file slurp --------------------------------------------------------
|
||||
|
||||
fn readallso(path: *u8) (*u8, u64) = {
|
||||
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 buf: *u8 = os.alloc(n: u64): *u8;
|
||||
let got: i64 = os.readfull(fd, buf, n: u64);
|
||||
let got: i64 = os.readall(fd, buf, n: u64);
|
||||
os.close(fd);
|
||||
if (got != n) { return nil, 0u64; };
|
||||
return buf, n: u64;
|
||||
@@ -165,7 +165,7 @@ fn vdnameat(buf: *u8, verdefoff: u64, verdefsize: u64,
|
||||
export fn loadso(l: *lnk, path: *u8) i32 = {
|
||||
let buf: *u8;
|
||||
let blen: u64;
|
||||
buf, blen = readallso(path);
|
||||
buf, blen = slurpso(path);
|
||||
if (buf == nil) {
|
||||
os.write(2, "w6l: cannot read .so\n".ptr, 20u64);
|
||||
return -1;
|
||||
|
||||
@@ -720,7 +720,7 @@ 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.writefull(fd, filebuf, fileend);
|
||||
let wrote: i64 = os.writeall(fd, filebuf, fileend);
|
||||
if (wrote != fileend: i64) {
|
||||
return 1;
|
||||
};
|
||||
|
||||
@@ -120,9 +120,11 @@ export fn filesize(fd: i32) i64 = {
|
||||
return end;
|
||||
};
|
||||
|
||||
// readfull — keep reading until `n` bytes have arrived or the fd
|
||||
// readall — keep reading until `n` bytes have arrived or the fd
|
||||
// closes early. Returns bytes read (0..=n) or -1 on read error.
|
||||
export fn readfull(fd: i32, buf: *u8, n: u64) i64 = {
|
||||
// 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 = {
|
||||
let got: u64 = 0u64;
|
||||
for (got < n) {
|
||||
let r: i64 = read(fd, buf + got, n - got);
|
||||
@@ -133,9 +135,10 @@ export fn readfull(fd: i32, buf: *u8, n: u64) i64 = {
|
||||
return got: i64;
|
||||
};
|
||||
|
||||
// writefull — keep writing until `n` bytes have been accepted or the
|
||||
// fd refuses progress. Returns bytes written or -1.
|
||||
export fn writefull(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 = {
|
||||
let sent: u64 = 0u64;
|
||||
for (sent < n) {
|
||||
let r: i64 = write(fd, buf + sent, n - sent);
|
||||
@@ -154,8 +157,8 @@ export fn access(path: *u8, mode: i32) i32 = {
|
||||
return syscall2(SYS_ACCESS, path: i64, mode: i64): i32;
|
||||
};
|
||||
|
||||
// unlink(2).
|
||||
export fn unlink(path: *u8) i32 = {
|
||||
// remove — unlink(2). Hare name; the underlying syscall is unlink(2).
|
||||
export fn remove(path: *u8) i32 = {
|
||||
return syscall1(SYS_UNLINK, path: i64): i32;
|
||||
};
|
||||
|
||||
@@ -497,13 +500,13 @@ def RELA_ADDEND: u64 = 16u64;
|
||||
|
||||
// ---- file slurp --------------------------------------------------------
|
||||
|
||||
fn readall(path: *u8) (*u8, u64) = {
|
||||
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 buf: *u8 = os.alloc(n: u64): *u8;
|
||||
let got: i64 = os.readfull(fd, buf, n: u64);
|
||||
let got: i64 = os.readall(fd, buf, n: u64);
|
||||
os.close(fd);
|
||||
if (got != n) { return nil, 0u64; };
|
||||
return buf, n: u64;
|
||||
@@ -756,7 +759,7 @@ fn loadarchive(l: *lnk, path: *u8, buf: *u8, len: u64) i32 = {
|
||||
export fn load(l: *lnk, path: *u8) i32 = {
|
||||
let bufp: *u8;
|
||||
let buflen: u64;
|
||||
bufp, buflen = readall(path);
|
||||
bufp, buflen = slurp(path);
|
||||
if (bufp == nil) {
|
||||
os.write(2, "w6l: cannot read object\n".ptr, 23u64);
|
||||
return -1;
|
||||
@@ -1033,13 +1036,13 @@ fn dbasename(p: *u8) *u8 = {
|
||||
|
||||
// ---- file slurp --------------------------------------------------------
|
||||
|
||||
fn readallso(path: *u8) (*u8, u64) = {
|
||||
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 buf: *u8 = os.alloc(n: u64): *u8;
|
||||
let got: i64 = os.readfull(fd, buf, n: u64);
|
||||
let got: i64 = os.readall(fd, buf, n: u64);
|
||||
os.close(fd);
|
||||
if (got != n) { return nil, 0u64; };
|
||||
return buf, n: u64;
|
||||
@@ -1075,7 +1078,7 @@ fn vdnameat(buf: *u8, verdefoff: u64, verdefsize: u64,
|
||||
export fn loadso(l: *lnk, path: *u8) i32 = {
|
||||
let buf: *u8;
|
||||
let blen: u64;
|
||||
buf, blen = readallso(path);
|
||||
buf, blen = slurpso(path);
|
||||
if (buf == nil) {
|
||||
os.write(2, "w6l: cannot read .so\n".ptr, 20u64);
|
||||
return -1;
|
||||
@@ -2146,7 +2149,7 @@ 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.writefull(fd, filebuf, fileend);
|
||||
let wrote: i64 = os.writeall(fd, filebuf, fileend);
|
||||
if (wrote != fileend: i64) {
|
||||
return 1;
|
||||
};
|
||||
@@ -2246,10 +2249,10 @@ 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.writefull(fd, hdr, TEXT_OFF);
|
||||
let n1: i64 = os.writeall(fd, hdr, TEXT_OFF);
|
||||
if (n1 != TEXT_OFF: i64) { return -1; };
|
||||
if (l.textlen > 0u64) {
|
||||
let n2: i64 = os.writefull(fd, l.text, l.textlen);
|
||||
let n2: i64 = os.writeall(fd, l.text, l.textlen);
|
||||
if (n2 != l.textlen: i64) { return -1; };
|
||||
};
|
||||
return 0;
|
||||
|
||||
@@ -75,13 +75,13 @@ def RELA_ADDEND: u64 = 16u64;
|
||||
|
||||
// ---- file slurp --------------------------------------------------------
|
||||
|
||||
fn readall(path: *u8) (*u8, u64) = {
|
||||
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 buf: *u8 = os.alloc(n: u64): *u8;
|
||||
let got: i64 = os.readfull(fd, buf, n: u64);
|
||||
let got: i64 = os.readall(fd, buf, n: u64);
|
||||
os.close(fd);
|
||||
if (got != n) { return nil, 0u64; };
|
||||
return buf, n: u64;
|
||||
@@ -334,7 +334,7 @@ fn loadarchive(l: *lnk, path: *u8, buf: *u8, len: u64) i32 = {
|
||||
export fn load(l: *lnk, path: *u8) i32 = {
|
||||
let bufp: *u8;
|
||||
let buflen: u64;
|
||||
bufp, buflen = readall(path);
|
||||
bufp, buflen = slurp(path);
|
||||
if (bufp == nil) {
|
||||
os.write(2, "w6l: cannot read object\n".ptr, 23u64);
|
||||
return -1;
|
||||
|
||||
@@ -90,10 +90,10 @@ 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.writefull(fd, hdr, TEXT_OFF);
|
||||
let n1: i64 = os.writeall(fd, hdr, TEXT_OFF);
|
||||
if (n1 != TEXT_OFF: i64) { return -1; };
|
||||
if (l.textlen > 0u64) {
|
||||
let n2: i64 = os.writefull(fd, l.text, l.textlen);
|
||||
let n2: i64 = os.writeall(fd, l.text, l.textlen);
|
||||
if (n2 != l.textlen: i64) { return -1; };
|
||||
};
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user