From d7958ae7b474ef357864237fc40412139e43b117 Mon Sep 17 00:00:00 2001 From: Ralph Ronnquist Date: Sun, 6 Jun 2021 23:22:09 +1000 Subject: [PATCH] some new words --- adoc/p_definitions.adoc | 19 ++++++++++++ adoc/p_exit.adoc | 8 ++--- adoc/p_return.adoc | 13 ++++++++ adoc/p_use.adoc | 15 +++++++++ compile.asm | 20 ++++++------ reference.adoc | 6 ++++ reference.html | 67 +++++++++++++++++++++++++++++++++++----- rrqforth | Bin 2150703 -> 2151053 bytes rrqforth.asm | 7 ++++- stdio.asm | 10 +++--- temp.asm | 2 +- wordindex.adoc | 3 ++ wordlists.asm | 24 ++++++++++++++ 13 files changed, 165 insertions(+), 29 deletions(-) create mode 100644 adoc/p_definitions.adoc create mode 100644 adoc/p_return.adoc create mode 100644 adoc/p_use.adoc diff --git a/adoc/p_definitions.adoc b/adoc/p_definitions.adoc new file mode 100644 index 0000000..37f2180 --- /dev/null +++ b/adoc/p_definitions.adoc @@ -0,0 +1,19 @@ +// stack.asm: WORD p_definitions, 'DEFINITIONS',fasm + +anchor:p_definitions[] + +=== Word: DEFINITIONS + +.... +Data stack: ( wordlist -- ) +.... + +"DEFINITIONS" is a function word that installs the given wordlist as +the <> one. + +==== +.Definition concept for DEFINITIONS +**** +: DEFINITIONS CURRENT-WORDLIST ! ; +**** +==== diff --git a/adoc/p_exit.adoc b/adoc/p_exit.adoc index 1d9d78a..f0db678 100644 --- a/adoc/p_exit.adoc +++ b/adoc/p_exit.adoc @@ -5,10 +5,8 @@ anchor:p_exit[] === Word: EXIT .... -Data stack: ( -- ) +Data stack: ( v -- ) .... -"EXIT" is a function word that implements the ending of a FORTH -definition and its threading to the subsequent step of the calling -definition. - +"EXIT" is a function word that terminates the +rrqforth+ process +immediately with the given exit code. diff --git a/adoc/p_return.adoc b/adoc/p_return.adoc new file mode 100644 index 0000000..9fb33a2 --- /dev/null +++ b/adoc/p_return.adoc @@ -0,0 +1,13 @@ +// rrqforth.asm: WORD p_return, 'RETURN',fasm + +anchor:p_return[] + +=== Word: RETURN + +.... +Data stack: ( -- ) +.... + +"RETURN" is a function word that implements the ending of a FORTH +definition and make execution return to the next step in the calling +definition. diff --git a/adoc/p_use.adoc b/adoc/p_use.adoc new file mode 100644 index 0000000..4dc5168 --- /dev/null +++ b/adoc/p_use.adoc @@ -0,0 +1,15 @@ +// rrqforth.asm: WORD p_use,'USE',dovariable + +anchor:p_use[] + +=== Word: USE + +.... +Data value: ( wordlist -- ) Input stream: word +.... + +"USE" is a function word that looks up next word given the wordlist. +It reads next word on <> via <>, +then temporarily changes <> to +<> the word via the given wordlist, and returns the TFA +of that word, or just 0 if the word coudn't be found. diff --git a/compile.asm b/compile.asm index defb1ac..fc9d3f5 100644 --- a/compile.asm +++ b/compile.asm @@ -41,7 +41,7 @@ p_create_COPY: WORD p_allot,'ALLOT' ;; ( n -- ) ;; Allocate n bytes on the heap - dq p_here, p_put_plus, p_exit + dq p_here, p_put_plus, p_return WORD p_quote,"'" ;; ( "word" -- cfa ) @@ -50,22 +50,22 @@ p_create_COPY: BRANCH 0,p_quote_end dq p_tfa2cfa p_quote_end: - dq p_exit + dq p_return WORD p_bracketed_quote,"[']",doforth,IMMEDIATE ;; Compilation ( "word" -- cfa ) ;; Compile down " LIT value " - dq p_literal, p_literal, p_comma,p_quote, p_comma, p_exit + dq p_literal, p_literal, p_comma,p_quote, p_comma, p_return WORD p_comma,',' ;; ( v -- ) ;; Put cell value onto the heap and advance "HERE" - dq p_here, p_literal, 8, p_get_n_increment, p_put, p_exit + dq p_here, p_literal, 8, p_get_n_increment, p_put, p_return WORD p_Ccomma,'C,' ;; ( c -- ) ;; Put byte value onto the heap and advance "HERE" - dq p_here, p_Cput, p_literal, 1, p_here, p_put_plus, p_exit + dq p_here, p_Cput, p_literal, 1, p_here, p_put_plus, p_return WORD p_does,"DOES>",fasm,IMMEDIATE ;; ( -- ) @@ -286,7 +286,7 @@ p_evaluate_stream_END: dq p_literal, 1 p_evaluate_stream_BAD: dq p_Rgt, p_input, p_put ; restore previous stream - dq p_exit + dq p_return WORD p_colon,':' ;; ( -- ) @@ -299,12 +299,12 @@ p_evaluate_stream_BAD: dq p_tfa2cfa dq p_put dq p_right_bracket - dq p_exit + dq p_return WORD p_semicolon,';',,IMMEDIATE ;; ( -- ) - ;; Lay out p_exit, and set interpreting mode - dq p_literal, p_exit, p_comma, p_left_bracket, p_exit + ;; Lay out p_return, and set interpreting mode + dq p_literal, p_return, p_comma, p_left_bracket, p_return WORD p_immediate,'IMMEDIATE',fasm,IMMEDIATE ;; ( -- ) @@ -346,4 +346,4 @@ p_load_file_badfile: dq p_tell, p_dot, p_nl, p_emit dq p_literal,1 p_load_file_exit: - dq p_exit + dq p_return diff --git a/reference.adoc b/reference.adoc index 7720490..e9e369f 100644 --- a/reference.adoc +++ b/reference.adoc @@ -79,6 +79,8 @@ include::adoc/data_stack.adoc[] include::separator.adoc[] include::adoc/p_decimal.adoc[] include::separator.adoc[] +include::adoc/p_definitions.adoc[] +include::separator.adoc[] include::adoc/p_depth.adoc[] include::separator.adoc[] include::adoc/p_dfa2tfa.adoc[] @@ -229,6 +231,8 @@ include::adoc/p_read_word.adoc[] include::separator.adoc[] include::adoc/p_realloc.adoc[] include::separator.adoc[] +include::adoc/p_return.adoc[] +include::separator.adoc[] include::adoc/p_right_bracket.adoc[] include::separator.adoc[] include::adoc/p_roll.adoc[] @@ -289,6 +293,8 @@ include::adoc/p_unequal.adoc[] include::separator.adoc[] include::adoc/p_unstream.adoc[] include::separator.adoc[] +include::adoc/p_use.adoc[] +include::separator.adoc[] include::adoc/p_verboseQ.adoc[] include::separator.adoc[] include::adoc/p_within.adoc[] diff --git a/reference.html b/reference.html index a1de89c..988e551 100644 --- a/reference.html +++ b/reference.html @@ -806,6 +806,7 @@ asciidoc.install(); CREATE   CURRENT-WORDLIST  

