haxala1r/ai-forth-experiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: qdup/tuck/2swap bugs, getline, and cached word pointers

Browse Source 
Co-authored-by: aider (openrouter/moonshotai/kimi-k2.6) <aider@aider.chat>
This commit is contained in:
Emin Arslan
2026-05-03 21:39:52 +03:00
parent bf3c15ec27
commit b115744991
7 changed files with 106 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
forth_words.c
+57 -64
View File
@@ -60,10 +60,11 @@ void do_nip(Word* w) {
void do_tuck(Word* w) {
(void)w;
if (data_sp < 1) return;
int64_t a = data_stack[data_sp-1];
int64_t b = data_stack[data_sp];
data_push(a);
data_stack[data_sp-2] = b;
int64_t x1 = data_stack[data_sp-1];
int64_t x2 = data_stack[data_sp];
data_stack[data_sp-1] = x2;
data_stack[data_sp] = x1;
data_push(x2);
}
// Arithmetic
@@ -97,7 +98,7 @@ void do_div(Word* w) {
int64_t b = data_pop();
int64_t a = data_pop();
if (b == 0) {
printf("Division by zero\n");
fprintf(stderr, "Division by zero\n");
data_push(a);
data_push(b);
return;
@@ -111,7 +112,7 @@ void do_mod(Word* w) {
int64_t b = data_pop();
int64_t a = data_pop();
if (b == 0) {
printf("Modulo by zero\n");
fprintf(stderr, "Modulo by zero\n");
data_push(a);
data_push(b);
return;
@@ -125,7 +126,7 @@ void do_slash_mod(Word* w) {
int64_t b = data_pop();
int64_t a = data_pop();
if (b == 0) {
printf("Modulo by zero\n");
fprintf(stderr, "Modulo by zero\n");
data_push(a);
data_push(b);
return;
@@ -335,30 +336,29 @@ void do_dot_quote(Word* w) {
(void)w;
if (state == 0) {
// Interpret mode: print immediately
if (input_ptr == NULL) { printf("Missing string\n"); return; }
if (input_ptr == NULL) { fprintf(stderr, "Missing string\n"); return; }
while (*input_ptr && isspace((unsigned char)*input_ptr)) input_ptr++;
if (*input_ptr != '"') { printf("Expected \" to start string\n"); return; }
if (*input_ptr != '"') { fprintf(stderr, "Expected \" to start string\n"); return; }
input_ptr++;
char* start = input_ptr;
while (*input_ptr && *input_ptr != '"') input_ptr++;
if (*input_ptr != '"') { printf("Unterminated string\n"); return; }
if (*input_ptr != '"') { fprintf(stderr, "Unterminated string\n"); return; }
while (start < input_ptr) putchar(*start++);
input_ptr++;
fflush(stdout);
} else {
// Compile mode: compile string for runtime
if (input_ptr == NULL) { printf("Missing string\n"); return; }
if (input_ptr == NULL) { fprintf(stderr, "Missing string\n"); return; }
while (*input_ptr && isspace((unsigned char)*input_ptr)) input_ptr++;
if (*input_ptr != '"') { printf("Expected \" to start string\n"); return; }
if (*input_ptr != '"') { fprintf(stderr, "Expected \" to start string\n"); return; }
input_ptr++;
char* start = input_ptr;
while (*input_ptr && *input_ptr != '"') input_ptr++;
if (*input_ptr != '"') { printf("Unterminated string\n"); return; }
if (*input_ptr != '"') { fprintf(stderr, "Unterminated string\n"); return; }
size_t len = input_ptr - start;
Word* inner_w = lookup_word_internal("do_dot_quote_inner");
if (!inner_w) { printf("Fatal: do_dot_quote_inner not found\n"); return; }
if (!w_dot_quote_inner) { fprintf(stderr, "Fatal: do_dot_quote_inner not found\n"); return; }
ensure_compile_cap(2 + (int32_t)len);
compile_buf[compile_idx++] = (Cell){.word = inner_w};
compile_buf[compile_idx++] = (Cell){.word = w_dot_quote_inner};
compile_buf[compile_idx++] = (Cell){.num = (int64_t)len};
for (size_t i = 0; i < len; i++) {
compile_buf[compile_idx++] = (Cell){.num = (int64_t)start[i]};
@@ -394,7 +394,7 @@ void do_fetch(Word* w) {
(void)w;
int64_t addr = data_pop();
if (addr < 0 || addr >= user_mem_size) {
printf("Address out of bounds\n");
fprintf(stderr, "Address out of bounds\n");
return;
}
data_push(user_mem[addr].num);
@@ -405,7 +405,7 @@ void do_store(Word* w) {
int64_t addr = data_pop();
int64_t val = data_pop();
if (addr < 0 || addr >= user_mem_size) {
printf("Address out of bounds\n");
fprintf(stderr, "Address out of bounds\n");
return;
}
user_mem[addr].num = val;
@@ -416,7 +416,7 @@ void do_plus_store(Word* w) {
int64_t addr = data_pop();
int64_t val = data_pop();
if (addr < 0 || addr >= user_mem_size) {
printf("Address out of bounds\n");
fprintf(stderr, "Address out of bounds\n");
return;
}
user_mem[addr].num += val;
@@ -427,7 +427,7 @@ void do_cfetch(Word* w) {
int64_t addr = data_pop(); // byte offset
int64_t max_byte = user_mem_size * (int64_t)sizeof(Cell);
if (addr < 0 || addr >= max_byte) {
printf("Address out of bounds\n");
fprintf(stderr, "Address out of bounds\n");
return;
}
uint8_t* base = (uint8_t*)user_mem;
@@ -440,7 +440,7 @@ void do_cstore(Word* w) {
int64_t val = data_pop();
int64_t max_byte = user_mem_size * (int64_t)sizeof(Cell);
if (addr < 0 || addr >= max_byte) {
printf("Address out of bounds\n");
fprintf(stderr, "Address out of bounds\n");
return;
}
uint8_t* base = (uint8_t*)user_mem;
@@ -457,7 +457,7 @@ void do_allot(Word* w) {
(void)w;
int64_t n = data_pop();
if (here + n > user_mem + user_mem_size) {
printf("User memory overflow\n");
fprintf(stderr, "User memory overflow\n");
return;
}
here += n;
@@ -467,11 +467,11 @@ void do_allot(Word* w) {
void do_variable(Word* w) {
(void)w;
char* name = next_token();
if (!name) { printf("VARIABLE expects a name\n"); return; }
if (!name) { fprintf(stderr, "VARIABLE expects a name\n"); return; }
// allocate one cell in user memory for the variable's data
if (here + 1 > user_mem + user_mem_size) {
printf("User memory overflow\n");
fprintf(stderr, "User memory overflow\n");
return;
}
Cell* var_cell = here; // address of the data cell
@@ -497,11 +497,11 @@ void do_constant(Word* w) {
(void)w;
int64_t val = data_pop();
char* name = next_token();
if (!name) { printf("CONSTANT expects a name\n"); data_push(val); return; }
if (!name) { fprintf(stderr, "CONSTANT expects a name\n"); data_push(val); return; }
// allocate a cell in user memory to hold the constant value
if (here + 1 > user_mem + user_mem_size) {
printf("User memory overflow\n");
fprintf(stderr, "User memory overflow\n");
data_push(val); // restore the value (optional)
return;
}
@@ -547,7 +547,7 @@ void do_r_from(Word* w) {
void do_r_fetch(Word* w) {
(void)w;
if (rp < 0) { printf("Return stack underflow\n"); return; }
if (rp < 0) { fprintf(stderr, "Return stack underflow\n"); return; }
data_push(ret_stack[rp].num);
}
@@ -572,7 +572,7 @@ void do_lit(Word* w) {
void do_colon(Word* w) {
(void)w;
char* name = next_token();
if (!name) { printf("':' expects a name\n"); return; }
if (!name) { fprintf(stderr, "':' expects a name\n"); return; }
size_t len = strlen(name);
if (len > MAX_NAME_LEN) len = MAX_NAME_LEN;
memcpy(compiling_name, name, len);
@@ -584,12 +584,11 @@ void do_colon(Word* w) {
void do_semicolon(Word* w) {
(void)w;
if (state != 1) { printf("';' only valid in compile mode\n"); return; }
Word* exit_w = lookup_word("exit");
if (!exit_w) { printf("Fatal: exit word not found\n"); return; }
if (state != 1) { fprintf(stderr, "';' only valid in compile mode\n"); return; }
if (!w_exit) { fprintf(stderr, "Fatal: exit word not found\n"); return; }
ensure_compile_cap(1);
compile_buf[compile_idx++] = (Cell){.word = exit_w};
compile_buf[compile_idx++] = (Cell){.word = w_exit};
// Create body copy of compiled cells
Cell* body_copy = malloc(compile_idx * sizeof(Cell));
@@ -633,11 +632,10 @@ void do_zero_branch(Word* w) {
// Control flow using compile stack (indices)
void do_if(Word* w) {
(void)w;
if (state != 1) { printf("IF only valid in compile mode\n"); return; }
Word* zbranch = lookup_word_internal("0branch");
if (!zbranch) { printf("Fatal: 0branch not found\n"); return; }
if (state != 1) { fprintf(stderr, "IF only valid in compile mode\n"); return; }
if (!w_zbranch) { fprintf(stderr, "Fatal: 0branch not found\n"); return; }
ensure_compile_cap(2);
compile_buf[compile_idx++] = (Cell){.word = zbranch};
compile_buf[compile_idx++] = (Cell){.word = w_zbranch};
// compile_push current index (where the offset will be placed)
compile_push(compile_idx);
compile_idx++; // reserve offset cell
@@ -645,7 +643,7 @@ void do_if(Word* w) {
void do_then(Word* w) {
(void)w;
if (state != 1) { printf("THEN only valid in compile mode\n"); return; }
if (state != 1) { fprintf(stderr, "THEN only valid in compile mode\n"); return; }
int64_t offset_idx = compile_pop();
if (offset_idx < 0) return;
compile_buf[offset_idx].num = compile_idx - offset_idx;
@@ -653,52 +651,49 @@ void do_then(Word* w) {
void do_else(Word* w) {
(void)w;
if (state != 1) { printf("ELSE only valid in compile mode\n"); return; }
if (state != 1) { fprintf(stderr, "ELSE only valid in compile mode\n"); return; }
int64_t if_offset_idx = compile_pop();
if (if_offset_idx < 0) return;
Word* branch_w = lookup_word_internal("branch");
if (!branch_w) { printf("Fatal: branch not found\n"); return; }
if (!w_branch) { fprintf(stderr, "Fatal: branch not found\n"); return; }
ensure_compile_cap(2);
// resolve IF offset to skip the ELSE branch
compile_buf[if_offset_idx].num = (compile_idx + 2) - if_offset_idx;
// compile unconditional branch for ELSE part
compile_buf[compile_idx++] = (Cell){.word = branch_w};
compile_buf[compile_idx++] = (Cell){.word = w_branch};
compile_push(compile_idx);
compile_idx++; // reserve offset cell
}
void do_begin(Word* w) {
(void)w;
if (state != 1) { printf("BEGIN only valid in compile mode\n"); return; }
if (state != 1) { fprintf(stderr, "BEGIN only valid in compile mode\n"); return; }
compile_push(compile_idx);
}
void do_until(Word* w) {
(void)w;
if (state != 1) { printf("UNTIL only valid in compile mode\n"); return; }
if (state != 1) { fprintf(stderr, "UNTIL only valid in compile mode\n"); return; }
int64_t begin_idx = compile_pop();
if (begin_idx < 0) return;
Word* zbranch = lookup_word_internal("0branch");
if (!zbranch) { printf("Fatal: 0branch not found\n"); return; }
if (!w_zbranch) { fprintf(stderr, "Fatal: 0branch not found\n"); return; }
ensure_compile_cap(2);
compile_buf[compile_idx++] = (Cell){.word = zbranch};
compile_buf[compile_idx++] = (Cell){.word = w_zbranch};
compile_buf[compile_idx++] = (Cell){.num = begin_idx - compile_idx};
}
void do_while(Word* w) {
(void)w;
if (state != 1) { printf("WHILE only valid in compile mode\n"); return; }
if (state != 1) { fprintf(stderr, "WHILE only valid in compile mode\n"); return; }
int64_t begin_idx = compile_pop();
if (begin_idx < 0) return;
Word* zbranch = lookup_word_internal("0branch");
if (!zbranch) { printf("Fatal: 0branch not found\n"); return; }
if (!w_zbranch) { fprintf(stderr, "Fatal: 0branch not found\n"); return; }
ensure_compile_cap(2);
compile_buf[compile_idx++] = (Cell){.word = zbranch};
compile_buf[compile_idx++] = (Cell){.word = w_zbranch};
int64_t while_offset_idx = compile_idx;
compile_idx++; // reserve offset
@@ -708,16 +703,15 @@ void do_while(Word* w) {
void do_repeat(Word* w) {
(void)w;
if (state != 1) { printf("REPEAT only valid in compile mode\n"); return; }
if (state != 1) { fprintf(stderr, "REPEAT only valid in compile mode\n"); return; }
int64_t begin_idx = compile_pop();
if (begin_idx < 0) return;
int64_t while_offset_idx = compile_pop();
if (while_offset_idx < 0) return;
Word* branch_w = lookup_word_internal("branch");
if (!branch_w) { printf("Fatal: branch not found\n"); return; }
if (!w_branch) { fprintf(stderr, "Fatal: branch not found\n"); return; }
ensure_compile_cap(2);
compile_buf[compile_idx++] = (Cell){.word = branch_w};
compile_buf[compile_idx++] = (Cell){.word = w_branch};
compile_buf[compile_idx++] = (Cell){.num = begin_idx - compile_idx};
compile_buf[while_offset_idx].num = compile_idx - while_offset_idx;
@@ -755,10 +749,9 @@ void do_roll(Word* w) {
void do_qdup(Word* w) {
(void)w;
if (data_sp < 0) return;
int64_t v = data_pop();
int64_t v = data_stack[data_sp];
if (v != 0) {
data_push(v);
data_push(v);
}
}
@@ -780,12 +773,12 @@ void do_2drop(Word* w) {
void do_2swap(Word* w) {
(void)w;
if (data_sp < 3) return;
int64_t d = data_pop(); // x4
int64_t c = data_pop(); // x3
int64_t b = data_pop(); // x2
int64_t a = data_pop(); // x1
data_push(b);
data_push(a);
data_push(d);
data_push(c);
int64_t x4 = data_pop();
int64_t x3 = data_pop();
int64_t x2 = data_pop();
int64_t x1 = data_pop();
data_push(x3);
data_push(x4);
data_push(x1);
data_push(x2);
}