ref: 293e43cec9cf60a8250cd45ca725753722015df2
parent: 28666dfbc05cfec48d53fbe9b08553925ea984bb
author: 9ferno <gophone2015@gmail.com>
date: Wed Feb 16 06:48:04 EST 2022
renamed Dp to Here and Vp to There
--- a/os/pc64/primitives-nasm.s
+++ b/os/pc64/primitives-nasm.s
@@ -73,9 +73,9 @@
; cannot use H as it is nil in inferno, address where here (next available dictionary cell location) is stored
; here = Dp @
; these memory locations (HERE, DTOP, etc.) are populated with values by the forth initializer
-MVDENTRY "Dp" Dp 2 HERE ; here
-MVDENTRY "Dtop" Dtop 4 DTOP ; last defined header
-MVDENTRY "Vp" Vp 2 THERE ; here of the variables space
+MVDENTRY "Here" Here 4 HERE ; here
+MVDENTRY "Dtop" Dtop 4 DTOP ; last defined header link address
+MVDENTRY "There" There 5 THERE ; here of the variables space
MVDENTRY "Pid" Pid 3 FTHPID
MVDENTRY "Parentpid" Parentpid 4 FTHPARENTPID
; the below memory locations are left alone as zeros by the initializer
--- a/os/pc64/words-nasm.s
+++ b/os/pc64/words-nasm.s
@@ -462,12 +462,12 @@
dd M_exitcolon
CENTRY "here" C_here 4
-dd MV_Dp ; the address on the top of stack is 0x583288, which is correct
+dd MV_Here ; the address on the top of stack is 0x583288, which is correct
dd M_fetch
dd M_exitcolon
CENTRY "there" C_there 5 ; variable here
-dd MV_Vp
+dd MV_There
dd M_fetch
dd M_exitcolon
@@ -476,7 +476,7 @@
dd M_store
dd M_literal
dd 8
-dd MV_Dp
+dd MV_Here
dd C_plusstore
dd M_exitcolon
@@ -485,17 +485,17 @@
dd M_cstore
dd M_literal
dd 1
-dd MV_Dp
+dd MV_Here
dd C_plusstore
dd M_exitcolon
CENTRY "allot" C_allot 5 ; ( n -- ) here = here+n
-dd MV_Dp
+dd MV_Here
dd C_plusstore
dd M_exitcolon
CENTRY "vallot" C_vallot 6 ; allot on the variable space ( n -- ) there = there+n
-dd MV_Vp
+dd MV_There
dd C_plusstore
dd M_exitcolon
@@ -508,11 +508,11 @@
CENTRY "align" C_align 5 ; ( -- ) align here to a cell boundary
dd C_here ; Dp @
dd C_aligned ; here is aligned to a multiple of 8
-dd MV_Dp ; store the aligned here at Dp
+dd MV_Here ; store the aligned here at Dp
dd M_store ; Dp contains aligned_here
dd M_exitcolon
CENTRY "unused" C_unused 6
-dd MV_Dp
+dd MV_Here
dd M_fetch
dd C_here
dd M_minus