DECIMAL   +DEFINITIONS   DEPTH   DIGITS   /MOD   @@ -858,6 +859,7 @@ asciidoc.install();

READ-STREAM-CHAR   READ-WORD   REALLOC   +RETURN   ROLL   ROT   RSP  

@@ -882,7 +884,8 @@ asciidoc.install(); THIS-WORD   TRUE   TUCK  

-

UNSTREAM  

+

UNSTREAM   +USE  

VERBOSE?  

WITHIN   WORDS  

@@ -1655,6 +1658,27 @@ _______________________________________________________
_______________________________________________________
+

+ +
+

Word: DEFINITIONS

+
+
+
Data stack: ( wordlist -- )
+
+

"DEFINITIONS" is a function word that installs the given wordlist as +the CURRENT-WORDLIST one.

+
+
+
+
+
Definition concept for DEFINITIONS
+

: DEFINITIONS CURRENT-WORDLIST ! ;

+
+
+
+_______________________________________________________ +

@@ -2133,11 +2157,10 @@ _______________________________________________________

Word: EXIT

-
Data stack: ( -- )
+
Data stack: ( v -- )
-

"EXIT" is a function word that implements the ending of a FORTH -definition and its threading to the subsequent step of the calling -definition.

+

"EXIT" is a function word that terminates the rrqforth process +immediately with the given exit code.

_______________________________________________________
@@ -2966,6 +2989,20 @@ kernel, and the granularity is in pages, i.e. a multiple of 4 kb.

_______________________________________________________
+

+ +
+

Word: RETURN

+
+
+
Data stack: ( -- )
+
+

"RETURN" is a function word that implements the ending of a FORTH +definition and make execution return to the next step in the calling +definition.

+
+_______________________________________________________ +

compile.asm: WORD p_right_bracket,],fasm

@@ -3483,10 +3520,26 @@ at (stream* + 16) is its size.

_______________________________________________________
-

+

+

Word: USE

+
+
+
Data value: ( wordlist -- )  Input stream: word
+
+

"USE" is a function word that looks up next word given the wordlist. +It reads next word on INPUT via READ-WORD, +then temporarily changes CURRENT-WORDLIST to +FIND the word via the given wordlist, and returns the TFA +of that word, or just 0 if the word coudn’t be found.

+
+_______________________________________________________ +
+

+
+

Word: VERBOSE?

@@ -3575,7 +3628,7 @@ is deepest.

