seems waitid takes 4 arguments

[rrq/rrqforth.git] / machine.asm

diff --git a/machine.asm b/machine.asm
index 90310145359539274faf91e6aece21e0fffb4e00..082934cfa75897dab0cb1a82994d391fde60862b 100644 (file)
--- a/machine.asm
+++ b/machine.asm
@@ -73,6 +73,7 @@ macro popr x {
 ;;; referring to the doer field of the called word.
 
 macro next {
+       call p_calltrace_DFA
        lodsq                   ; mov rax, [rsi] + add rsi,8
        jmp qword [rax]         ; goto code of that FORTH word (64 bit jump)
 }
@@ -97,16 +98,15 @@ macro ENDFORTH {
 ;;; ========================================
 ;;; The DOFORTH lays out a single FORTH call
 
-macro DOFORTH label {
+macro DOFORTH [label] {
+common
        FORTH
+forward
        dq label
+common
        ENDFORTH
 }
 
-       previous_word = 0       ; Used for chaining the words
-
-       IMMEDIATE = 1           ; optional flag (symbol)
-
 ;;; ========================================
 ;;; Macro WORD starts a FORTH word definition in this code.
 ;;; The layout of a word is as follows:
@@ -122,6 +122,8 @@ macro DOFORTH label {
 ;;; CFA: [8 bytes] pointer to the word's "doer" code
 ;;; DFA: [? bytes] the word's data field
 
+IMMEDIATE = 1          ; optional flag (symbol)
+
 macro WORD label, name, doer, flags, previous, offset {
        local pname
        ;; align 8
@@ -196,11 +198,12 @@ macro dfa2tfa reg {
        sub reg,24
        mov reg,qword [reg]
 }
-macro pushpname rg {   ; ( reg -- chars* length )
-       add rg,8
-       push rg
-       sub rg,8
-       push qword [rg]
+;;; Code snippet to push a pname string with address and 64-bit length field.
+;;; The register is advanced to point at the text part.
+macro pushpname reg {
+       add reg,8
+       push reg
+       push qword [reg-8]
 }
 ;;; ========================================
 ;;; The BLOCK macro lays out the length for a subsequent block to the
@@ -222,6 +225,7 @@ datastart:
 forward
        db data
 common
+       db 0
 dataend:
        }
 
@@ -230,8 +234,22 @@ dataend:
 macro BRANCH zero,label {
        if zero in <0>
            dq p_zero_branch
+       else if zero in <1>
+           dq p_true_branch
        else
-           dq p_zero_branch
+           dq p_branch
        end if
        dq label - $ - 8
 }
+
+;;; ========================================
+;;; The STREAM macro starts an in-core FORTH STREAM area. See WORD
+;;; STREAM for details.
+       macro STREAM endlabel {
+       local datastart
+       dq $+32
+       dq -1
+       dq endlabel - datastart
+       dq 0
+datastart:
+       }