From ef01724c21c28037815a661a81cd8044f11c3944 Mon Sep 17 00:00:00 2001
From: kitty <nepeta@canaglie.net>
Date: Mon, 9 Feb 2026 02:15:37 +1100
Subject: immediate interpreter, :, untested

---
 jefs.s | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 4 deletions(-)

(limited to 'jefs.s')

diff --git a/jefs.s b/jefs.s
index 8af3ab7..78ee14b 100644
--- a/jefs.s
+++ b/jefs.s
@@ -22,7 +22,6 @@
 	ffa_%2:	db %3 ; FFA
 	nfa_%2:	dw slen ; NFA
 		db %1
-		db 0
 %endmacro
 
 %macro defword 3
@@ -162,7 +161,6 @@ defword "parse", parse, 0
 	pspush r11 ; u
 	ret
 
-; probably fucked up and broken. have not tested any of this yet
 defword "find", find, 0
 	pspop r10 ; u
 	pspop r11 ; c-addr
@@ -210,23 +208,46 @@ defword "interpret", interpret, 0
 	call parse
 	call find
 	pspop r11 ; assume it exists its fine for now
-	call to_cfa
 	mov r12, qword [state]
 	cmp r12, compiling
 	je .compile
 
 .interp:
+	call to_cfa
 	pspop r11
 	call r11
 	jmp .loop
 	ret ; unreachable safety RET
 
 .compile:
+	; handle immediates
+	call dup
+	call immediate_q
+	pspop r13
+	cmp r13, true
+	je .interp
+
+	call to_cfa
 	pspop r11
 	call compile_comma
 	jmp .loop
 	ret ; unreachable safety RET
 
+defword "immediate?", immediate_q, 0 ; ( lfa -- flag )
+	pspop r11
+	add r11, 8
+	mov r12b, byte [r11]
+	test r12b, immediate_mask
+	jnz .imm
+
+	mov r11, false
+	pspush r11
+	ret
+
+.imm:
+	mov r11, true
+	pspush r11
+	ret
 
 defword ">cfa", to_cfa, 0
 	pspop r11
@@ -235,7 +256,6 @@ defword ">cfa", to_cfa, 0
 	mov r12w, word [r11]
 	add r11, 2
 	add r11, r12
-	inc r11
 	pspush r11
 	ret
 
@@ -259,9 +279,42 @@ defword "compile,", compile_comma, 0
 	ret
 
 defword ":", colon, 0
+	call parse
+	pspop r9 ; u
+	pspop r10 ; c-addr
+	mov r11, [latest]
+	mov r12, [here]
+	push r12 ; keep for LATEST
+
+	mov qword [r12], r11
+	add r12, 8
+	mov byte [r12], smudge_mask
+	inc r12
+	mov word [r12], r9w ; r9w from r9: safe?
+	add r12, 2
+
+	; strcpy
+	mov rcx, r9
+	mov rsi, r10
+	mov rdi, r12
+	rep movsb
+	add r12, r9
+
+	mov qword [here], r12
+	pop r12
+	mov qword [latest], r12
 	ret
 
 defword ";", semicolon, immediate_mask
+	; unsmudge
+	mov r12, [latest]
+	add r12, 8
+	mov r13b, [r12]
+	mov r15b, smudge_mask ; todo figure out how to do this at assemble time
+	not r15b
+	and r13b, r15b
+	mov byte [r12], r13b
+
 	mov r11, [here]
 	mov byte [r11], 0xc3
 	inc r11
@@ -269,6 +322,11 @@ defword ";", semicolon, immediate_mask
 	mov qword [state], interpreting
 	ret
 
+defword "dup", dup, 0
+	mov r11, [r14]
+	pspush r11
+	ret
+
 defvar ">in", to_in, 0, 0
 defvar "state", state, 0, interpreting
 defvar "here", here, 0, 0
-- 
cgit v1.2.3