added primities

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index 41bab41b9571eed0fd0a2fdda022e8d234b1c2fd..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
@@ -26,6 +62,22 @@ DS_TOP:                              ; The initial rsp
        ;; exit to the calling definition via "jmp exit".
        jmp qword rsi
 
+       WORD p_exit, 'EXIT',fasm
+       ;; ( -- ) ( R: addr -- )
+       ;; Returns execution to the calling definition as per the
+       ;; return stack.
+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
@@ -35,52 +87,49 @@ doforth:
        lea rsi, [rax+8]        ; rsi = the DFA of the rax word
        next
 
-       WORD p_exit, 'EXIT',fasm
-       ;; ( -- ) ( R: addr -- )
-       ;; Returns execution to the calling definition as per the
-       ;; return stack.
-exit:
-       popr rsi
+;;; Execution semantics for DOES>
+;;; The cell at [cfa-8] holds an adjustment offset.
+dodoes:
+       pushr rsi
+       lea rsi, [rax+8]        ; rsi = the DFA of the rax word
+       add rsi,[rax-8]         ; adjust rsi to the DOES> part
        next
 
        ;; Execution semantics for a variable ( -- addr )
-       ;; rax points to doer field
+       ;; rax points to CFA field
 dovariable:
-       push rax+16
+       add rax,8
+       push rax
        next
 
        ;; Execution semantics for a constant ( -- v )
-       ;; rax points to doer field
+       ;; rax points to CFA field
 dovalue:
-       push qword [rax+16]
+       push qword [rax+8]
        next
 
        ;; Execution semantics for a string constant ( -- addr n )
-       ;; rax points to doer field
+       ;; rax points to CFA field
 dostring:
-       add rax,16
-       mov bl,[rax]
-       mov byte [rsp],bl
-       push rax+1
+       cfa2dfa rax
+       pushpname rax
        next
 
-include 'wordlists.asm'
-include 'syscalls.asm'
 include 'memory.asm'
 include 'stack.asm'
 include 'math.asm'
 include 'stdio.asm'
 
        WORD p_program_version,'PROGRAM_VERSION',dostring
-       db length
-program_version_string:        
-       db 'RRQ Forth version 0.1 - 2021-05-13',10
-       length = $ - program_version_string
+       STRING 'RRQ Forth version 0.1 - 2021-05-13',10
 
        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:
@@ -92,36 +141,22 @@ main:
        DOFORTH p_stream
        pop qword [p_stdin_DFA]
 
-       ;; read a word
-       push qword 1            ; ( fd ) =stdout
-       push qword [p_stdin_DFA]
-       FORTH
-       dq p_read_word          ; ( fd s n )
-       dq sys_write
-       ENDFORTH
-
+       ;; Initial blurb
        push qword 1                    ; stdout
-       push qword program_version_string ; address of string
-       push qword length               ; length of string (cheating)
+       DOFORTH p_program_version       ; version string => ( s n )
        DOFORTH sys_write               ; printout
        pop rax                         ; ignore errors
+
+       DOFORTH p_words
        
        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: