From fbd69edfc006b648db21ff38ade97237c5fad333 Mon Sep 17 00:00:00 2001 From: David Given Date: Tue, 14 Jul 2015 00:36:20 +0200 Subject: [PATCH] Major improvement; can read text from the console (in Forth!). Can't do anything with it yet, though. --- Applications/util/fforth.c | 227 +++++++++++++++++++++++++++++++------ 1 file changed, 192 insertions(+), 35 deletions(-) diff --git a/Applications/util/fforth.c b/Applications/util/fforth.c index 5b4d3a58..a3547a92 100644 --- a/Applications/util/fforth.c +++ b/Applications/util/fforth.c @@ -7,6 +7,9 @@ # most Unixy platforms. It's intended as a scripting language for the Fuzix # operating system. # +# It's probably a bit archaic --- I've been using the Forth 83 doc as a +# reference: http://forth.sourceforge.net/standard/fst83/fst83-16.htm +# # Note! This program looks weird. That's because it's a shell script *and* a C # file. (And an Awk script.) However, it's necessary in order to dynamically # generate the word list, which is just too fragile to do by hand. If you edit @@ -44,14 +47,14 @@ awk -f- $0 >$0.new < here_top) + + if (here > (here_top-ALLOCATION_MARGIN)) { uint8_t* newtop = sbrk(ALLOCATION_CHUNK_SIZE); if (newtop != here_top) @@ -168,7 +182,7 @@ static uint8_t* claim_workspace(size_t length) static cdefn_t* lookup_word(const char* name) { - cdefn_t* current = currentword; + cdefn_t* current = latest; while (current) { if (current->name @@ -190,6 +204,12 @@ static void sysvarword(cdefn_t* w) dpush((cell_t) w->payload); } +static void indvarword(cdefn_t* w) +{ + cell_t* p = (void*) dpop(); + dpush(*p); +} + static void varword(cdefn_t* w) { dpush((cell_t) &w->payload); @@ -197,58 +217,195 @@ static void varword(cdefn_t* w) /* Forward declarations of words go here --- do not edit.*/ //@EXPORT{ +static cdefn_t accept_word; +static cdefn_t add_word; static cdefn_t allot_word; +static cdefn_t at_word; +static cdefn_t base_word; +static cdefn_t branch_word; +static cdefn_t branchif_word; static cdefn_t bye_word; +static cdefn_t c_at_word; static cdefn_t c_comma_word; +static cdefn_t c_pling_word; +static cdefn_t cell_word; static cdefn_t cells_word; static cdefn_t comma_word; +static cdefn_t div_word; +static cdefn_t dot_quote_rword; +static cdefn_t emit_word; +static cdefn_t execute_word; static cdefn_t exit_word; +static cdefn_t fputc_word; +static cdefn_t fwrite_word; static cdefn_t here_word; +static cdefn_t in_a_word; +static cdefn_t latest_word; static cdefn_t lit_word; +static cdefn_t m_one_word; +static cdefn_t mul_word; +static cdefn_t one_word; +static cdefn_t pad_word; +static cdefn_t pling_word; +static cdefn_t pop_word; +static cdefn_t quit_word; static cdefn_t return_word; +static cdefn_t rsp0_word; +static cdefn_t rsp_at_word; +static cdefn_t rsp_pling_word; +static cdefn_t sp0_word; +static cdefn_t sp_at_word; +static cdefn_t sp_pling_word; +static cdefn_t stderr_word; +static cdefn_t stdin_word; +static cdefn_t stdout_word; +static cdefn_t sub_word; +static cdefn_t tib_h_word; static cdefn_t tib_word; +static cdefn_t type_word; +static cdefn_t zero_word; //@EXPORT} -static void allot_cb(cdefn_t* w) { claim_workspace(dpop()); } -static void c_comma_cb(cdefn_t* w) { *claim_workspace(1) = dpop(); } -static void cells_cb(cdefn_t* w) { dpush(dpop() * CELL); } -static void comma_cb(cdefn_t* w) { *(cell_t*)claim_workspace(CELL) = dpop(); } -static void exit_cb(cdefn_t* w) { exit(dpop()); } -static void here_cb(cdefn_t* w) { dpush((cell_t) here); } -static void lit_cb(cdefn_t* w) { dpush((cell_t) *pc++); } -static void return_cb(cdefn_t* w) { pc = (void*) rpop(); } -static void tib_cb(cdefn_t* w) { dpush((cell_t) tib); } - -static cdefn_t* bye_ops[] = { - &lit_word, - (void*) 0, - &exit_word +static void fwrite_cb(cdefn_t* w) +{ + FILE* fp = (FILE*)dpop(); + size_t n = dpop(); + void* ptr = (void*)dpop(); + dpush(fwrite(ptr, 1, n, fp)); +} + +static void accept_cb(cdefn_t* w) +{ + cell_t max = dpop(); + uint8_t* addr = (uint8_t*)dpop(); + + cell_t i = 0; + while (i < max) + { + int c = fgetc(stdin); + if ((c == -1) || (c == '\n')) + { + *addr = '\n'; + i++; + break; + } + *addr = c; + i++; + } + dpush(i); +} + +static void dot_quote_rcb(cdefn_t* w) +{ + uint8_t* ptr = (void*)pc; + size_t len = strlen((char*)ptr); + fwrite(ptr, 1, len, stdout); + pc = alignup(ptr+len+1); +} + +static void add_cb(cdefn_t* w) { dpush(dpop() + dpop()); } +static void allot_cb(cdefn_t* w) { claim_workspace(dpop()); } +static void at_cb(cdefn_t* w) { dpush(*(cell_t*)dpop()); } +static void c_at_cb(cdefn_t* w) { dpush(*(uint8_t*)dpop()); } +static void c_pling_cb(cdefn_t* w) { uint8_t* p = (uint8_t*)dpop(); *p = dpop(); } +static void div_cb(cdefn_t* w) { cell_t a = dpop(); cell_t b = dpop(); dpush(b / a); } +static void execute_cb(cdefn_t* w) { cdefn_t* p = (void*) dpop(); codeword(p); } +static void exit_cb(cdefn_t* w) { exit(dpop()); } +static void fputc_cb(cdefn_t* w) { FILE* fp = (FILE*)dpop(); fputc(dpop(), fp); } +static void here_cb(cdefn_t* w) { dpush((cell_t) here); } +static void lit_cb(cdefn_t* w) { dpush((cell_t) *pc++); } +static void mul_cb(cdefn_t* w) { dpush(dpop() * dpop()); } +static void pad_cb(cdefn_t* w) { dpush((cell_t) pad); } +static void pling_cb(cdefn_t* w) { cell_t* p = (cell_t*)dpop(); *p = dpop(); } +static void pop_cb(cdefn_t* w) { dpop(); } +static void return_cb(cdefn_t* w) { pc = (void*) rpop(); } +static void sub_cb(cdefn_t* w) { cell_t a = dpop(); cell_t b = dpop(); dpush(b - a); } +static void branchif_cb(cdefn_t* w) { void* iftrue = (void*) *pc++; if (dpop() == (cell_t)w->payload) pc = iftrue; } +static void branch_cb(cdefn_t* w) { pc = (void*) *pc; } +static void sp_pling_cb(cdefn_t* w) { dsp = (void*)dpop(); } +static void rsp_pling_cb(cdefn_t* w) { rsp = (void*)dpop(); } + +static cdefn_t* bye_ops[] = { &zero_word, &exit_word }; +static cdefn_t* c_comma_ops[] = { &here_word, &c_pling_word, &one_word, &allot_word, &exit_word }; +static cdefn_t* cells_ops[] = { &cell_word, &mul_word, &exit_word }; +static cdefn_t* comma_ops[] = { &here_word, &pling_word, &cell_word, &allot_word, &exit_word }; +static cdefn_t* emit_ops[] = { &stdout_word, &fputc_word, &exit_word }; +static cdefn_t* type_ops[] = { &stdout_word, &fwrite_word, &pop_word, &exit_word }; + +static cdefn_t* quit_ops[] = +{ + /* Reset stacks. */ + &sp0_word, &sp_pling_word, + &rsp0_word, &rsp_pling_word, + /* Read a line from the terminal. */ + &tib_word, &tib_h_word, &accept_word, + /* And go round again */ + &branch_word, (void*)quit_ops }; /* List of words go here. To add a word, add a new entry and run this file as - * a shell script. The link field will be set correctly. */ -static cdefn_t allot_word = { allot_cb, "allot", NULL, NULL, }; //@W -static cdefn_t bye_word = { codeword, "bye", &allot_word, bye_ops, }; //@W -static cdefn_t c_comma_word = { c_comma_cb, "c,", &bye_word, NULL, }; //@W -static cdefn_t cells_word = { cells_cb, "cells", &c_comma_word, NULL, }; //@W -static cdefn_t comma_word = { comma_cb, ",", &cells_word, NULL, }; //@W -static cdefn_t exit_word = { exit_cb, "_exit", &comma_word, NULL, }; //@W -static cdefn_t here_word = { here_cb, "here", &exit_word, NULL, }; //@W -static cdefn_t lit_word = { lit_cb, "", &here_word, NULL, }; //@W -static cdefn_t return_word = { return_cb, ";", &lit_word, NULL, }; //@W -static cdefn_t tib_word = { sysvarword, "tib", &return_word, &tib, }; //@W - -static cdefn_t* currentword = &tib_word; //@E + * a shell script. The link field will be set correctly. + * BEWARE: these lines are parsed using whitespace. LEAVE EXACTLY AS IS.*/ +static cdefn_t accept_word = { accept_cb, "accept", NULL, NULL }; //@W +static cdefn_t add_word = { add_cb, "+", &accept_word, NULL }; //@W +static cdefn_t allot_word = { allot_cb, "allot", &add_word, NULL, }; //@W +static cdefn_t at_word = { at_cb, "@", &allot_word, NULL }; //@W +static cdefn_t base_word = { sysvarword, "base", &at_word, &base }; //@W +static cdefn_t branch_word = { branch_cb, NULL, &base_word, (void*)0 }; //@W +static cdefn_t branchif_word = { branchif_cb, NULL, &branch_word, (void*)0 }; //@W +static cdefn_t bye_word = { codeword, "bye", &branchif_word, bye_ops, }; //@W +static cdefn_t c_at_word = { c_at_cb, "c@", &bye_word, NULL }; //@W +static cdefn_t c_comma_word = { codeword, "c,", &c_at_word, c_comma_ops, }; //@W +static cdefn_t c_pling_word = { c_pling_cb, "c!", &c_comma_word, NULL }; //@W +static cdefn_t cell_word = { sysvarword, "cell", &c_pling_word, (void*)CELL, }; //@W +static cdefn_t cells_word = { codeword, "cells", &cell_word, cells_ops, }; //@W +static cdefn_t comma_word = { codeword, ",", &cells_word, comma_ops, }; //@W +static cdefn_t div_word = { div_cb, "/", &comma_word, NULL }; //@W +static cdefn_t dot_quote_rword = { dot_quote_rcb, NULL, &div_word, NULL }; //@W +static cdefn_t emit_word = { codeword, "emit", &dot_quote_rword, emit_ops }; //@W +static cdefn_t execute_word = { execute_cb, "execute", &emit_word, NULL }; //@W +static cdefn_t exit_word = { exit_cb, "_exit", &execute_word, NULL }; //@W +static cdefn_t fputc_word = { fputc_cb, "_fwrite", &exit_word, NULL }; //@W +static cdefn_t fwrite_word = { fwrite_cb, "_fwrite", &fputc_word, NULL }; //@W +static cdefn_t here_word = { here_cb, "here", &fwrite_word, NULL, }; //@W +static cdefn_t in_a_word = { sysvarword, ">in", &here_word, &tibo }; //@W +static cdefn_t latest_word = { indvarword, "latest", &in_a_word, &latest, }; //@W +static cdefn_t lit_word = { lit_cb, NULL, &latest_word, NULL, }; //@W +static cdefn_t m_one_word = { sysvarword, "-1", &lit_word, (void*)-1, }; //@W +static cdefn_t mul_word = { mul_cb, "*", &m_one_word, NULL }; //@W +static cdefn_t one_word = { sysvarword, "1", &mul_word, (void*)1, }; //@W +static cdefn_t pad_word = { pad_cb, "pad", &one_word, NULL }; //@W +static cdefn_t pling_word = { pling_cb, "!", &pad_word, NULL }; //@W +static cdefn_t pop_word = { pop_cb, "pop", &pling_word, NULL }; //@W +static cdefn_t quit_word = { codeword, NULL, &pop_word, quit_ops }; //@W +static cdefn_t return_word = { return_cb, ";", &quit_word, NULL, }; //@W +static cdefn_t rsp0_word = { sysvarword, "rsp0", &return_word, rstack }; //@W +static cdefn_t rsp_at_word = { indvarword, "rsp@", &rsp0_word, &rsp }; //@W +static cdefn_t rsp_pling_word = { sp_pling_cb, "rsp!", &rsp_at_word, NULL }; //@W +static cdefn_t sp0_word = { sysvarword, "sp0", &rsp_pling_word, dstack }; //@W +static cdefn_t sp_at_word = { indvarword, "sp@", &sp0_word, &dsp }; //@W +static cdefn_t sp_pling_word = { sp_pling_cb, "sp!", &sp_at_word, NULL }; //@W +static cdefn_t stderr_word = { indvarword, "_stderr", &sp_pling_word, &stderr, }; //@W +static cdefn_t stdin_word = { indvarword, "_stdin", &stderr_word, &stdin, }; //@W +static cdefn_t stdout_word = { indvarword, "_stdout", &stdin_word, &stdout, }; //@W +static cdefn_t sub_word = { sub_cb, "-", &stdout_word, NULL }; //@W +static cdefn_t tib_h_word = { sysvarword, "tib#", &sub_word, &tib_h }; //@W +static cdefn_t tib_word = { sysvarword, "tib", &tib_h_word, tib }; //@W +static cdefn_t type_word = { codeword, "emit", &tib_word, type_ops }; //@W +static cdefn_t zero_word = { sysvarword, "0", &type_word, (void*)0, }; //@W + +static cdefn_t* latest = &zero_word; //@E int main(int argc, const char* argv[]) { here = here_top = sbrk(0); + claim_workspace(0); setjmp(onerror); dsp = dstack; rsp = rstack; - pc = (void*) bye_word.payload; + pc = (void*) quit_word.payload; for (;;) { const struct definition* w = (void*) *pc++; -- 2.34.1