X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=machine.asm;h=8da016a7854214740c82e0957facbba3b3636520;hb=bf8a7c713298730826f02c4ece9f4735fcee2e4b;hp=058da153addeb09e5dc0d8248e5059eaa2badf9b;hpb=365af483341a063a1bfba09dcaa03bf2373ad4a8;p=rrq%2Frrqforth.git

diff --git a/machine.asm b/machine.asm
index 058da15..8da016a 100644
--- a/machine.asm
+++ b/machine.asm
@@ -103,30 +103,51 @@ macro DOFORTH label {
 	ENDFORTH
 }
 
-;;; ========================================
-;;; Macro WORD starts a FORTH word definition in this code
-;;; 
 	previous_word = 0	; Used for chaining the words
 
 	IMMEDIATE = 1		; optional flag (symbol)
 
-macro WORD label, name, doer, flags {
+;;; ========================================
+;;; Macro WORD starts a FORTH word definition in this code.
+;;; The layout of a word is as follows:
+;;; TFA: [8 bytes] pointer to previous word in the word list
+;;;      [8 bytes] pointer to the word's CFA
+;;;      [8 bytes] a flags field
+;;;      [8 bytes] the length of the word's pname
+;;;      [varying] the word's pname
+;;;      [1 byte]  NUL -- making an asciiz of the pname
+;;;      ;;[? bytes] 0-7 bytes for address alignment to [disabled]
+;;;      [8 bytes] pointer to the word's TFA
+;;; OFF: [8 bytes] the DOES offset for the word
+;;; CFA: [8 bytes] pointer to the word's "doer" code
+;;; DFA: [? bytes] the word's data field
+
+macro WORD label, name, doer, flags, previous, offset {
+	local pname
 	;; align 8
 label#_TFA:
 	;; TFA
-	dq previous_word
+	if previous eq
+	    dq previous_word
+	else
+	    dq previous
+	end if
 	previous_word = label#_TFA
 	;; PFA
+label#_pCFA:
+	dq label#_CFA		; link to CFA of word
+	dq flags + 0
 label#_PFA:
-	db flags + 0
-	db label - $ - 2
+	dq pname - $ - 8
 	db name
-	db 0
+pname:  db 0			; extra NUL byte
 	;; align 8
-
+label#_pTFA:
+	dq label#_TFA		; link to TFA of word
 label#_OFF:
-	dq 0			; The DOES offset. Defaults to 0.
+	dq offset + 0		; The DOES offset. Defaults to 0.
 	;; also CFA = pointer to "doer"
+label#_CFA:
 label:
 	if doer eq
 	    dq doforth
@@ -141,8 +162,41 @@ label:
 label#_DFA:
 }
 
+macro tfa2cfa reg {
+	mov reg,qword [reg+8]
+}
+macro tfa2dfa reg {
+	tfa2cfa reg
+	add reg,8
+}
+macro tfa2pfa reg {
+	add reg,24
+}
+macro tfa2pname reg {
+	add reg,32
+}
+macro cfa2tfa reg {
+	sub reg,16
+	mov reg,qword [reg]
+}
+macro cfa2dfa reg {
+	add reg,8
+}
+macro dfa2cfa reg {
+	sub reg,8
+}
+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]
+}
 ;;; ========================================
-;;; The block macro lays out the length for a subsequent block to the
+;;; The BLOCK macro lays out the length for a subsequent block to the
 ;;; given label.
 macro BLOCK endlabel {
 	local datastart
@@ -150,3 +204,17 @@ macro BLOCK endlabel {
 datastart:
 	}
 
+;;; ========================================
+;;; The STRING macro lays out length cell and data for several string
+;;; components.
+macro STRING [data] {
+common
+	local datastart, dataend
+	dq dataend - datastart
+datastart:
+forward
+	db data
+common
+dataend:
+	}
+