recipes/rc2014/eeprom: use BASIC shell

recipes/sms/romasm: add missing sentinel in .mycmds
Fix broken uploadb.py
2024-11-02 18:10:55 +11:00 · 2019-12-02 23:00:35 -05:00 · 2019-12-02 23:00:03 -05:00 · 2019-12-02 22:57:22 -05:00 · 2019-12-02 20:18:41 -05:00
8 changed files with 154 additions and 97 deletions
--- a/recipes/rc2014/eeprom/glue.asm
+++ b/recipes/rc2014/eeprom/glue.asm
@ -33,47 +33,56 @@ jp	aciaInt
 .equ	STDIO_PUTC	aciaPutC
 .inc "stdio.asm"

+.inc "lib/args.asm"
 .equ	AT28W_RAMSTART	STDIO_RAMEND
 .inc "at28w/main.asm"

-; *** Shell ***
-.inc "lib/util.asm"
-.inc "lib/parse.asm"
-.inc "lib/args.asm"
-.inc "lib/stdio.asm"
-.equ	SHELL_RAMSTART	AT28W_RAMEND
-.equ	SHELL_EXTRA_CMD_COUNT 5
-.inc "shell/main.asm"
-; Extra cmds
-.dw	a28wCmd
-.dw	blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd
+; *** BASIC ***

-.inc "shell/blkdev.asm"
+; RAM space used in different routines for short term processing.
+.equ	SCRATCHPAD_SIZE	0x20
+.equ	SCRATCHPAD	AT28W_RAMEND
+.inc "lib/util.asm"
+.inc "lib/ari.asm"
+.inc "lib/parse.asm"
+.inc "lib/fmt.asm"
+.equ	EXPR_PARSE	parseLiteralOrVar
+.inc "lib/expr.asm"
+.inc "basic/util.asm"
+.inc "basic/parse.asm"
+.inc "basic/tok.asm"
+.equ	VAR_RAMSTART	SCRATCHPAD+SCRATCHPAD_SIZE
+.inc "basic/var.asm"
+.equ	BUF_RAMSTART	VAR_RAMEND
+.inc "basic/buf.asm"
+.inc "basic/blk.asm"
+.equ	BAS_RAMSTART	BUF_RAMEND
+.inc "basic/main.asm"

 init:
 	di
 	; setup stack
-	ld	hl, RAMEND
-	ld	sp, hl
+	ld	sp, RAMEND
 	im 1

 	call	aciaInit
-	call	shellInit
-
 	xor	a
 	ld	de, BLOCKDEV_SEL
 	call	blkSel

+	call	basInit
+	ld	hl, basFindCmdExtra
+	ld	(BAS_FINDHOOK), hl
 	ei
-	jp	shellLoop
-
-a28wCmd:
-	.db	"a28w", 0b011, 0b001, 0
-	ld	a, (hl)
-	ld	(AT28W_MAXBYTES), a
-	inc	hl
-	ld	a, (hl)
-	ld	(AT28W_MAXBYTES+1), a
-	jp	at28wInner
-
+	jp	basStart

+basFindCmdExtra:
+	ld	hl, basBLKCmds
+	call	basFindCmd
+	ret	z
+	ld	hl, .mycmds
+	jp	basFindCmd
+.mycmds:
+	.db "at28w", 0
+	.dw at28wMain
+	.db 0xff
--- a/recipes/sms/README.md
+++ b/recipes/sms/README.md
@ -37,7 +37,7 @@ thing!

 ## Usage

-On boot, you will get a regular Collapse OS shell. See the rest of the
+On boot, you will get a regular Collapse OS BASIC shell. See the rest of the
 documentation for shell usage instructions.

 The particularity here is that, unlike with the RC2014, we don't access Collapse
--- a/recipes/sms/glue.asm
+++ b/recipes/sms/glue.asm
@ -24,14 +24,26 @@
 .equ	STDIO_PUTC	vdpPutC
 .inc "stdio.asm"

