selfhost/cmd/{w6c,w6a,w6l}: drop snake_case from main.ww drivers

This commit is contained in:
2026-05-11 14:22:09 +09:00
parent 2918013c1a
commit 4f6f1d8edf
6 changed files with 178 additions and 210 deletions

View File

@@ -2149,7 +2149,7 @@ use parse;
use asm;
use obj;
fn streq_cs(a: *u8, lit: str) bool = {
fn cstreq(a: *u8, lit: str) bool = {
let n: u64 = lit.len: u64;
let i: u64 = 0u64;
for (i < n) {
@@ -2168,8 +2168,8 @@ fn cstrlen(p: *u8) u64 = {
};
// Slurp the whole file into a fresh buffer.
fn slurp(path_cs: *u8) (*u8, u64) = {
let fd: i32 = os.open(path_cs, os.O_RDONLY, 0i32);
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; };
@@ -2183,44 +2183,44 @@ fn slurp(path_cs: *u8) (*u8, u64) = {
};
export fn main(argc: i32, argv: **u8) i32 = {
let src_cs: *u8 = nil;
let out_cs: *u8 = nil;
let src: *u8 = nil;
let out: *u8 = nil;
let i: i32 = 1;
for (i < argc) {
let a: *u8 = argv[i];
if (streq_cs(a, "-o")) {
if (cstreq(a, "-o")) {
i += 1;
if (i >= argc) {
os.write(2, "w6a: -o requires arg\n".ptr, 20u64);
return 2;
};
out_cs = argv[i];
out = argv[i];
} else { if (a[0u64] == 45u8) {
os.write(2, "w6a: unknown flag\n".ptr, 17u64);
return 2;
} else {
if (src_cs != nil) {
if (src != nil) {
os.write(2, "w6a: only one input\n".ptr, 19u64);
return 2;
};
src_cs = a;
src = a;
}; };
i += 1;
};
if (src_cs == nil) {
if (src == nil) {
os.write(2, "usage: w6a_ww -o file.o file.s\n".ptr, 30u64);
return 2;
};
if (out_cs == nil) {
if (out == nil) {
os.write(2, "w6a: missing -o\n".ptr, 15u64);
return 2;
};
let buf: *u8;
let blen: u64;
buf, blen = slurp(src_cs);
buf, blen = slurp(src);
if (buf == nil) {
os.write(2, "w6a: cannot read input\n".ptr, 22u64);
return 1;
@@ -2228,15 +2228,15 @@ export fn main(argc: i32, argv: **u8) i32 = {
let ar: *arena = newarena();
let asm: asm_;
let nlen: u64 = cstrlen(src_cs);
let fname: str = astrndup(ar, src_cs, nlen);
let nlen: u64 = cstrlen(src);
let fname: str = astrndup(ar, src, nlen);
a_init(&asm, ar, fname, buf, blen);
if (a_parse(&asm) != 0) { return 1; };
if (a_encode(&asm) != 0) { return 1; };
// Open output for write.
let fd: i32 = os.open(out_cs, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 420i32); // 0o644
let fd: i32 = os.open(out, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 420i32); // 0o644
if (fd < 0) {
os.write(2, "w6a: cannot open output\n".ptr, 23u64);
return 1;

View File

@@ -12,7 +12,7 @@ use parse;
use asm;
use obj;
fn streq_cs(a: *u8, lit: str) bool = {
fn cstreq(a: *u8, lit: str) bool = {
let n: u64 = lit.len: u64;
let i: u64 = 0u64;
for (i < n) {
@@ -31,8 +31,8 @@ fn cstrlen(p: *u8) u64 = {
};
// Slurp the whole file into a fresh buffer.
fn slurp(path_cs: *u8) (*u8, u64) = {
let fd: i32 = os.open(path_cs, os.O_RDONLY, 0i32);
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; };
@@ -46,44 +46,44 @@ fn slurp(path_cs: *u8) (*u8, u64) = {
};
export fn main(argc: i32, argv: **u8) i32 = {
let src_cs: *u8 = nil;
let out_cs: *u8 = nil;
let src: *u8 = nil;
let out: *u8 = nil;
let i: i32 = 1;
for (i < argc) {
let a: *u8 = argv[i];
if (streq_cs(a, "-o")) {
if (cstreq(a, "-o")) {
i += 1;
if (i >= argc) {
os.write(2, "w6a: -o requires arg\n".ptr, 20u64);
return 2;
};
out_cs = argv[i];
out = argv[i];
} else { if (a[0u64] == 45u8) {
os.write(2, "w6a: unknown flag\n".ptr, 17u64);
return 2;
} else {
if (src_cs != nil) {
if (src != nil) {
os.write(2, "w6a: only one input\n".ptr, 19u64);
return 2;
};
src_cs = a;
src = a;
}; };
i += 1;
};
if (src_cs == nil) {
if (src == nil) {
os.write(2, "usage: w6a_ww -o file.o file.s\n".ptr, 30u64);
return 2;
};
if (out_cs == nil) {
if (out == nil) {
os.write(2, "w6a: missing -o\n".ptr, 15u64);
return 2;
};
let buf: *u8;
let blen: u64;
buf, blen = slurp(src_cs);
buf, blen = slurp(src);
if (buf == nil) {
os.write(2, "w6a: cannot read input\n".ptr, 22u64);
return 1;
@@ -91,15 +91,15 @@ export fn main(argc: i32, argv: **u8) i32 = {
let ar: *arena = newarena();
let asm: asm_;
let nlen: u64 = cstrlen(src_cs);
let fname: str = astrndup(ar, src_cs, nlen);
let nlen: u64 = cstrlen(src);
let fname: str = astrndup(ar, src, nlen);
a_init(&asm, ar, fname, buf, blen);
if (a_parse(&asm) != 0) { return 1; };
if (a_encode(&asm) != 0) { return 1; };
// Open output for write.
let fd: i32 = os.open(out_cs, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 420i32); // 0o644
let fd: i32 = os.open(out, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 420i32); // 0o644
if (fd < 0) {
os.write(2, "w6a: cannot open output\n".ptr, 23u64);
return 1;