Changed to use "cyclic' temporary block allocation for strings

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index f7f310af30754fd9f506a5ee51c1dc6f7b069853..b06fed1062ced657472f3362bc9071ed14d897e1 100644 (file)
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -73,7 +73,7 @@ dostring:
        pushpname rax
        next
 
-       WORD p_calltrace,'calltrace',dovalue
+       WORD p_calltrace,'[calltrace]',dovalue
        ;; Common call point for debugging
        ;; rax = cfa of called word
        ;; rsi = cell* of next forth word
@@ -106,6 +106,8 @@ DS_TOP:                             ; The initial rsp
 
        ;segment readable executable
 
+include 'signals.asm'
+
 ;;; At fasm compilation: reset previous_word to make a new word list
 ;;; Words above belong to the SYSTEM wordlist, and the following
 ;;; belong to the FORTH wordlist.
@@ -159,6 +161,7 @@ include 'stack.asm'
 include 'math.asm'
 include 'logic.asm'
 include 'stdio.asm'
+include 'temp.asm'
 include 'compile.asm'
 
        WORD p_program_version,'PROGRAM_VERSION',dostring
@@ -179,7 +182,7 @@ include 'compile.asm'
        WORD p_lparen,'(',fasm,IMMEDIATE
        pushr rsi
 p_lparen_loop:
-       DOFORTH  p_stdin, p_read_word
+       DOFORTH  p_input, p_get, p_read_word
        pop rax
        pop rbx
        cmp rax,0 ; end of stream
@@ -204,6 +207,8 @@ main:
        ;; Initial rsp points to the arguments block of size (64 bits)
        ;; followed by the argument pointers.
        mov qword [p_args_DFA],rsp
+       mov rbp,RS_TOP
+       call p_setup_signals_DFA
        call main_is_verbose
        mov qword [p_verboseQ_DFA],rdx
        jmp p_quit_DFA          ; QUIT
@@ -212,13 +217,11 @@ main:
        ;; return boolean in rdx
        ;; implementation for that 2 byte asciiz string
 main_is_verbose_data:
-       dq main_is_verbose_data_end - $ ; length of data 
        db '-v',0
-main_is_verbose_data_end:
 
 main_is_verbose:
        mov rbx,qword [p_args_DFA] ; Pointer to main arguments
-       mov r8,qword [rbx]
+       mov r8,qword [rbx]         ; r8 = count of pointers
        xor rdx,rdx
        cld
 main_is_verbose_next:
@@ -227,13 +230,11 @@ main_is_verbose_next:
        add rbx,8
        mov rsi,qword [rbx]
        mov rdi,main_is_verbose_data
-       lodsq
-       mov rcx,rax
 main_is_verbose_loop:
        cmpsb
        jne main_is_verbose_next
-       dec rcx
-       jg main_is_verbose_loop
+       cmp byte[rsi-1],0
+       jne main_is_verbose_loop
        not rdx
 main_is_not_verbose:
        ret
@@ -242,7 +243,6 @@ main_is_not_verbose:
 last_forth_word:
        WORD p_quit,'QUIT',fasm
        ;; QUIT is the program entry point ********************
-
        mov rsp,DS_TOP
        mov rbp,RS_TOP
        cmp qword [p_stdin_DFA],0
@@ -254,7 +254,7 @@ last_forth_word:
        pop qword [p_stdin_DFA] ; Assign STDIN
 
 p_quit_INITIALIZED:
-       ;; Initial blurb
+       ;; Setup INPUT from STDIN
        FORTH
        dq p_verboseQ
        dq p_get
@@ -262,8 +262,7 @@ p_quit_INITIALIZED:
        dq p_program_version
        dq p_tell
 p_quit_EVAL:
-       dq p_stdin
-       dq p_evaluate_stream
+       dq p_stdin, p_evaluate_stream
        BRANCH 0,p_quit_ERROR
        dq p_false
        dq sys_exit
@@ -279,7 +278,7 @@ p_quit_ERROR:
        dq p_tell
        ENDFORTH
        mov rbp,RS_TOP          ; reset the return stack
-       jmp main
+       jmp p_quit_INITIALIZED
 
 ;;; ========================================