remove some one-off asm usage, fix turnkey for save/restore

Author: patricksurry

Makefile

@@ -40,6 +40,11 @@ excursions = $(wildcard tests/excursion*.txt)
 
 tests: $(patsubst %.txt,%.fs.log,$(excursions)) $(patsubst %.txt,%.c.log,$(excursions))
 
+tests/excursion6.fs.log: tests/excursion5.fs.log
+tests/excursion5.fs.log: tests/excursion3.fs.log  # there is no 4
+tests/excursion3.fs.log: tests/excursion2.fs.log
+tests/excursion2.fs.log: tests/excursion1.fs.log
+
 .FORCE:
 
 %.fs.log: %.txt .FORCE

README.md

@@ -71,7 +71,7 @@ into high memory from the block device and compiles it, using about 19K.
 The source is discarded and the data file is written above the code
 aligned to the end of RAM.  This leaves the game ready to play.
 
-Currently the loader also dumps the entire 64K memory image back to the block devic
+Currently the loader also dumps the entire 64K memory image back to the block device
 in order to support simulator play without compilation or block storage.
 
 HOW IT WORKS

data/advent.rom

@@ -37,6 +37,8 @@
     abort
 ;
 
+: lower ( addr len -- ) bounds ?do i c@ $20 or i c! loop ;
+
 \ database.c:pct
 : pct ( n -- flag )             \ true with percent n
     100 randint  <

src/advent.fs

@@ -47,8 +47,6 @@ ADVDAT $fc00 and $400 +  {data_blk} 1+  {data_blocks} 1-  block-read-n
 
 \ save turnkey entry point and dump image
 ' play $fff8 !
-\ bump reset vector +3 to do warm start
-$fffc @ 3 + $fffc !
 0 64 64 block-write-n
 \ leave the XT to execute once string eval is complete
 ' play

src/boot.fs

@@ -1,4 +1,4 @@
-\ each item is simply a concatenated list of 0-terminated terminated
+\ each item is simply a concatenated list of 0-terminated compressed strings
 \ the first string is found in the ITEMS& array,
 \ subsequent strings are found by skipping past ascii zeros
 
@@ -7,7 +7,15 @@
 : say-item ( i state -- )
     1+ swap 1- 2* ITEMS& + @ ITEMS + swap               \ first item string
     ( strz state+1 )
-    begin ?dup while 1- swap asciiz> + 1+ swap repeat   \ skip state+1 strings
+    begin
+        ?dup while
+        1- swap
+        ( state strz )
+        begin
+            dup 1+ swap c@ while
+        repeat
+        swap
+    repeat   \ skip state+1 strings
     sayz
 ;
 

src/item.fs

@@ -10,7 +10,7 @@
 
 \ english.c:getwords
 : user-input ( -- addr n )
-    ." > " $400 dup 127 accept tolower CR
+    ." > " $400 dup 127 accept 2dup lower CR
 ;
 
 \ optionally prompt user and respond to a yes/no question returning flag