Update from development backup 201506020137

Author: programandala-net

Makefile

@@ -205,7 +205,8 @@ abersoftforth2z80dasmblocks: abersoftforth2z80dasmblocks_compiling.tap
 
 abersoftforth2z80dasmblocks_compiling.tap: \
 	abersoftforth2z80dasmblocks.tap \
-	afera_for_disassembling.tap
+	afera_for_disassembling.tap \
+	patch_question_stack.tap
 	cat \
 		abersoft_forth.original.tap \
 		lib/loader.tap \
@@ -216,6 +217,7 @@ 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 \
@@ -236,7 +238,9 @@ abersoftforth2z80dasmblocks_compiling.tap: \
 
 abersoftforth2nfa4vim: abersoftforth2nfa4vim_compiling.tap
 
-abersoftforth2nfa4vim_compiling.tap: abersoftforth2nfa4vim.tap
+abersoftforth2nfa4vim_compiling.tap: \
+	abersoftforth2nfa4vim.tap \
+	patch_question_stack.tap
 	cat \
 		abersoft_forth.original.tap \
 		lib/loader.tap \
@@ -247,6 +251,7 @@ abersoftforth2nfa4vim_compiling.tap: abersoftforth2nfa4vim.tap
 		lib/recurse.tap \
 		lib/decode.tap \
 		lib/lowersys.tap \
+		patch_question_stack.tap \
 		lib/bank.tap \
 		lib/48kq.tap \
 		lib/16kramdisks.tap \
@@ -271,7 +276,8 @@ abersoftforth2branches: abersoftforth2branches_compiling.tap
 
 abersoftforth2branches_compiling.tap: \
 	abersoftforth2branches.tap \
-	afera_for_disassembling.tap
+	afera_for_disassembling.tap \
+	patch_question_stack.tap
 	cat \
 		abersoft_forth.original.tap \
 		lib/loader.tap \
@@ -282,6 +288,7 @@ 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 \

TO-DO.adoc

@@ -12,4 +12,12 @@ Document `cold_start`, `COLD`, `warm_start` and `WARM`.
 
 Make the automatic blocks unlabeled?
 
-Tidy the strings.
+.2015-06-02:
+
+Unpatch `r/w`, at least its branch, before creating the branches.
+
+Document l706dh.
+
+Document `mon`.
+
+Document 0xCBE0.

_notes_about_integer_division.adoc

@@ -0,0 +1,24 @@
+= Abersoft Forth integer division
+:author: Marcos Cruz (programandala.net)
+:revdate: 2015-06-02
+
+|===
+
+| Calculation     | Abersoft Forth | SpecForth | 40/80 Forth | WL | Spectrum Forth-83 | Gforth
+
+| 10 7 /mod . .   | 1 3            |           |             |    |                  |
+| -10 7 /mod . .  | -1 -3          |           |             |    |                  |
+| 10 -7 /mod . .  | -1 -3          |           |             |    |                  |
+| -10 -7 /mod . . | 1 -3           |           |             |    |                  |
+
+| -64 128 mod     | -64            | 64        | -64         |-64 | 64               | 64
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+|                 |                |           |             |    |                  |
+
+|===

abersoftforth2branches.fsb

@@ -39,10 +39,13 @@
   \
   \ 2015-05-31: Fix: `editor` is immediate! It needed a
   \ `[compile]`.
-
+  \
+  \ 2015-06-01: Fix: the loop in `print-colon` didn't processed
+  \ the last word of the definition.
+  \
   \ -----------------------------------------------------------
 
-forth 
+forth
 
                \  <------------------------------>
 128k? dup   ?\ ." ERROR: this program needs a" cr