-; *** Shell ***
+; *** BASIC ***
+
+; RAM space used in different routines for short term processing.
+.equ	SCRATCHPAD_SIZE	0x20
+.equ	SCRATCHPAD	STDIO_RAMEND
 .inc "lib/util.asm"
+.inc "lib/ari.asm"
 .inc "lib/parse.asm"
-.inc "lib/args.asm"
-.inc "lib/stdio.asm"
-.equ	SHELL_RAMSTART	STDIO_RAMEND
-.equ	SHELL_EXTRA_CMD_COUNT 0
-.inc "shell/main.asm"
+.inc "lib/fmt.asm"
+.equ	EXPR_PARSE	parseLiteralOrVar
+.inc "lib/expr.asm"
+.inc "basic/util.asm"
+.inc "basic/parse.asm"
+.inc "basic/tok.asm"
+.equ	VAR_RAMSTART	SCRATCHPAD+SCRATCHPAD_SIZE
+.inc "basic/var.asm"
+.equ	BUF_RAMSTART	VAR_RAMEND
+.inc "basic/buf.asm"
+.equ	BAS_RAMSTART	BUF_RAMEND
+.inc "basic/main.asm"

 init:
 	di
@ -41,8 +53,8 @@ init:

 	call	padInit
 	call	vdpInit
-	call	shellInit
-	jp	shellLoop
+	call	basInit
+	jp	basStart

 .fill 0x7ff0-$
 .db "TMR SEGA", 0x00, 0x00, 0xfb, 0x68, 0x00, 0x00, 0x00, 0x4c
--- a/recipes/sms/kbd/glue.asm
+++ b/recipes/sms/kbd/glue.asm
@ -26,14 +26,26 @@
 .equ	STDIO_PUTC	vdpPutC
 .inc "stdio.asm"

-; *** Shell ***
+; *** BASIC ***
+
+; RAM space used in different routines for short term processing.
+.equ	SCRATCHPAD_SIZE	0x20
+.equ	SCRATCHPAD	STDIO_RAMEND
 .inc "lib/util.asm"
+.inc "lib/ari.asm"
 .inc "lib/parse.asm"
-.inc "lib/args.asm"
-.inc "lib/stdio.asm"
-.equ	SHELL_RAMSTART	STDIO_RAMEND
-.equ	SHELL_EXTRA_CMD_COUNT 0
-.inc "shell/main.asm"
+.inc "lib/fmt.asm"
+.equ	EXPR_PARSE	parseLiteralOrVar
+.inc "lib/expr.asm"
+.inc "basic/util.asm"
+.inc "basic/parse.asm"
+.inc "basic/tok.asm"
+.equ	VAR_RAMSTART	SCRATCHPAD+SCRATCHPAD_SIZE
+.inc "basic/var.asm"
+.equ	BUF_RAMSTART	VAR_RAMEND
+.inc "basic/buf.asm"
+.equ	BAS_RAMSTART	BUF_RAMEND
+.inc "basic/main.asm"

 init:
 	di
@ -53,8 +65,8 @@ init:

 	call	kbdInit
 	call	vdpInit
-	call	shellInit
-	jp	shellLoop
+	call	basInit
+	jp	basStart

 .fill 0x7ff0-$
 .db "TMR SEGA", 0x00, 0x00, 0xfb, 0x68, 0x00, 0x00, 0x00, 0x4c
--- a/recipes/sms/romasm/glue.asm
+++ b/recipes/sms/romasm/glue.asm
@ -1,6 +1,11 @@
+; TODO: This recipe has not been tested since its conversion to the BASIC shell.
+; My PS/2 adapter has been acting up and probably has a loose wire. I need to
+; fix it beore I can test this recipe on real hardware.
+; But theoretically, it works...
+
 ; 8K of onboard RAM
 .equ	RAMSTART	0xc000
