Update from development backup 201506022105

Author: programandala-net

Makefile

@@ -206,7 +206,7 @@ abersoftforth2z80dasmblocks: abersoftforth2z80dasmblocks_compiling.tap
 abersoftforth2z80dasmblocks_compiling.tap: \
 	abersoftforth2z80dasmblocks.tap \
 	afera_for_disassembling.tap \
-	patch_question_stack.tap
+	patches.tap
 	cat \
 		abersoft_forth.original.tap \
 		lib/loader.tap \
@@ -217,7 +217,6 @@ abersoftforth2z80dasmblocks_compiling.tap: \
 		lib/recurse.tap \
 		lib/decode.tap \
 		lib/lowersys.tap \
-		patch_question_stack.tap \
 		lib/bank.tap \
 		lib/16kramdisks.tap \
 		lib/upperc.tap \
@@ -232,6 +231,7 @@ abersoftforth2z80dasmblocks_compiling.tap: \
 		lib/csb.tap \
 		lib/csb-256.tap \
 		lib/s-plus.tap \
+		patches.tap \
 		abersoftforth2z80dasmblocks.tap \
 		> abersoftforth2z80dasmblocks_compiling.tap ; \
 	rm -f abersoftforth2z80dasmblocks.tap
@@ -240,7 +240,7 @@ abersoftforth2nfa4vim: abersoftforth2nfa4vim_compiling.tap
 
 abersoftforth2nfa4vim_compiling.tap: \
 	abersoftforth2nfa4vim.tap \
-	patch_question_stack.tap
+	patches.tap
 	cat \
 		abersoft_forth.original.tap \
 		lib/loader.tap \
@@ -251,7 +251,6 @@ abersoftforth2nfa4vim_compiling.tap: \
 		lib/recurse.tap \
 		lib/decode.tap \
 		lib/lowersys.tap \
-		patch_question_stack.tap \
 		lib/bank.tap \
 		lib/48kq.tap \
 		lib/16kramdisks.tap \
@@ -268,6 +267,7 @@ abersoftforth2nfa4vim_compiling.tap: \
 		lib/csb.tap \
 		lib/csb-256.tap \
 		lib/s-plus.tap \
+		patches.tap \
 		abersoftforth2nfa4vim.tap \
 		> abersoftforth2nfa4vim_compiling.tap ; \
 	rm -f abersoftforth2nfa4vim.tap
@@ -277,7 +277,7 @@ abersoftforth2branches: abersoftforth2branches_compiling.tap
 abersoftforth2branches_compiling.tap: \
 	abersoftforth2branches.tap \
 	afera_for_disassembling.tap \
-	patch_question_stack.tap
+	patches.tap
 	cat \
 		abersoft_forth.original.tap \
 		lib/loader.tap \
@@ -288,7 +288,6 @@ abersoftforth2branches_compiling.tap: \
 		lib/recurse.tap \
 		lib/decode.tap \
 		lib/lowersys.tap \
-		patch_question_stack.tap \
 		lib/bank.tap \
 		lib/48kq.tap \
 		lib/16kramdisks.tap \
@@ -304,6 +303,7 @@ abersoftforth2branches_compiling.tap: \
 		lib/csb.tap \
 		lib/csb-256.tap \
 		lib/s-plus.tap \
+		patches.tap \
 		abersoftforth2branches.tap \
 		> abersoftforth2branches_compiling.tap ; \
 	rm -f abersoftforth2branches.tap

TO-DO.adoc

@@ -1,23 +1,12 @@
 = Abersoft Forth disassembled TO-DO
 :author: Marcos Cruz (programandala.net)
-:revdate: 2015-05-31
-
+:revdate: 2015-06-02
 
 .2015-05-31:
 
-Strange problem with <abersoftforth2branches.fsb>: one instance is not
-found.  Others are not translated later.
-
-Document `cold_start`, `COLD`, `warm_start` and `WARM`.
-
-Make the automatic blocks unlabeled?
+Document the `COLD` bug.
 
 .2015-06-02:
 
-Unpatch `r/w`, at least its branch, before creating the branches.
-
-Document l706dh.
-
-Document `mon`.
+Tidy the number of `rst` calls.
 
-Document 0xCBE0.

abersoftforth2branches.boot.symbols-output.sh

@@ -2,13 +2,13 @@
 # abersoftforth2branches.boot.symbols-output.sh
 # 2015-05-30
 
-rm -f ./z80dasm_symbols.branches.vim
+rm -f ./z80dasm_symbols.branches.z80s
 fuse \
 	--machine 128 \
 	--no-divide \
   --tape ./abersoftforth2branches_compiling.tap \
   --printer \
-  --textfile ./z80dasm_symbols.branches.vim \
+  --textfile ./z80dasm_symbols.branches.z80s \
 	$* \
 	&
 

abersoftforth2branches.fsb

@@ -2,10 +2,12 @@
 
   \ abersoftforth2branches.fsb
 
-  \ XXX TODO -- under development
-
 \ Self-disassembly tool for ZX Spectrum Abersoft Forth
 
+\ This file is part of
+\ Abersoft Forth disassembled
+\ <http://programandala.net.en.program.abersoft_forth.html>.
+
 \ Copyright (C) 2015 Marcos Cruz (programandala.net)
 
   \ Copying and distribution of this file, with or without
@@ -79,13 +81,13 @@ vocabulary print-voc immediate  print-voc definitions  hex
   ." make sure the printout file of" cr
   ." your emulator is empty." cr cr
   \  <------------------------------>
