duskos

commit 1942a2380658130cbb1d59ccb9960fe79f79b98f
parent 7b2dc813c3077c7929e995c0b0fb3d8fcf712d37
Author: Virgil Dupras <hsoft@hardcoded.net>
Date:   Tue, 28 Jun 2022 14:49:16 -0400

Remove iin<

With "fload" being self-contained, the "iin<" mechanism isn't needed anymore.

Diffstat:
M
dusk.asm
 | 
9
+--------
M
fs/sys/rdln.fs
 | 
2
+-

2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/dusk.asm b/dusk.asm
@@ -67,7 +67,6 @@ current: resd 1
 here: resd 1
 compiling: resd 1
 curword: resb 0x20	; 1b len, then contents
-iinrd: resd 1		; iin<
 inrd: resd 1		; in<
 emit: resd 1
 main: resd 1
@@ -92,8 +91,7 @@ _start:
 	mov dword [here], herestart
 	mov dword [current], word_mainloop
 	mov dword [main], word_mainloop
-	mov dword [iinrd], word_bootrd
-	mov dword [inrd], word_iinrd
+	mov dword [inrd], word_bootrd
 	mov dword [emit], word__emit
 	mov eax, SYSCALL_CHDIR
 	mov ebx, rootfspath
@@ -114,7 +112,6 @@ defword 'main', 4, word_main
 defword 'quit', 4, word_quit
 	cld
 	mov dword [toptr], 0
-	mov dword [inrd], word_iinrd ; make sure input is interactive after a quit
 	mov esp, rs_top
 	jmp word_main
 
@@ -573,10 +570,6 @@ defword 'heremax', 7, word_heremax
 defword 'compiling', 9, word_compiling
 	sysval compiling
 
-; interactive in<
-defword 'iin<', 4, word_iinrd
-	sysalias iinrd
-
 ; where "word" feeds itself
 defword 'in<', 3, word_inrd
 	sysalias inrd
diff --git a/fs/sys/rdln.fs b/fs/sys/rdln.fs
@@ -19,6 +19,6 @@ in) value in>
   in> in) < if in> c@+ swap to in> else 0 then ;
 : rdln< ( -- c ) rdln<? ?dup not if
     rdln in( to in> SPC then ;
-: rdln$ ['] rdln< dup to iin< to in< in) to in> ;
+: rdln$ ['] rdln< to in< in) to in> ;
 : _ rdln$ mainloop ;
 ' _ to main