-.equ	USER_RAMSTART	0xc200
+.equ	USER_CODE	0xd500
 ; Memory register at the end of RAM. Must not overwrite
 .equ	RAMEND		0xddd0

@ -19,7 +24,6 @@
 	jp	fsGetB
 	jp	fsPutB
 	jp	fsSetSize
-	jp	parseArgs
 	jp	printstr
 	jp	_blkGetB
 	jp	_blkPutB
@ -70,25 +74,32 @@
 .equ	FS_HANDLE_COUNT	2
 .inc "fs.asm"

-; *** Shell ***
+; *** BASIC ***
+
+; RAM space used in different routines for short term processing.
+.equ	SCRATCHPAD_SIZE	0x20
+.equ	SCRATCHPAD	FS_RAMEND
 .inc "lib/util.asm"
+.inc "lib/ari.asm"
 .inc "lib/parse.asm"
-.inc "lib/args.asm"
-.inc "lib/stdio.asm"
-.equ	SHELL_RAMSTART	FS_RAMEND
-.equ	SHELL_EXTRA_CMD_COUNT 10
-.inc "shell/main.asm"
-.dw	edCmd, zasmCmd, fnewCmd, fdelCmd, fopnCmd, flsCmd, blkBselCmd
-.dw	blkSeekCmd, blkLoadCmd, blkSaveCmd
+.inc "lib/fmt.asm"
+.equ	EXPR_PARSE	parseLiteralOrVar
+.inc "lib/expr.asm"
+.inc "basic/util.asm"
+.inc "basic/parse.asm"
+.inc "basic/tok.asm"
+.equ	VAR_RAMSTART	SCRATCHPAD+SCRATCHPAD_SIZE
+.inc "basic/var.asm"
+.equ	BUF_RAMSTART	VAR_RAMEND
+.inc "basic/buf.asm"
+.equ	BFS_RAMSTART	BUF_RAMEND
+.inc "basic/fs.asm"
+.inc "basic/blk.asm"
+.equ	BAS_RAMSTART	BFS_RAMEND
+.inc "basic/main.asm"

-.inc "shell/blkdev.asm"
-.inc "shell/fs.asm"
-
-.equ	PGM_RAMSTART		SHELL_RAMEND
-.equ	PGM_CODEADDR		USER_RAMSTART
-.inc "shell/pgm.asm"
-
-.out	PGM_RAMEND
+; USER_CODE is set according to this output below.
+.out BAS_RAMEND

 init:
 	di
@ -116,10 +127,28 @@ init:
 	call	kbdInit
 	call	vdpInit

-	call	shellInit
-	ld	hl, pgmShellHook
-	ld	(SHELL_CMDHOOK), hl
-	jp	shellLoop
+	call	basInit
+	ld	hl, basFindCmdExtra
+	ld	(BAS_FINDHOOK), hl
+	jp	basStart
+
+basFindCmdExtra:
+	ld	hl, basFSCmds
+	call	basFindCmd
+	ret	z
+	ld	hl, basBLKCmds
+	call	basFindCmd
+	ret	z
+	ld	hl, .mycmds
+	call	basFindCmd
+	ret	z
+	jp	basPgmHook
+.mycmds:
+	.db "ed", 0
+	.dw 0x1e00
+	.db "zasm", 0
+	.dw 0x2300
+	.db 0xff

 f0GetB:
 	ld	ix, FS_HANDLES
@ -137,30 +166,14 @@ f1PutB:
 	ld	ix, FS_HANDLES+FS_HANDLE_SIZE
 	jp	fsPutB

-edCmd:
-	.db	"ed", 0, 0, 0b1001, 0, 0
-	push	hl \ pop ix
-	ld	l, (ix)
-	ld	h, (ix+1)
-	jp	0x1900
-
-zasmCmd:
-	.db	"zasm", 0b1001, 0, 0
-	push	hl \ pop ix
-	ld	l, (ix)
-	ld	h, (ix+1)
-	jp	0x1d00
-
-; last time I checked, PC at this point was 0x183c. Let's give us a nice margin
+; last time I checked, PC at this point was 0x1df8. Let's give us a nice margin
 ; for the start of ed.