diff --git a/rrqforth b/rrqforth index 81b5b6ce79bada6af919d3e84198aa42d8d1e884..6634bcbd47cdaff0d58c3409f43008f338536276 100755 GIT binary patch delta 11384 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 diff --git a/rrqforth.asm b/rrqforth.asm index 894e4b4..5187c90 100644 --- a/rrqforth.asm +++ b/rrqforth.asm @@ -133,7 +133,12 @@ previous_word = 0 pop rax jmp qword [rax] ; goto code of that FORTH word (64 bit jump) - WORD p_exit, 'EXIT',fasm + WORD p_sysexit, 'EXIT', + ;; ( v -- ) + ;; Terminate RRQFORTH with error code + dq sys_exit + + WORD p_return, 'RETURN',fasm ;; ( -- ) ( R: addr -- ) ;; Returns execution to the calling definition as per the ;; return stack. diff --git a/stdio.asm b/stdio.asm index 467952b..e07e809 100644 --- a/stdio.asm +++ b/stdio.asm @@ -288,22 +288,22 @@ p_double_quote_endstream: WORD p_fdtell,'FDTELL', ;; ( chars* n fd -- ) ;; Write n bytes from chars* to fd - dq p_rot, p_rot, sys_write, p_drop, p_exit + dq p_rot, p_rot, sys_write, p_drop, p_return WORD p_tell,'TELL' ;; ( chars* n -- ) ;; Write n bytes from chars* to stdout - dq p_literal,1,p_fdtell, p_exit + dq p_literal,1,p_fdtell, p_return WORD p_fdemit,'FDEMIT' ;; ( c fd -- ) ;; Write byte to fd - dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_exit + dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_return WORD p_emit,'EMIT' ;; ( c -- ) ;; Write byte to stdout - dq p_literal,1, p_fdemit, p_exit + dq p_literal,1, p_fdemit, p_return WORD p_nl,'NL',dovalue ;; ( -- c ) @@ -360,4 +360,4 @@ p_dot_remainder: WORD p_dot,'.' ;; ( v -- ) ;; Print value to stdout - dq p_dot_temp, p_literal,1, p_fdtell, p_exit + dq p_dot_temp, p_literal,1, p_fdtell, p_return diff --git a/temp.asm b/temp.asm index f85cb33..46a1358 100644 --- a/temp.asm +++ b/temp.asm @@ -48,4 +48,4 @@ p_objecthole_from_tail: dq p_dup, p_gtR ; ( -- char* n addr+8 ) [ n addr+8 ] dq p_swap, p_strncpy ; ( -- ) [ n addr+8 ] dq p_Rgt, p_Rgt ; ( -- addr+8 n ) [ ] - dq p_exit + dq p_return diff --git a/wordindex.adoc b/wordindex.adoc index a64f84b..66d0ae8 100644 --- a/wordindex.adoc +++ b/wordindex.adoc @@ -74,6 +74,7 @@ xref:p_create[CREATE] {nbsp} xref:p_current_wordlist[CURRENT-WORDLIST] {nbsp} xref:p_decimal[DECIMAL] {nbsp} +xref:p_definitions[DEFINITIONS] {nbsp} xref:p_depth[DEPTH] {nbsp} xref:p_digits[DIGITS] {nbsp} xref:p_divmod[/MOD] {nbsp} @@ -137,6 +138,7 @@ xref:p_quit[QUIT] {nbsp} xref:p_read_stream_char[READ-STREAM-CHAR] {nbsp} xref:p_read_word[READ-WORD] {nbsp} xref:p_realloc[REALLOC] {nbsp} +xref:p_return[RETURN] {nbsp} xref:p_roll[ROLL] {nbsp} xref:p_rot[ROT] {nbsp} xref:p_rbp[RSP] {nbsp} @@ -165,6 +167,7 @@ xref:p_true[TRUE] {nbsp} xref:p_tuck[TUCK] {nbsp} xref:p_unstream[UNSTREAM] {nbsp} +xref:p_use[USE] {nbsp} xref:p_verboseQ[VERBOSE?] {nbsp} diff --git a/wordlists.asm b/wordlists.asm index 7daa428..0ee7aec 100644 --- a/wordlists.asm +++ b/wordlists.asm @@ -14,6 +14,30 @@ ;; CURRENT-WORDLIST points to dfa of the currently active wordlist. dq p_forth_DFA ; compilation word list + WORD p_definitions,'DEFINITIONS',fasm + ;; ( wordlist -- ) + ;; Change CURRENT-WORDLIST to use the given word list + pop qword [p_wordlist_DFA] + next + + WORD p_use,'USE',fasm + ;; ( wordlist "name" -- cfa ) + ;; Read next word using the given wordlist + pushr rsi + mov rax,qword [p_wordlist_DFA] + pushr rax + pop qword [p_wordlist_DFA] + DOFORTH p_input, p_get, p_read_word, p_find + popr rax + mov qword [p_wordlist_DFA],rax + cmp qword [rsp],0 + jne p_use_done + add rsp,16 + mov qword [rsp],0 +p_use_done: + popr rsi + next + WORD p_words,'WORDS',fasm ;; ( w -- ) ;; Dump all words of the word list w (the dfa of a word list) -- 2.39.2