527d4a6a18
libc/mem/:
• Split bank_io.c into bank_io_w3.c (existing W3 helpers, base 0xC000,
port 0xE2) and bank_io_w1.c (new mirror through W1, base 0x4000,
port 0xA2). Two .rel files so DCE picks only the needed group:
a W3-only user pulls ~70 bytes instead of all 134. W1 variants are
`--memory tiny`-only (any other mode runs code from W1 or uses W1
for the banked-code segment, swapping it crashes).
• mem_alloc.c: add CF=err checks for mem_free_block and mem_get_page
(were silently ignored), per-function docstrings on alloc/free/
get_page/info, drop the confused "wait wrong order" comment in
mem_info. Header sprinter_mem.h gets matching per-function doc.
libc/stdio/:
• Add hex_print.c (hex8/hex16/hex32, ~26 bytes) and dec_print.c
(dec8/dec16/dec32, ~170 bytes) ported from solid-c STDLIB.ASM.
Replaces the printf("%u"/"%X") wrappers in solid_helpers.c that
dragged in the 3-5 KB printf machinery.
- hex* use the classic cp 10 / sbc 0x69 / daa nibble→ASCII trick;
hex8 self-calls for the high nibble, hex16/hex32 tail-call hex8.
- dec32 is the master routine; dec8/dec16 jump into shared entry
points (__dec_entry3 / __dec_entry5). 32-bit subtract-power-of-10
keeps the high 16 bits in HL alt (shadow set).
- DISCOVERY: ESTEX PUTCHAR ($5B) on our Sprinter build preserves
the main register set + IX but CLOBBERS the shadow set
(BC'/DE'/HL'). solid-c's original code assumed otherwise and
garbled output for values ≥ 6 digits. Fix: save/restore HL alt
around the RST 10 in _dec_emit_or_skip. Documented in
memory/estex_putchar_abi.md.
• file.c: drop stdaux/stdprn (no Sprinter printer API), change
stdin/stdout/stderr fd markers to 0/-1/-2 (positive fds clash with
ESTEX OPEN return values), add TODO header pointing at v2 buffered
FILE rewrite (see docs/TODO.md for the Solid-C reference struct).
bin/sprinter-cc:
• --memory big and --memory huge now always use crt0_banked.s (was:
only with --bank flags), matching docs/memory_modes_implemented.md.
When the user has no --bank flags, generate a tiny stub with
`const uint8_t n_banks = 0;` and assemble bank.s for _bank_pages.
Without this fix, openenv with --memory big could not see the
estex_file_handle symbol exported by crt0_banked.
examples/openenv:
• Add usage of estex_file_handle to confirm the crt0_banked startup-
info is reachable. Local extern decl — keeps the symbol out of
sprinter.h since it only exists in big/huge builds.
examples/dec_test:
• New regression test covering hex8/16/32 and dec8/16/32 across the
interesting boundary values.
.gitignore: add .kilo/ (editor session cache).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
154 lines
4.1 KiB
C
154 lines
4.1 KiB
C
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
#include <sprinter.h>
|
|
|
|
/*
|
|
* Exercises the new open() state machine + ESTEX env API.
|
|
*
|
|
* Touches the floppy: creates TMP1.TXT and TMP2.TXT, writes a few bytes,
|
|
* verifies O_CREAT / O_EXCL / O_TRUNC / O_APPEND behaviour, then deletes.
|
|
*/
|
|
|
|
extern uint8_t estex_file_handle;
|
|
|
|
|
|
static void show_errno(const char *label)
|
|
{
|
|
printf(" %s: errno=%d \"%s\"\n", label, errno, strerror(errno));
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
puts("Sprinter open() + env API test");
|
|
puts("");
|
|
|
|
printf("estex_file_handle: fd=%u\n", estex_file_handle);
|
|
|
|
/* --- open() state machine ------------------------------------- */
|
|
|
|
/* 1. O_CREAT|O_EXCL: must succeed first time, must fail on retry. */
|
|
unlink("TMP1.TXT"); /* clean slate */
|
|
errno = 0;
|
|
int fd = open("TMP1.TXT", O_WRONLY | O_CREAT | O_EXCL);
|
|
printf("create-new TMP1.TXT (1st): fd=%d\n", fd);
|
|
show_errno(" after 1st");
|
|
if (fd >= 0) {
|
|
write(fd, "abcdef", 6);
|
|
close(fd);
|
|
}
|
|
|
|
errno = 0;
|
|
fd = open("TMP1.TXT", O_WRONLY | O_CREAT | O_EXCL);
|
|
printf("create-new TMP1.TXT (2nd, should fail with EEXIST): fd=%d\n", fd);
|
|
show_errno(" after 2nd");
|
|
|
|
/* 2. O_CREAT|O_TRUNC: file is reset. */
|
|
errno = 0;
|
|
fd = open("TMP1.TXT", O_WRONLY | O_CREAT | O_TRUNC);
|
|
printf("create-trunc TMP1.TXT: fd=%d\n", fd);
|
|
if (fd >= 0) {
|
|
write(fd, "XYZ", 3);
|
|
close(fd);
|
|
}
|
|
|
|
/* Read back to confirm truncation overwrote "abcdef". */
|
|
char buf[16];
|
|
fd = open("TMP1.TXT", O_RDONLY);
|
|
int n = read(fd, buf, sizeof(buf) - 1);
|
|
if (n < 0) n = 0;
|
|
buf[n] = 0;
|
|
close(fd);
|
|
printf("contents after trunc+write: \"%s\" (expect \"XYZ\")\n", buf);
|
|
|
|
/* 3. O_APPEND: writes go to end. */
|
|
fd = open("TMP1.TXT", O_WRONLY | O_APPEND);
|
|
if (fd >= 0) {
|
|
write(fd, "+APP", 4);
|
|
close(fd);
|
|
}
|
|
fd = open("TMP1.TXT", O_RDONLY);
|
|
n = read(fd, buf, sizeof(buf) - 1);
|
|
if (n < 0) n = 0;
|
|
buf[n] = 0;
|
|
close(fd);
|
|
printf("contents after append: \"%s\" (expect \"XYZ+APP\")\n", buf);
|
|
|
|
/* 4. O_CREAT alone (no EXCL/TRUNC): existing file opens, new file is
|
|
* created. We open TMP1 (must succeed without truncating) then
|
|
* TMP2 (must be created fresh). */
|
|
fd = open("TMP1.TXT", O_RDONLY | O_CREAT);
|
|
n = read(fd, buf, sizeof(buf) - 1);
|
|
if (n < 0) n = 0;
|
|
buf[n] = 0;
|
|
close(fd);
|
|
printf("O_CREAT on existing TMP1: \"%s\" (expect \"XYZ+APP\")\n", buf);
|
|
|
|
unlink("TMP2.TXT");
|
|
fd = open("TMP2.TXT", O_WRONLY | O_CREAT);
|
|
printf("O_CREAT on missing TMP2: fd=%d\n", fd);
|
|
if (fd >= 0) {
|
|
write(fd, "fresh", 5);
|
|
close(fd);
|
|
}
|
|
|
|
/* cleanup */
|
|
unlink("TMP1.TXT");
|
|
unlink("TMP2.TXT");
|
|
|
|
/* --- env API -------------------------------------------------- */
|
|
puts("");
|
|
puts("env API:");
|
|
|
|
errno = 0;
|
|
char *v = getenv("PATH");
|
|
printf(" getenv(\"PATH\") = %p", v);
|
|
if (v) {
|
|
printf(" -> \"%s\"", v);
|
|
} else {
|
|
printf(" (NULL, errno=%d)", errno);
|
|
}
|
|
putchar('\n');
|
|
|
|
errno = 0;
|
|
int rc = putenv("SPRINTER_HELLO=world");
|
|
printf(" putenv(\"SPRINTER_HELLO=world\"): rc=%d\n", rc);
|
|
if (rc != 0) show_errno(" after putenv");
|
|
|
|
errno = 0;
|
|
v = getenv("SPRINTER_HELLO");
|
|
printf(" getenv(\"SPRINTER_HELLO\") = %p", v);
|
|
if (v) {
|
|
printf(" -> \"%s\"", v);
|
|
} else {
|
|
printf(" (NULL, errno=%d)", errno);
|
|
}
|
|
putchar('\n');
|
|
|
|
/* --- sysenv: dump the whole environment block ----------------- */
|
|
puts("");
|
|
puts("sysenv:");
|
|
{
|
|
static char envbuf[512];
|
|
errno = 0;
|
|
char *r = sysenv(envbuf);
|
|
if (r == (char *)-1) {
|
|
show_errno(" sysenv failed");
|
|
} else {
|
|
printf(" sysenv(%p) returned %p\n", envbuf, r);
|
|
int n = 0;
|
|
for (char *p = r; *p; p += strlen(p) + 1) {
|
|
printf(" [%d] %s\n", n++, p);
|
|
}
|
|
printf(" total: %d variable(s)\n", n);
|
|
}
|
|
}
|
|
|
|
puts("");
|
|
puts("Press any key to exit.");
|
|
(void)getchar();
|
|
return 0;
|
|
}
|