-.fill 0x1900-$
+.fill 0x1e00-$
 .bin "ed.bin"

-; Last check: 0x1c4e
-.fill 0x1d00-$
+; Last check: 0x22dd
+.fill 0x2300-$
 .bin "zasm.bin"

 .fill 0x7ff0-$
 .db "TMR SEGA", 0x00, 0x00, 0xfb, 0x68, 0x00, 0x00, 0x00, 0x4c
-
-
--- a/recipes/sms/romasm/user.h
+++ b/recipes/sms/romasm/user.h
@ -1,4 +1,4 @@
-.equ    USER_RAMSTART   0xc200
+.equ    USER_CODE   0xc200
 ; Make ed fit in SMS's memory
 .equ    ED_BUF_MAXLINES 0x100
 .equ    ED_BUF_PADMAXLEN 0x800
@ -22,7 +22,6 @@
 .equ	fsGetB			@+3
 .equ	fsPutB			@+3
 .equ	fsSetSize		@+3
-.equ	parseArgs		@+3
 .equ	printstr		@+3
 .equ	_blkGetB		@+3
 .equ	_blkPutB		@+3
--- a/tools/emul/zasm/zasm.c
+++ b/tools/emul/zasm/zasm.c
@ -54,7 +54,7 @@ static int inpt_size;
 static int inpt_ptr;
 static uint8_t middle_of_seek_tell = 0;

-static uint8_t fsdev[0x40000] = {0};
+static uint8_t fsdev[0x80000] = {0};
 static uint32_t fsdev_size = 0;
 static uint32_t fsdev_ptr = 0;
 static uint8_t fsdev_seek_tell_cnt = 0;
--- a/tools/uploadb.py
+++ b/tools/uploadb.py
@ -47,14 +47,26 @@ def main():

    for i, c in enumerate(fcontents):
        c = bytes([c])
-        sendcmd(fd, 'getc')
-        os.write(fd, c)
-        os.read(fd, 2) # read prompt
-        sendcmd(fd, 'putc a')
-        r = os.read(fd, 1) # putc result
-        os.read(fd, 2) # read prompt
-        if r != c:
-            print(f"Mismatch at byte {i}! {c} != {r}")
+        print('.', end='', flush=True)
+        for _ in range(5): # try 5 times
+            sendcmd(fd, 'getc')
+            os.write(fd, c)
+            os.read(fd, 2) # read prompt
+            sendcmd(fd, 'print a')
+            s = b''
+            while True:
+                r = os.read(fd, 1) # putc result
+                if not r.isdigit():
+                    break
+                s += r
+            os.read(fd, 3) # read prompt
+            if int(s) == c[0]:
+                break
+            else:
+                print(f"Mismatch at byte {i}! {c} != {r}. Retrying")
+        else:
+            print("Maximum retries reached, abort")
+            return 1
        sendcmd(fd, 'poke m a')
        os.read(fd, 2) # read prompt
        sendcmd(fd, 'm=m+1')
Author	SHA1	Message	Date
Virgil Dupras	08392fee60	recipes/rc2014/eeprom: use BASIC shell	2019-12-02 23:00:35 -05:00
Virgil Dupras	0fb7995166	recipes/sms/romasm: add missing sentinel in .mycmds	2019-12-02 23:00:03 -05:00
Virgil Dupras	30a0f69101	Fix broken uploadb.py putc didn't work well with any byte value on most terminal configuration. It was a bad idea...	2019-12-02 22:57:22 -05:00
Virgil Dupras	270ad926c9	recipes/sms: use BASIC shell	2019-12-02 20:18:41 -05:00