-  ." Type 'vim' to print out a Vim" cr
-  ." program that tidies the Forth" cr
-  ." branches of the Z80 source." cr cr
-  \  <------------------------------>
   ." Type 'sym' to print out a" cr
   ." z80dasm symbols file with the"  cr
-  ." branch destination addresses." cr quit  ;
+  ." branch destination addresses." cr cr
+  \  <------------------------------>
+  ." Type 'vim' to print out a Vim" cr
+  ." program that tidies the Forth" cr
+  ." branches of the Z80 source." cr quit  ;
   \  <------------------------------>
 
 ( Labels )
@@ -216,9 +218,10 @@ vocabulary print-voc immediate  print-voc definitions  hex
   begin  pfa dup print-pfa  lfa @ dup 0= ?terminal or
   until  drop  ;
 
+: print-context  ( -- )
   \ Print branches of the context vocabulary,
   \ and the vocabularies it's chained to.
-: print-context  ( -- )  context @ @  print-from-nfa  ;
+  context @ @  print-from-nfa  ;
 
 ( done )
 

abersoftforth2nfa4vim.fsb

@@ -4,6 +4,10 @@
 
 \ Self-disassembly tool for ZX Spectrum Abersoft Forth
 
+\ This file is part of
+\ Abersoft Forth disassembled
+\ <http://programandala.net.en.program.abersoft_forth.html>.
+
 \ Copyright (C) 2015 Marcos Cruz (programandala.net)
 
   \ Copying and distribution of this file, with or without
@@ -20,7 +24,7 @@
   \ definitive format.
   \
   \ The printout, processed by Vim, is used to recreate the
-  \ original Z80 source of Abersoft Forth.  Ssee <README.adoc>
+  \ original Z80 source of Abersoft Forth.  See <README.adoc>
   \ and <Makefile> for more details.
 
   \ -----------------------------------------------------------
@@ -179,7 +183,7 @@ char " constant quote
 : new-name-field  ( pfa -- )
   \ Print the new name field.
   nfa ." defb " dup c@ count-byte
-                dup c@ len-only ." , " name  ;
+                dup c@ len-only ." ," name  ;
 
 : (vim-command)  ( pfa -- )
 

abersoftforth2z80dasmblocks.fsb

@@ -5,9 +5,8 @@
 \ Self-disassembly tool for ZX Spectrum Abersoft Forth
 
 \ This file is part of
-
-\   Abersoft Forth disassembled
-\   <http://programandala.net/en.program.abersoft_forth.html>
+\ Abersoft Forth disassembled
+\ <http://programandala.net/en.program.abersoft_forth.html>.
 
 \ Copyright (C) 2015 Marcos Cruz (programandala.net)
 
@@ -441,7 +440,7 @@ false variable semicolon-code?
   \ Print out the zones of all definitions of the original
   \ system.
   hex  1 link  file-header  [compile] editor print-context
-       [compile] print-voc  0 link  decimal cr ." Done." cr  ;
+       [compile] print-voc  0 link  decimal cr done  ;
 
   \ vim: filetype=abersoftforthafera
 

patch_question_stack.fsb

@@ -0,0 +1,66 @@
+.( Patches )
+
+  \ patches.fsb
+
+\ This file is part of
+\ Abersoft Forth disassembled
+\ <http://programandala.net.en.program.abersoft_forth.html>.
+
+\ Copyright (C) 2015 Marcos Cruz (programandala.net)
+
+  \ Copying and distribution of this file, with or without
+  \ modification, are permitted in any medium without royalty
+  \ provided the copyright notice and this notice are
+  \ preserved.  This file is offered as-is, without any
+  \ warranty.
+  
+  \ -----------------------------------------------------------
+  \ Description
+
+  \ This file modifies some patches created by modules of the
+  \ Afera library, in order to make the patched words the same
+  \ size than their original versions. Otherwise the Abersoft
+  \ Forth tools that create data and programs to process the
+  \ disassembling, would make wrong calculations.
+  
+  \ -----------------------------------------------------------
+  \ History
+
+  \ 2015-06-01: `?STACK`.
+  \ 2015-06-02: `R/W`.
+
+-->
+
+( Repatch ?STACK )
+
+  \ `?STACK` was patched by the Afera module <lowersys.fsb>.
+
+  \ It has to be padded with `NOOP`, and `;S` has to be in its
+  \ original address.
+
+HERE  ] NOOP NOOP ;S [
+
+DUP                     \ Origin: start of the compiled patch.
+' ?STACK 28 +           \ Destination.
+OVER HERE SWAP - CMOVE  \ Do it.
+DP !                    \ Free the space of the compiled patch.
+
+-->
+
+( Repatch R/W )
+
+  \ `R/W` was patched by the Afera main module <afera.fsb>.
+
+  \ It has to be padded with `NOOP`, `;S` has to be in its
+  \ original address, and its original branch must be restored.
+
+HERE  ] NOOP NOOP NOOP NOOP NOOP NOOP NOOP
+        1 0BRANCH [ 4 , ] NOOP NOOP NOOP ;S [
+
+DUP                     \ Origin: start of the compiled patch.
+' R/W 8 +               \ Destination.
+OVER HERE SWAP - CMOVE  \ Do it.
+DP !                    \ Free the space of the compiled patch.
+
+  \ vim: filetype=abersoftforthafera
+