Fixups for new word layout, and restructure for using wordlists.

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index 0f7e8fbf3f9c944834555d5abdbffbfc1587eab1..ba41cbe39021df277ccc6e3343ece77f2cb8e188 100644 (file)
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -8,6 +8,42 @@ include 'machine.asm'
 
        segment readable writable executable
 
+;;; This is the very first word
+       
+       ;; FORTH is the last word of WORDLIST FORTH
+       WORD p_forth,'FORTH',dovalue
+       ;; ( -- )
+       ;; Change to use this wordlist
+       dq last_forth_word
+       dq inline_code
+       mov rax,qword [p_forth_DFA]
+       mov qword [p_wordlist],rax
+       popr rsi
+       next
+
+       WORD p_syscall,'SYSCALL',dodoes,,,8
+       ;; ( -- )
+       ;; Change to use this wordlist
+       dq last_syscall_word
+       dq inline_code
+       mov rax,qword [p_syscall_DFA]
+       mov qword [p_wordlist],rax
+       popr rsi
+       next
+
+last_wordlists_word:
+       WORD p_wordlists,'WORDLISTS',dodoes,,,8
+       ;; ( -- )
+       ;; Change to use this wordlist
+       dq p_wordlists_TFA
+       dq inline_code
+       mov rax,qword [p_wordlists_DFA]
+       mov qword [p_wordlist],rax
+       popr rsi
+       next
+       
+include 'wordlists.asm'
+
        WORD return_stack,'RS',dovariable
        ;; The return stack
        rb 1048576              ; 1 Mb return stack
@@ -34,6 +70,14 @@ exit:
        popr rsi
        next
 
+       ;; TERMINATE0 terminates the program with code 0
+       ;; ( -- )
+       WORD terminate, 'TERMINATE0',fasm
+       pop rdx
+terminate_special:
+       mov eax,60
+       syscall
+
 ;;; Execution semantics for FORTH defition word
 ;;; At entry, rsi points into the calling definition, at the cell
 ;;; following the cell indicating this word, rax points to the CFA of
@@ -67,16 +111,10 @@ dovalue:
        ;; Execution semantics for a string constant ( -- addr n )
        ;; rax points to CFA field
 dostring:
-       add rax,8
-       xor rbx,rbx
-       mov bl,[rax]
-       inc rax
-       push rax
-       push rbx
+       cfa2dfa rax
+       pushpname rax
        next
 
-include 'wordlists.asm'
-include 'syscalls.asm'
 include 'memory.asm'
 include 'stack.asm'
 include 'math.asm'
@@ -88,7 +126,10 @@ include 'stdio.asm'
        WORD p_stdin,'STDIN',dovalue
        ;; Initialised to hold a STREAM for fd 0
        dq 0
-       
+
+;;; The main entry point.
+;;; This word is also the last word before syscalls
+last_forth_word:
        WORD p_quit,'QUIT',fasm
        ;; QUIT is the program entry point ********************
 main:
@@ -111,19 +152,11 @@ main:
        push 0
        DOFORTH sys_exit
 
-       ;; TERMINATE0 terminates the program with code 0
-       ;; ( v -- )
-       WORD terminate, 'TERMINATE',fasm
-       pop rdx
-terminate_special:
-       mov eax,60
-       syscall
+       previous_word = last_wordlists_word
 
-last_word:
-       ;; FORTH is the last word of VOCABULARY FORTH
-       WORD forth,'FORTH',dovalue
-       dq forth_TFA
-       dq 0
+include 'syscalls.asm'
 
        
+last_word:
+       
 heap_start: