standardized call-out blocks

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index f5d6269191cdce57edef6f335b440c0fce4c75f9..1928fbb80fdb038b125c037b10daccb46d99f357 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.
@@ -204,6 +206,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
@@ -275,7 +279,7 @@ p_quit_ERROR:
        dq p_tell
        ENDFORTH
        mov rbp,RS_TOP          ; reset the return stack
-       jmp main
+       jmp p_quit_INITIALIZED
 
 ;;; ========================================