@@ -162,9 +165,9 @@ vocabulary print-voc immediate  print-voc definitions  hex
   ' addr !  true
   addr @ [ ' ;s cfa ] literal = ?exit
   addr @ [ ' (;code) cfa ] literal  = ?exit
-  addr 6E04 = ?exit  \ end of COLD
+  addr 6E08 = ?exit  \ end of COLD (original, not patched)
   addr 6DAE = ?exit  \ end of WARM
-  addr 6D6A = ?exit  \ end of ABORT
+  addr 6D91 = ?exit  \ end of ABORT (original, not patched)
   addr 6C99 = ?exit  \ end of INTERPRET
   addr 6B2A = ?exit  \ end of ERROR
   addr 6D4C = ?exit  \ end of QUIT
@@ -187,9 +190,13 @@ vocabulary print-voc immediate  print-voc definitions  hex
 
 : print-colon  ( pfa --- )
   \ Print branches of a colon definition.
-  dup current-pfa !   begin   dup colon-end? 0=
-                      while   (print-colon) 2+
-                      repeat  drop  ;
+  \ XXX OLD -- buggy
+  \ dup current-pfa !   begin   dup colon-end? 0=
+  \                     while   (print-colon) 2+
+  \                     repeat  drop  ;
+  \ XXX NEW
+  dup current-pfa !
+  begin  dup colon-end? >r (print-colon) 2+ r>  until  drop  ;
 
 ( print-pfa )
 
@@ -223,7 +230,7 @@ vocabulary print-voc immediate  print-voc definitions  hex
   ." program with the provided" cr
   ." boot shell file for Fuse, copy" cr
   ." the printout of your emulator" cr
-  ." to the file " 
+  ." to the file "
   mode @ if    cr ." <z80dasm_symbols.branches.z80s>."
          else  ." <tidy_branches.vim>." then  cr
   ." Then close the emulator and use" cr
@@ -235,7 +242,7 @@ vocabulary print-voc immediate  print-voc definitions  hex
 : file-header  ( -- )
   ~ ." This file was automatically created by " program-name
   ~ ." This file is part of Abersoft Forth disassembled"
-  ~ ." By Marcos Cruz (programandala.net), 2015-05"
+  ~ ." By Marcos Cruz (programandala.net), 2015"
   ~ ." http://programandala.net/en.program.abersoft_forth.html"
   cr cr  ;
 

abersoftforth2nfa4vim.fsb

@@ -251,7 +251,7 @@ char " constant quote
 : file-header  ( -- )
   " ." This file was automatically created by " program-name
   " ." This file is part of Abersoft Forth disassembled"
-  " ." By Marcos Cruz (programandala.net), 2015-05"
+  " ." By Marcos Cruz (programandala.net), 2015"
   " ." http://programandala.net/en.program.abersoft_forth.html"
   cr cr  ;
 

abersoftforth2z80dasmblocks.fsb

@@ -51,6 +51,9 @@
   \ 2015-05-31: Fix: `editor` is immediate! It needed a
   \ `[compile]`. Improvement: the bounds of zones can be marked
   \ with "unlabeled".
+  \
+  \ 2015-06-02: Fix: the loop in `do-colon-zone` didn't
+  \ processed the last word of the definition.
 
   \ -----------------------------------------------------------
 
@@ -196,18 +199,6 @@ vocabulary print-voc immediate  print-voc definitions hex
   \ Start a new pfa zone. Used after a string or a literal.
 : new-pfa-zone  ( pfa+n -- )  zone-first ! 1 pfa-zone# +!  ;
 
-( Special zones )
-
-  \ The word compiled after `COMPILE` does not need a specific
-  \ zone, because the pfa is marked as "pointers zone". Only
-  \ the current address must be updated, to prevent the
-  \ compiled cfa to be checked as part of the executable
-  \ definition.
-
-: do-compile-zone  ( pfa+n -- pfa+n+2 )  2+  ;
-  \ pfa+n = Address of `COMPILE` in the current pfa.
-  \ pfa+n+2 = Address after the data word minus 2.
-
   \ Do a specific zone for a compiled literal. It will be a
   \ "wordata zone" with a unique address-based name.
 
@@ -220,6 +211,27 @@ vocabulary print-voc immediate  print-voc definitions hex
   \ pfa+n+2 = Address of the byte after the literal minus 2.
   dup end-pfa-zone (do-literal-zone) dup 2+ new-pfa-zone ;
 
+( Special zones )
+
+  \ Flag: Was the last word of the definition a branch?
+0 variable final-branch?
+
+: do-branch-zone  ( pfa+n -- pfa+n+2 )
+  \ pfa+n  = Address of the cf that precedes the compiled
+  \          literal.
+  \ pfa+n+2 = Address of the byte after the literal minus 2.
+  final-branch? on  do-literal-zone  ;
+
+  \ The word compiled after `COMPILE` does not need a specific
+  \ zone, because the pfa is marked as "pointers zone". Only
+  \ the current address must be updated, to prevent the
+  \ compiled cfa to be checked as part of the executable
+  \ definition.
+
+: do-compile-zone  ( pfa+n -- pfa+n+2 )  2+  ;
+  \ pfa+n = Address of `COMPILE` in the current pfa.
+  \ pfa+n+2 = Address after the data word minus 2.
+
   \ Do a specific zone for a compiled string. It will be a a
   \ "bytedata zone" (z80dasm does not provide text zones) with
   \ a unique address-based name.
@@ -252,16 +264,15 @@ vocabulary print-voc immediate  print-voc definitions hex
   \ The words that manage every individual case must
   \ return the received address updated, pointing to the byte
   \ after the data minus 2.
-  dup @
+  final-branch? off  dup @
   case
-    [ ' compile cfa ] literal of  do-compile-zone     endof
-    [ ' lit     cfa ] literal of  do-literal-zone     endof
-    [ ' branch  cfa ] literal of  do-literal-zone     endof
-    [ ' 0branch cfa ] literal of  do-literal-zone     endof
-    [ ' (loop)  cfa ] literal of  do-literal-zone     endof
-    [ ' (+loop) cfa ] literal of  do-literal-zone     endof
-    [ ' (.")    cfa ] literal of  do-string-zone      endof
-    [ ' slit    cfa ] literal of  do-string-zone      endof
+    [ ' compile cfa ] literal of  do-compile-zone  endof
+    [ ' lit     cfa ] literal of  do-literal-zone  endof
+    [ ' branch  cfa ] literal of  do-branch-zone   endof
+    [ ' 0branch cfa ] literal of  do-branch-zone   endof
+    [ ' (loop)  cfa ] literal of  do-branch-zone   endof
+    [ ' (+loop) cfa ] literal of  do-branch-zone   endof
+    [ ' (.")    cfa ] literal of  do-string-zone   endof
   endcase  ;
 
 ( Checks )
@@ -330,9 +341,17 @@ false variable semicolon-code?
 
 : do-colon-zone  ( pfa --- )
   \ Print a colon definition.
-  dup begin   dup colon-end? 0=
-      while   do-special-zones 2+
-      repeat  1+ zone-last ! pfa-label$  pointers-zone
+  \ XXX OLD -- buggy
+  \ dup begin   dup colon-end? 0=
+  \     while   do-special-zones 2+
+  \     repeat  1+ zone-last ! pfa-label$  pointers-zone
+  dup begin   dup colon-end? >r
+              do-special-zones 2+ r>  until  2-
+  \ If the word was not finished by a branch,
+  \ create the end of the pointers zone.
+  final-branch? @ 0=
+  if    1+ zone-last ! pfa-label$  pointers-zone
+  else  drop  then
   \ If the word was finished by `;code`, define a code zone
   \ for z80dasm.
   semicolon-code? @
@@ -414,7 +433,7 @@ false variable semicolon-code?
   cr ." ; This file was automatically created by "
   program-name cr
   ." ; This file is part of Abersoft Forth disassembled" cr
-  ." ; By Marcos Cruz (programandala.net), 2015-05" cr
+  ." ; By Marcos Cruz (programandala.net), 2015" cr
   ." ; http://programandala.net/en.program.abersoft_forth.html"
   cr cr  ;
 

afera_for_disassembling.fsb

@@ -10,7 +10,7 @@
   \ -----------------------------------------------------------
   \ Description
 
-  \ This is a modifed version of <afera.fsb>, the main file of
+  \ This is a modified version of <afera.fsb>, the main file of
   \ the Afera library.
   \
   \ It does the same than the original one except some

patch_question_stack.fsb

@@ -0,0 +1,34 @@
+.( Patch ?STACK )
+
+  \ patch_question_stack.fsb
+
+\ Copyright (C) 2015 Marcos Cruz (programandala.net)
+
+\ This file is part of
+\ Abersoft Forth disassembled
+\ <http://programandala.net/
+\ en.program.abersoft_forth_disassembled.html>.
+
+  \ -----------------------------------------------------------
+  \ Description
+
+  \ This file modifies the patch of `?stacks` created by the
+  \ Afera module <lowersys.fsb>, in order to make the patched
+  \ `?stacks' have the same size than its original version.
+  
+  \ -----------------------------------------------------------
+  \ History
+
+  \ 2015-06-01.
+
+HERE
+
+' NOOP CFA , ' NOOP CFA , ' ;S CFA ,
+
+DUP                     \ Origin: start of the compiled patch.
+' ?STACK 28 +           \ Destination.
+OVER HERE SWAP - CMOVE  \ Do it.
+DP !                    \ Free the space of the compiled patch.
+
+  \ vim: filetype=abersoftforthafera
+