Send *HELP to all the ROMs

ivanizag · Aug 23, 2021 · 928dee0 · 928dee0
1 parent 8246dc7
commit 928dee0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ Running BBC Basic:
 $ ./bbz
 bbz - Acorn MOS for 6502 adaptation layer, https://github.com/ivanizag/bbz
 
-BASIC - (C)1982 Acorn
+BASIC
 
 >PRINT "HELLO"
 HELLO
@@ -124,11 +124,11 @@ Log of the MOS calls (excluding the most verbose output API calls):
 $ ./bbz -m ROMs/Forth_103.rom
 bbz - Acorn MOS for 6502 adaptation layer, https://github.com/ivanizag/bbz
 
-FORTH - (C) Acornsoft Ltd. 1983
+FORTH
 
 COLD or WARM start (C/W)? C
 [[[OSRDCH()=0x43]]]
-[[[OSARGS('Get filing system',A=00,Y=00)= 4]]]
+[[[OSARGS('Get filing system',A=00,Y=00) => 105]]]
 [[[OSBYTE82('Read machine high order address',X=0x58,Y=0x00) => (X=0xff,Y=0xff)]]]
 [[[OSBYTE84('Read top of user mem',X=0x58,Y=0x00) => (X=0x00,Y=0x80)]]]
 [[[OSBYTE83('Read bottom of user mem',X=0x58,Y=0x00) => (X=0x00,Y=0x0e)]]]
@@ -148,29 +148,42 @@ Using mode 7 colors:
 
 Using several ROMs at once:
 ```
-$ go run *.go -rom0 BASIC.ROM -rom1 ROMs/Forth_103.rom -rom2 ROMs/LISP-200.rom -rom3 ROMs/COMAL.rom
+$ ./bbz -rom0 BASIC.ROM -rom1 ROMs/Forth_103.rom -rom2 ROMs/LISP501.ROM -rom3 ROMs/COMAL.rom -rom4 ROMs/MPROLOG310.rom 
 bbz - Acorn MOS for 6502 adaptation layer, https://github.com/ivanizag/bbz
 (tip: uppercase is usually needed)
 
-BASIC - (C)1982 Acorn
+BASIC
+>*HELP
+
+bbz - Acorn MOS for 6502 adaptation layer, https://github.com/ivanizag/bbz
+
+FORTH 1.03
 
+LISP 5.01
+
+COMAL
+
+micro PROLOG 3.1
 >*LISP
-LISP - (C)1982 Acornsoft/1979 Owl Computers
+LISP
 
 
 Evaluate : (* '*FORTH)
-FORTH - (C) Acornsoft Ltd. 1983
+FORTH
 
 COLD or WARM start (C/W)? C
 
 
 FORTH
 OK
 OS' *COMAL'
-COMAL - (C)Acorn
+COMAL
 →*BASIC
-BASIC - (C)1982 Acorn
+BASIC
+>*PROLOGUE
+micro PROLOG
+29184 bytes free
+&.
 
->
 
 ```
diff --git a/asm/firmware.s b/asm/firmware.s
@@ -63,7 +63,6 @@ CLITOROMS:      tax                     ; Service call number
                 .asciiz "Bad command"
 CTR_CLAIMED:    rts
 
-
 ;*************************************************************************
 ;*
 ;*  OSBYTE 143: Pass service commands to sideways ROMs

diff --git a/constants.go b/constants.go
@@ -39,13 +39,14 @@ const (
 
 	// Support code on the firmware. Check firmware.lst when changing firmware.s
 	procServiceRoms uint16 = 0xf000
+	procOSBYTE_143  uint16 = 0xf015
 
 	// See http://beebwiki.mdfs.net/Service_calls
 	//serviceNoOperation uint8 = 0
 	serviceOSCLI  uint8 = 4
 	serviceOSBYTE uint8 = 7
 	//serviceOSWORD      uint8 = 8
-	//serviceHELP        uint8 = 9
+	serviceHELP uint8 = 9
 
 	// Scratch area for errors in page 0xfa
 	errorArea             uint16 = 0xfa00

diff --git a/osByte.go b/osByte.go
@@ -281,7 +281,7 @@ func execOSBYTE(env *environment) {
 		env.mem.Poke(zpA, a)
 		env.mem.Poke(zpX, x)
 		env.mem.Poke(zpY, y)
-		newA = uint8(serviceOSBYTE)
+		newA = serviceOSBYTE
 		env.cpu.SetPC(procServiceRoms)
 		env.log(fmt.Sprintf("OSBYTE%02x_to_roms(X=0x%02x,Y=0x%02x)", a, x, y))
 		// procServiceRoms issues a 254-Bad command if the command is not handled by any ROM

diff --git a/osCLI.go b/osCLI.go
@@ -37,7 +37,7 @@ var cliCommands = []string{
 }
 
 func execOSCLI(env *environment) {
-	_, x, y, p := env.cpu.GetAXYP()
+	a, x, y, p := env.cpu.GetAXYP()
 
 	/*
 		This routine passes a line of text to the command line
@@ -128,7 +128,11 @@ func execOSCLI(env *environment) {
 	//case "EXEC":
 	case "HELP":
 		fmt.Println("\nbbz - Acorn MOS for 6502 adaptation layer, https://github.com/ivanizag/bbz")
-		// TODO: multiple ROMS: service call 9 after the MOS message
+
+		// Send to the other ROMS if available.
+		env.mem.pokeWord(zpStr, xy)
+		env.cpu.SetAXYP(a, serviceHELP, 1, p)
+		env.cpu.SetPC(procOSBYTE_143)
 
 	case "HOST":
 		if len(args) == 0 {