Explicit cards ROM layout

README.md

@@ -33,6 +33,7 @@ Portable emulator of an Apple II+ or //e. Written in Go.
   - Brain Board II
   - MultiROM card
   - Dan ][ Controller card
+  - ProDOS ROM card
 - Useful cards not emulating a real card
   - Bootable SmartPort / ProDOS card with the following smartport devices:
       - Block device (hard disks)
@@ -240,6 +241,8 @@ The available cards are:
   mouse: Mouse card implementation, does not emulate a real card, only the firmware behaviour
   multirom: Multiple Image ROM card
   parallel: Card to dump to a file what would be printed to a parallel printer
+  prodosromcard3: A bootable 4 MB ROM card by Ralle Palaveev
+  prodosromdrive: A bootable 1 MB solid state disk by Terence Boldt
   saturn: RAM card with 128Kb, it's like 8 language cards
   smartport: SmartPort interface card
   softswitchlogger: Card to log softswitch accesses
@@ -254,7 +257,7 @@ The available tracers are:
   mli: Trace ProDOS MLI calls
   mos: Trace MOS calls with Applecorn skipping terminal IO
   mosfull: Trace MOS calls with Applecorn
-  panicSS: Panic on unimplemented softswitches
+  panicss: Panic on unimplemented softswitches
   ss: Trace sotfswiches calls
   ssreg: Trace sotfswiches registrations
   ucsd: Trace UCSD system calls

apple2Run.go

@@ -37,7 +37,7 @@ func (a *Apple2) Start(paused bool) {
 			for i := 0; i < cpuSpinLoops; i++ {
 				// Conditional tracing
 				//pc, _ := a.cpu.GetPCAndSP()
-				//a.cpu.SetTrace(pc >= 0xc75e && pc < 0xc800)
+				//a.cpu.SetTrace(pc >= 0xc700 && pc < 0xc800)
 
 				// Execution
 				a.cpu.ExecuteInstruction()
@@ -144,10 +144,16 @@ func (a *Apple2) dumpDebugInfo() {
 		0xee: "JVAFOLDL",  // Apple Pascal
 		0xef: "JVAFOLDH",  // Apple Pascal
 	}
-
 	fmt.Printf("Page zero values:\n")
 	for _, k := range []int{0x36, 0x37, 0x38, 0x39, 0xe2, 0xe3, 0xec, 0xed, 0xee, 0xef} {
 		d := a.mmu.physicalMainRAM.data[k]
 		fmt.Printf("  %v(0x%x): 0x%02x\n", pageZeroSymbols[k], k, d)
 	}
+
+	pc := uint16(0xc700)
+	for pc < 0xc800 {
+		line, newPc := a.cpu.DisasmInstruction(pc)
+		fmt.Println(line)
+		pc = newPc
+	}
 }

cardBase.go

@@ -6,7 +6,7 @@ import (
 
 // Card represents an Apple II card to be inserted in a slot
 type Card interface {
-	loadRom(data []uint8)
+	loadRom(data []uint8, layout cardRomLayout) error
 	assign(a *Apple2, slot int)
 	reset()
 
@@ -51,45 +51,79 @@ func (c *cardBase) reset() {
 	// nothing
 }
 
-func (c *cardBase) loadRomFromResource(resource string) error {
+type cardRomLayout int
+
+const (
+	cardRomSimple       cardRomLayout = iota // The ROM is on the slot area, there can be more than one page
+	cardRomUpper                             // The ROM is on the full C800 area. The slot area copies C8xx
+	cardRomUpperHalfEnd                      // The ROM is on half of the C800 areas. The slot area copies CBxx
+	cardRomFull                              // The ROM is on the full Cxxx area, with pages for each slot position
+)
+
+func (c *cardBase) loadRomFromResource(resource string, layout cardRomLayout) error {
 	data, _, err := LoadResource(resource)
 	if err != nil {
 		// The resource should be internal and never fail
 		return err
 	}
-	c.loadRom(data)
+	err = c.loadRom(data, layout)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
-func (c *cardBase) loadRom(data []uint8) {
+func (c *cardBase) loadRom(data []uint8, layout cardRomLayout) error {
 	if c.a != nil {
-		panic("Assert failed. ROM must be loaded before inserting the card in the slot")
+		return fmt.Errorf("ROM must be loaded before inserting the card in the slot")
 	}
-	if len(data) == 0x100 {
-		// Just 256 bytes in Cs00
-		c.romCsxx = newMemoryRangeROM(0, data, "Slot ROM")
-	} else if len(data) == 0x400 {
-		// The file has C800 to CBFF for ROM
-		// The 256 bytes in Cx00 are copied from the last page in C800-CBFF
-		// Used on the Videx 80 columns card
-		c.romCsxx = newMemoryRangeROM(0, data[0x300:], "Slot ROM")
-		c.romC8xx = newMemoryRangeROM(0xc800, data, "Slot C8 ROM")
-	} else if len(data) == 0x800 {
-		// The file has C800 to CFFF
-		// The 256 bytes in Cx00 are copied from the first page in C800
-		c.romCsxx = newMemoryRangeROM(0, data, "Slot ROM")
-		c.romC8xx = newMemoryRangeROM(0xc800, data, "Slot C8 ROM")
-	} else if len(data) == 0x1000 {
-		// The file covers the full Cxxx range. Only showing the page
-		// corresponding to the slot used.
-		c.romCxxx = newMemoryRangeROM(0xc000, data, "Slot ROM")
-	} else if len(data)%0x100 == 0 {
-		// The ROM covers many 256 bytes pages oc Csxx
-		// Used on the Dan 2 controller card
-		c.romCsxx = newMemoryRangePagedROM(0, data, "Slot paged ROM", uint8(len(data)/0x100))
-	} else {
-		panic("Invalid ROM size")
+	switch layout {
+	case cardRomSimple:
+		if len(data) == 0x100 {
+			// Just 256 bytes in Cs00
+			c.romCsxx = newMemoryRangeROM(0, data, "Slot ROM")
+		} else if len(data)%0x100 == 0 {
+			// The ROM covers many 256 bytes pages of Csxx
+			// Used on the Dan 2 controller card
+			c.romCsxx = newMemoryRangePagedROM(0, data, "Slot paged ROM", uint8(len(data)/0x100))
+		} else {
+			return fmt.Errorf("invalid ROM size for simple layout")
+		}
+	case cardRomUpper:
+		if len(data) == 0x800 {
+			// The file has C800 to CFFF
+			// The 256 bytes in Cx00 are copied from the first page in C800
+			c.romCsxx = newMemoryRangeROM(0, data, "Slot ROM")
+			c.romC8xx = newMemoryRangeROM(0xc800, data, "Slot C8 ROM")
+		} else {
+			return fmt.Errorf("invalid ROM size for upper layout")
+		}
+	case cardRomUpperHalfEnd:
+		if len(data) == 0x400 {
+			// The file has C800 to CBFF for ROM
+			// The 256 bytes in Cx00 are copied from the last page in C800-CBFF
+			// Used on the Videx 80 columns card
+			c.romCsxx = newMemoryRangeROM(0, data[0x300:], "Slot ROM")
+			c.romC8xx = newMemoryRangeROM(0xc800, data, "Slot C8 ROM")
+		} else {
+			return fmt.Errorf("invalid ROM size for upper half end layout")
+		}
+	case cardRomFull:
+		if len(data) == 0x1000 {
+			// The file covers the full Cxxx range. Only showing the page
+			// corresponding to the slot used.
+			c.romCxxx = newMemoryRangeROM(0xc000, data, "Slot ROM")
+		} else if len(data)%0x1000 == 0 {
+			// The ROM covers the full Cxxx range with several pages
+			c.romCxxx = newMemoryRangePagedROM(0xc000, data, "Slot paged ROM", uint8(len(data)/0x1000))
+		} else {
+			return fmt.Errorf("invalid ROM size for full layout")
+		}
+	default:
+		return fmt.Errorf("invalid card ROM layout")
 	}
+
+	return nil
 }
 
 func (c *cardBase) assign(a *Apple2, slot int) {

cardBrainBoard.go

@@ -117,10 +117,8 @@ func (c *CardBrainBoard) updateState() {
 		((!c.dip56_lowerInA && !c.isBankB) || (!c.dip78_upperInB && c.isBankB))
 
 	if isMotherboardRomEnabled && !c.isMotherboardRomEnabled {
-		fmt.Print("ROM: main")
 		c.a.mmu.inhibitROM(nil)
 	} else if !isMotherboardRomEnabled && c.isMotherboardRomEnabled {
-		fmt.Print("ROM: brain")
 		c.a.mmu.inhibitROM(c)
 	}
 
@@ -159,7 +157,3 @@ func (c *CardBrainBoard) peek(address uint16) uint8 {
 func (c *CardBrainBoard) poke(address uint16, value uint8) {
 	// Nothing
 }
-
-func (c *CardBrainBoard) setBase(base uint16) {
-	// Nothing
-}

cardBrainBoard2.go

@@ -120,7 +120,3 @@ func (c *CardBrainBoardII) peek(address uint16) uint8 {
 func (c *CardBrainBoardII) poke(address uint16, value uint8) {
 	// Nothing
 }
-
-func (c *CardBrainBoardII) setBase(base uint16) {
-	// Nothing
-}

cardBuilder.go

@@ -28,6 +28,7 @@ const noCardName = "empty"
 var commonParams = []paramSpec{
 	{"trace", "Enable debug messages", "false"},
 	{"tracess", "Trace softswitches", "false"},
+	{"panicss", "Panic on unimplemented softswitches", "false"},
 }
 
 var cardFactory map[string]*cardBuilder
@@ -51,6 +52,9 @@ func getCardFactory() map[string]*cardBuilder {
 	cardFactory["mouse"] = newCardMouseBuilder()
 	cardFactory["multirom"] = newMultiRomCardBuilder()
 	cardFactory["parallel"] = newCardParallelPrinterBuilder()
+	cardFactory["prodosromdrive"] = newCardProDOSRomDriveBuilder()
+	cardFactory["prodosromcard3"] = newCardProDOSRomCard3Builder()
+	//cardFactory["prodosnvramdrive"] = newCardProDOSNVRAMDriveBuilder()
 	cardFactory["saturn"] = newCardSaturnBuilder()
 	cardFactory["smartport"] = newCardSmartPortStorageBuilder()
 	cardFactory["swyftcard"] = newCardSwyftBuilder()
@@ -66,6 +70,20 @@ func availableCards() []string {
 	return names
 }
 
+func (cb *cardBuilder) fullDefaultParams() map[string]string {
+	finalParams := make(map[string]string)
+	for _, commonParam := range commonParams {
+		finalParams[commonParam.name] = commonParam.defaultValue
+	}
+	if cb.defaultParams != nil {
+		for _, defaultParam := range *cb.defaultParams {
+			finalParams[defaultParam.name] = defaultParam.defaultValue
+		}
+	}
+
+	return finalParams
+}
+
 func setupCard(a *Apple2, slot int, paramString string) (Card, error) {
 	actualArgs := splitConfigurationString(paramString, ',')
 
@@ -83,16 +101,7 @@ func setupCard(a *Apple2, slot int, paramString string) (Card, error) {
 		return nil, fmt.Errorf("card %s requires an Apple IIe", builder.name)
 	}
 
-	finalParams := make(map[string]string)
-	for _, commonParam := range commonParams {
-		finalParams[commonParam.name] = commonParam.defaultValue
-	}
-	if builder.defaultParams != nil {
-		for _, defaultParam := range *builder.defaultParams {
-			finalParams[defaultParam.name] = defaultParam.defaultValue
-		}
-	}
-
+	finalParams := builder.fullDefaultParams()
 	for i := 1; i < len(actualArgs); i++ {
 		actualArgSides := splitConfigurationString(actualArgs[i], '=')
 		actualArgName := strings.ToLower(actualArgSides[0])
@@ -116,11 +125,14 @@ func setupCard(a *Apple2, slot int, paramString string) (Card, error) {
 	}
 
 	// Common parameters
-	traceSS := paramsGetBool(finalParams, "tracess")
-	if traceSS {
+	if paramsGetBool(finalParams, "tracess") {
 		a.io.traceSlot(slot)
 	}
 
+	if paramsGetBool(finalParams, "panicss") {
+		a.io.panicNotImplementedSlot(slot)
+	}
+
 	debug := paramsGetBool(finalParams, "trace")
 
 	card.setName(builder.name)

cardBuilder_test.go

@@ -0,0 +1,17 @@
+package izapple2
+
+import "testing"
+
+func TestCardBuilder(t *testing.T) {
+	cardFactory := getCardFactory()
+	for name, builder := range cardFactory {
+		if name != "prodosromdrive" && name != "prodosromcard3" && name != "prodosnvramdrive" {
+			t.Run(name, func(t *testing.T) {
+				_, err := builder.buildFunc(builder.fullDefaultParams())
+				if err != nil {
+					t.Errorf("Exception building card '%s': %s", name, err)
+				}
+			})
+		}
+	}
+}

cardDan2Controller.go

@@ -80,7 +80,7 @@ func newCardDan2ControllerBuilder() *cardBuilder {
 			if c.improved {
 				romFilename = "<internal>/Apple2CardFirmwareImproved.bin"
 			}
-			err := c.loadRomFromResource(romFilename)
+			err := c.loadRomFromResource(romFilename, cardRomSimple)
 			if err != nil {
 				return nil, err
 			}

cardDisk2.go

@@ -60,7 +60,7 @@ func newCardDisk2Builder() *cardBuilder {
 		},
 		buildFunc: func(params map[string]string) (Card, error) {
 			var c CardDisk2
-			err := c.loadRomFromResource("<internal>/DISK2.rom")
+			err := c.loadRomFromResource("<internal>/DISK2.rom", cardRomSimple)
 			if err != nil {
 				return nil, err
 			}

cardDisk2Sequencer.go

@@ -66,7 +66,7 @@ func newCardDisk2SequencerBuilder() *cardBuilder {
 		},
 		buildFunc: func(params map[string]string) (Card, error) {
 			var c CardDisk2Sequencer
-			err := c.loadRomFromResource("<internal>/DISK2.rom")
+			err := c.loadRomFromResource("<internal>/DISK2.rom", cardRomSimple)
 			if err != nil {
 				return nil, err
 			}

cardMemoryExpansion.go

@@ -35,6 +35,11 @@ has one Megabyte or less, reading the high address byte will always return a
 value in the range $F0-FF. The top nybble can be any value  when you write it,
 but it will always be “F” when you read it. If the card has more than one
 Megabyte of RAM, the top nybble will be a meaningful part of the address.
+
+Notes for RAMFactor:
+  - https://github.com/mamedev/mame/blob/master/src/devices/bus/a2bus/a2memexp.cpp
+  - ss 5 is for the ROM page, there are two.
+  - https://ae.applearchives.com/all_apple_iis/ramfactor/
 */
 const (
 	memoryExpansionMask = 0x000fffff // 10 bits, 1MB
@@ -65,7 +70,7 @@ func newCardMemoryExpansionBuilder() *cardBuilder {
 
 			var c CardMemoryExpansion
 			c.ram = make([]uint8, size*1024)
-			err = c.loadRomFromResource("<internal>/MemoryExpansionCard-341-0344a.bin")
+			err = c.loadRomFromResource("<internal>/MemoryExpansionCard-341-0344a.bin", cardRomFull)
 			if err != nil {
 				return nil, err
 			}

cardMultiRom.go

@@ -105,7 +105,3 @@ func (c *MultiRomCard) peek(address uint16) uint8 {
 func (c *MultiRomCard) poke(address uint16, value uint8) {
 	// Nothing
 }
-
-func (c *MultiRomCard) setBase(base uint16) {
-	// Nothing
-}

cardParallelPrinter.go

@@ -36,7 +36,7 @@ func newCardParallelPrinterBuilder() *cardBuilder {
 				return nil, err
 			}
 			c.file = f
-			err = c.loadRomFromResource("<internal>/Apple II Parallel Printer Interface Card ROM fixed.bin")
+			err = c.loadRomFromResource("<internal>/Apple II Parallel Printer Interface Card ROM fixed.bin", cardRomSimple)
 			if err != nil {
 				return nil, err
 			}

cardProDOSRomCard3.go

@@ -0,0 +1,133 @@
+package izapple2
+
+import "fmt"
+
+/*
+Ralle Palaveev's ProDOS-Romcard3
+
+See:
+	https://github.com/rallepaqlaveev/ProDOS-Romcard3
+
+Note that this card disables the C800-CFFF range only on writes to CFFF, not as most other cards that disable on reads and writes.
+
+*/
+
+// CardProDOSRomCard3 is a Memory Expansion card
+type CardProDOSRomCard3 struct {
+	cardBase
+	bank          uint16
+	data          []uint8
+	nvram         bool
+	secondROMPage bool
+}
+
+func newCardProDOSRomCard3Builder() *cardBuilder {
+	return &cardBuilder{
+		name:        "ProDOS ROM Card 3",
+		description: "A bootable 4 MB ROM card by Ralle Palaveev",
+		defaultParams: &[]paramSpec{
+			{"image", "ROM image with the ProDOS volume", "https://github.com/rallepalaveev/ProDOS-Romcard3/raw/main/ProDOS-ROMCARD3_4MB_A2D.v1.4_v37.po"},
+		},
+		buildFunc: func(params map[string]string) (Card, error) {
+			image := paramsGetPath(params, "image")
+			if image == "" {
+				return nil, fmt.Errorf("image required for the ProDOS ROM drive")
+			}
+
+			data, _, err := LoadResource(image)
+			if err != nil {
+				return nil, err
+			}
+
+			if len(data) != 4*1024*1024 {
+				return nil, fmt.Errorf("NVRAM image must be 4MB")
+			}
+
+			var c CardProDOSRomCard3
+			c.data = data
+			c.loadRom(data[0x200:0x300], cardRomSimple)
+			c.romC8xx = &c
+			return &c, nil
+		},
+	}
+}
+
+func newCardProDOSNVRAMDriveBuilder() *cardBuilder {
+	return &cardBuilder{
+		name:        "ProDOS 4MB NVRAM DRive",
+		description: "A bootable 4 MB NVRAM card by Ralle Palaveev",
+		defaultParams: &[]paramSpec{
+			{"image", "ROM image with the ProDOS volume", ""},
+		},
+		buildFunc: func(params map[string]string) (Card, error) {
+			image := paramsGetPath(params, "image")
+			if image == "" {
+				return nil, fmt.Errorf("image required for the ProDOS ROM drive")
+			}
+
+			data, _, err := LoadResource(image)
+			if err != nil {
+				return nil, err
+			}
+
+			if len(data) != 4*1024*1024 && len(data) != 512*1024 {
+				return nil, fmt.Errorf("NVRAM image must be 512KB or 4MB")
+			}
+
+			var c CardProDOSRomCard3
+			c.data = data
+			c.loadRom(data[0x200:0x400], cardRomSimple)
+			c.romC8xx = &c
+			c.nvram = true
+			return &c, nil
+		},
+	}
+}
+
+func (c *CardProDOSRomCard3) assign(a *Apple2, slot int) {
+
+	// Set pointer position
+	c.addCardSoftSwitchW(0, func(value uint8) {
+		c.bank = uint16(value) | c.bank&0xff00
+	}, "BANKLO")
+	c.addCardSoftSwitchW(1, func(value uint8) {
+		c.bank = uint16(value)<<8 | c.bank&0xff
+	}, "BANKHI")
+
+	if c.nvram {
+		c.addCardSoftSwitchW(2, func(value uint8) {
+			if c.secondROMPage {
+				c.romCsxx.setPage(0)
+			} else {
+				c.romCsxx.setPage(1)
+			}
+		}, "?????")
+	}
+
+	c.cardBase.assign(a, slot)
+}
+
+func (c *CardProDOSRomCard3) translateAddress(address uint16) int {
+	// An address from 0xC800 to 0xCFFF is mapped to the corresponding bank of the ROM
+	// There are 0x800 (2048) banks with 0x0800 (2048) bytes each
+	offset := address - 0xC800
+	pageAddress := int(c.bank&0x7FF) * 0x0800
+
+	//fmt.Printf("CardProDOSRomCard3.translateAddress: address=%04X, bank=%04X, offset=%04X, pageAddress=%08X\n", address, c.bank, offset, pageAddress)
+
+	return pageAddress + int(offset)
+}
+
+func (c *CardProDOSRomCard3) peek(address uint16) uint8 {
+	if address&0xff == 0 {
+		fmt.Printf("CardProDOSRomCard3.peek: address=%04X\n", address)
+	}
+	return c.data[c.translateAddress(address)]
+}
+
+func (c *CardProDOSRomCard3) poke(address uint16, value uint8) {
+	fmt.Printf("CardProDOSRomCard3.poke: address=%04X, value=%02X\n", address, value)
+	if c.nvram && address != 0xcfff {
+		c.data[c.translateAddress(address)] = value
+	}
+}

cardProDOSRomDrive.go

@@ -0,0 +1,73 @@
+package izapple2
+
+import "fmt"
+
+/*
+Terence Boldt's ProDOS-ROM-Drive: A bootable 1 MB solid state disk for Apple ][ computers
+
+Emulates version 4.0+
+
+See:
+	https://github.com/tjboldt/ProDOS-ROM-Drive
+	https://github.com/Alex-Kw/ProDOS-ROM-Drive-Images
+
+*/
+
+// CardMemoryExpansion is a Memory Expansion card
+type CardProDOSRomDrive struct {
+	cardBase
+	address uint16
+	data    []uint8
+}
+
+const proDOSRomDriveMask = 0xf_ffff // 1 MB mask
+
+func newCardProDOSRomDriveBuilder() *cardBuilder {
+	return &cardBuilder{
+		name:        "ProDOS ROM Drive",
+		description: "A bootable 1 MB solid state disk by Terence Boldt",
+		defaultParams: &[]paramSpec{
+			//{"image", "ROM image with the ProDOS volume", "https://github.com/tjboldt/ProDOS-ROM-Drive/raw/v4.0/Firmware/GamesWithFirmware.po"},
+			{"image", "ROM image with the ProDOS volume", "https://github.com/Alex-Kw/ProDOS-ROM-Drive-Images/raw/main/ProDOS_2.4.3_TJ.po"},
+		},
+		buildFunc: func(params map[string]string) (Card, error) {
+			image := paramsGetPath(params, "image")
+			if image == "" {
+				return nil, fmt.Errorf("image required for the ProDOS ROM drive")
+			}
+
+			data, _, err := LoadResource(image)
+			if err != nil {
+				return nil, err
+			}
+
+			var c CardProDOSRomDrive
+			c.data = data
+			c.loadRom(data[0x300:0x400], cardRomSimple)
+			return &c, nil
+		},
+	}
+}
+
+func (c *CardProDOSRomDrive) assign(a *Apple2, slot int) {
+
+	// Set pointer position
+	c.addCardSoftSwitchW(0, func(value uint8) {
+		c.address = uint16(value) | c.address&0xff00
+	}, "LATCHLO")
+	c.addCardSoftSwitchW(1, func(value uint8) {
+		c.address = uint16(value)<<8 | c.address&0xff
+	}, "LATCHHI")
+
+	// Read data
+	for i := uint8(0x0); i <= 0xf; i++ {
+		iCopy := i
+		c.addCardSoftSwitchR(iCopy, func() uint8 {
+			offset := uint32(c.address)<<4 + uint32(iCopy)
+			offset &= proDOSRomDriveMask
+			return c.data[offset]
+		}, fmt.Sprintf("READ%X", iCopy))
+	}
+
+	c.cardBase.assign(a, slot)
+}

cardSmartport.go

@@ -112,7 +112,7 @@ func (c *CardSmartPort) AddDevice(device smartPortDevice) {
 }
 
 func (c *CardSmartPort) assign(a *Apple2, slot int) {
-	c.loadRom(buildHardDiskRom(slot))
+	c.loadRom(buildHardDiskRom(slot), cardRomSimple)
 
 	c.addCardSoftSwitchR(0, func() uint8 {
 		// Prodos entry point

cardSwyft.go

@@ -135,7 +135,3 @@ func (c *CardSwyft) peek(address uint16) uint8 {
 func (c *CardSwyft) poke(address uint16, value uint8) {
 	// Nothing
 }
-
-func (c *CardSwyft) setBase(base uint16) {
-	// Nothing
-}

cardThunderClockPlus.go

@@ -33,7 +33,7 @@ func newCardThunderClockPlusBuilder() *cardBuilder {
 		description: "Clock card",
 		buildFunc: func(params map[string]string) (Card, error) {
 			var c CardThunderClockPlus
-			err := c.loadRomFromResource("<internal>/ThunderclockPlusROM.bin")
+			err := c.loadRomFromResource("<internal>/ThunderclockPlusROM.bin", cardRomUpper)
 			if err != nil {
 				return nil, err
 			}

cardVidHD.go

@@ -19,7 +19,7 @@ func newCardVidHDBuilder() *cardBuilder {
 		description: "Firmware signature of the VidHD card to trick Total Replay to use the SHR mode",
 		buildFunc: func(params map[string]string) (Card, error) {
 			var c CardVidHD
-			c.loadRom(buildVidHDRom())
+			c.loadRom(buildVidHDRom(), cardRomSimple)
 			return &c, nil
 		},
 	}

cardVidex.go

@@ -42,7 +42,7 @@ func newCardVidexBuilder() *cardBuilder {
 			var c CardVidex
 
 			// The C800 area has ROM and RAM
-			err := c.loadRomFromResource("<internal>/Videx Videoterm ROM 2.4.bin")
+			err := c.loadRomFromResource("<internal>/Videx Videoterm ROM 2.4.bin", cardRomUpperHalfEnd)
 			if err != nil {
 				return nil, err
 			}
@@ -123,10 +123,6 @@ func (c *CardVidex) poke(address uint16, value uint8) {
 	}
 }
 
-func (c *CardVidex) setBase(base uint16) {
-	// Nothing
-}
-
 const (
 	videxCharWidth = uint8(8)
 )

configs/2e.cfg

@@ -4,6 +4,4 @@ board: 2e
 rom: <internal>/Apple2e.rom
 charrom: <internal>/Apple IIe Video Unenhanced.bin
 s0: language
-s2: vidhd
-s3: fastchip
 s6: diskii,disk1=<internal>/dos33.dsk

doc/usage.txt

@@ -66,6 +66,8 @@ The available cards are:
   mouse: Mouse card implementation, does not emulate a real card, only the firmware behaviour
   multirom: Multiple Image ROM card
   parallel: Card to dump to a file what would be printed to a parallel printer
+  prodosromcard3: A bootable 4 MB ROM card by Ralle Palaveev
+  prodosromdrive: A bootable 1 MB solid state disk by Terence Boldt
   saturn: RAM card with 128Kb, it's like 8 language cards
   smartport: SmartPort interface card
   softswitchlogger: Card to log softswitch accesses
@@ -80,7 +82,7 @@ The available tracers are:
   mli: Trace ProDOS MLI calls
   mos: Trace MOS calls with Applecorn skipping terminal IO
   mosfull: Trace MOS calls with Applecorn
-  panicSS: Panic on unimplemented softswitches
+  panicss: Panic on unimplemented softswitches
   ss: Trace sotfswiches calls
   ssreg: Trace sotfswiches registrations
   ucsd: Trace UCSD system calls

dockerbuild/build_all.sh

@@ -2,7 +2,7 @@
 cd "$( dirname $0)"
 mkdir -p ${PWD}/build
 
-# MacOS builds
+# MacOS ARM builds
 echo "Building MacOS console frontend"
 CGO_ENABLED=1 go build -tags static -ldflags "-s -w" ../frontend/console
 mv console build/izapple2console_mac_arm64
@@ -15,6 +15,19 @@ echo "Building MacOS Fyne frontend"
 CGO_ENABLED=1 go build -tags static -ldflags "-s -w" ../frontend/a2fyne
 mv a2fyne build/izapple2fyne_mac_arm64
 
+# MacOS x64 builds
+echo "Building MacOS console frontend"
+GOARCH=amd64 CGO_ENABLED=1 go build -tags static -ldflags "-s -w" ../frontend/console
+mv console build/izapple2console_mac_amd64
+
+echo "Building MacOS SDL frontend"
+GOARCH=amd64 CGO_ENABLED=1 go build -tags static -ldflags "-s -w" ../frontend/a2sdl
+mv a2sdl build/izapple2sdl_mac_amd64
+
+echo "Building MacOS Fyne frontend"
+GOARCH=amd64 CGO_ENABLED=1 go build -tags static -ldflags "-s -w" ../frontend/a2fyne
+mv a2fyne build/izapple2fyne_mac_amd64∫
+
 # Linux and Windows dockerized builds
 echo "Building docker container for the Linux and Windows builds"
 docker build . -t apple2builder --platform linux/amd64

frontend/a2sdl/main.go

@@ -151,6 +151,7 @@ var helpMessage = `
 
         F1: Show/Hide help
    Ctrl-F2: Reset
+        F4: Show/Hide CPU trace
         F5: Fast/Normal speed
    Ctrl-F5: Show speed
         F6: Next screen mode
@@ -158,7 +159,6 @@ var helpMessage = `
        F10: Next character set
   Ctrl-F10: Show/Hide character set
  Shift-F10: Show/Hide alternate text
-       F11: Show/Hide CPU trace
        F12: Save screen snapshot
 	 Pause: Pause the emulation
 

frontend/a2sdl/sdlKeyboard.go

@@ -99,6 +99,8 @@ func (k *sdlKeyboard) putKey(keyEvent *sdl.KeyboardEvent) {
 		if ctrl {
 			k.a.SendCommand(izapple2.CommandReset)
 		}
+	case sdl.K_F4:
+		k.a.SendCommand(izapple2.CommandToggleCPUTrace)
 	case sdl.K_F5:
 		if ctrl {
 			k.a.SendCommand(izapple2.CommandShowSpeed)
@@ -123,8 +125,6 @@ func (k *sdlKeyboard) putKey(keyEvent *sdl.KeyboardEvent) {
 		} else {
 			k.a.SendCommand(izapple2.CommandNextCharGenPage)
 		}
-	case sdl.K_F11:
-		k.a.SendCommand(izapple2.CommandToggleCPUTrace)
 	case sdl.K_F12:
 		fallthrough
 	case sdl.K_PRINTSCREEN:

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	fyne.io/fyne/v2 v2.1.4
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3
-	github.com/ivanizag/iz6502 v1.3.2
+	github.com/ivanizag/iz6502 v1.4.0
 	github.com/pkg/profile v1.7.0
 	github.com/veandco/go-sdl2 v0.4.38
 	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a

go.sum

@@ -38,8 +38,8 @@ github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8I
 github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8=
 github.com/google/pprof v0.0.0-20240117000934-35fc243c5815/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
-github.com/ivanizag/iz6502 v1.3.2 h1:JQAxsGVXeerQc+L5wGpGPEgvX+yxLqpvm2Dx6aO7wGU=
-github.com/ivanizag/iz6502 v1.3.2/go.mod h1:h4gbw3IK6WCYawi00kBhQ4ACeQkGWgqbUeAgDaQpy6s=
+github.com/ivanizag/iz6502 v1.4.0 h1:7eYygUkCPwFRH0tf2JSg1k+Sy27wwPi3ActuVNVv1Uc=
+github.com/ivanizag/iz6502 v1.4.0/go.mod h1:h4gbw3IK6WCYawi00kBhQ4ACeQkGWgqbUeAgDaQpy6s=
 github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc=
 github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

ioC0Page.go

@@ -5,20 +5,20 @@ import (
 )
 
 type ioC0Page struct {
-	softSwitchesR       [256]softSwitchR
-	softSwitchesW       [256]softSwitchW
-	softSwitchesRName   [256]string
-	softSwitchesWName   [256]string
-	softSwitchesData    [128]uint8
-	keyboard            KeyboardProvider
-	speaker             SpeakerProvider
-	paddlesStrobeCycle  uint64
-	joysticks           JoysticksProvider
-	mouse               MouseProvider
-	apple2              *Apple2
-	traceMask           uint16 // A bit for each 16 softswitches
-	traceRegistrations  bool
-	panicNotImplemented bool
+	softSwitchesR      [256]softSwitchR
+	softSwitchesW      [256]softSwitchW
+	softSwitchesRName  [256]string
+	softSwitchesWName  [256]string
+	softSwitchesData   [128]uint8
+	keyboard           KeyboardProvider
+	speaker            SpeakerProvider
+	paddlesStrobeCycle uint64
+	joysticks          JoysticksProvider
+	mouse              MouseProvider
+	apple2             *Apple2
+	traceMask          uint16 // A bit for each 16 softswitches
+	panicMask          uint16 // A bit for each 16 softswitches
+	traceRegistrations bool
 }
 
 type softSwitchR func() uint8
@@ -65,7 +65,10 @@ func (p *ioC0Page) setTrace(trace bool) {
 
 func (p *ioC0Page) traceSlot(slot int) {
 	p.traceMask |= 1 << (8 + slot)
-	fmt.Printf("Slot %v traced %04x\n", slot, p.traceMask)
+}
+
+func (p *ioC0Page) panicNotImplementedSlot(slot int) {
+	p.panicMask |= 1 << (8 + slot)
 }
 
 func (p *ioC0Page) setTraceRegistrations(traceRegistrations bool) {
@@ -73,7 +76,11 @@ func (p *ioC0Page) setTraceRegistrations(traceRegistrations bool) {
 }
 
 func (p *ioC0Page) setPanicNotImplemented(value bool) {
-	p.panicNotImplemented = value
+	if value {
+		p.panicMask = 0xffff
+	} else {
+		p.panicMask = 0x0000
+	}
 }
 
 func (p *ioC0Page) addSoftSwitchRW(address uint8, ss softSwitchR, name string) {
@@ -121,10 +128,16 @@ func (p *ioC0Page) setMouseProvider(m MouseProvider) {
 
 func (p *ioC0Page) isTraced(address uint16) bool {
 	ss := address & 0xff
-	return ss != 0xc000 && // Do not trace the spammy keyboard softswitch
+	return address != 0xc000 && // Do not trace the spammy keyboard softswitch
 		(p.traceMask&(1<<(ss>>4))) != 0
 }
 
+func (p *ioC0Page) isPanicNotImplemented(address uint16) bool {
+	ss := address & 0xff
+	return ss != 0xc068 && // Ignore known IIGS softswitch
+		(p.panicMask&(1<<(ss>>4))) != 0
+}
+
 func (p *ioC0Page) peek(address uint16) uint8 {
 	pageAddress := uint8(address)
 	ss := p.softSwitchesR[pageAddress]
@@ -132,7 +145,7 @@ func (p *ioC0Page) peek(address uint16) uint8 {
 		if p.isTraced(address) {
 			fmt.Printf("Unknown softswitch on read to $%04x\n", address)
 		}
-		if p.panicNotImplemented {
+		if p.isPanicNotImplemented(address) {
 			panic(fmt.Sprintf("Unknown softswitch on read to $%04x", address))
 		}
 		return 0
@@ -152,7 +165,7 @@ func (p *ioC0Page) poke(address uint16, value uint8) {
 		if p.isTraced(address) {
 			fmt.Printf("Unknown softswitch on write $%02x to $%04x\n", value, address)
 		}
-		if p.panicNotImplemented {
+		if p.isPanicNotImplemented(address) {
 			panic(fmt.Sprintf("Unknown softswitch on write to $%04x", address))
 		}
 		return
@@ -164,10 +177,6 @@ func (p *ioC0Page) poke(address uint16, value uint8) {
 	ss(value)
 }
 
-func (p *ioC0Page) setBase(_ uint16) {
-	// Ignore
-}
-
 func ssFromBool(value bool) uint8 {
 	if value {
 		return ssOn

memoryManager.go

@@ -68,7 +68,6 @@ const (
 type memoryHandler interface {
 	peek(uint16) uint8
 	poke(uint16, uint8)
-	setBase(uint16)
 }
 
 func newMemoryManager(a *Apple2) *memoryManager {
@@ -105,7 +104,14 @@ func (mmu *memoryManager) accessCArea(address uint16) memoryHandler {
 	// Extra slot area reset
 	if address == ioC8Off {
 		// Reset extra slot area owner
-		mmu.activeSlot = 0
+
+		// There is not really an activeSlot in c8xx, any card could be active
+		// we should check all of them and maybe have conflicts. As I don't do that I won't disable and
+		// just track teh last active card.
+		// This code is disabled because cards could have different logic for disabling. Most cards disable
+		// on access to 0xCFFF, but the ProDOS ROM card 3 disables only on writes and not on reads.
+		// mmu.activeSlot = 0
+
 		mmu.intC8ROMActive = false
 	}
 

noSlotClockDS1216.go

@@ -141,10 +141,6 @@ func (nsc *noSlotClockDS1216) poke(address uint16, value uint8) {
 	nsc.memory.poke(address, value)
 }
 
-func (nsc *noSlotClockDS1216) setBase(base uint16) {
-	nsc.memory.setBase(base)
-}
-
 func (nsc *noSlotClockDS1216) loadTime() {
 	now := time.Now()
 

resources.go

@@ -39,6 +39,14 @@ func LoadResource(filename string) ([]uint8, bool, error) {
 		filename = filename[1 : len(filename)-1]
 	}
 
+	// Expand the tilde if prefixed by it
+	if strings.HasPrefix(filename, "~") {
+		home, err := os.UserHomeDir()
+		if err == nil {
+			filename = home + filename[1:]
+		}
+	}
+
 	var writeable bool
 	var file io.Reader
 	if isInternalResource(filename) {

traceBuilder.go

@@ -64,8 +64,8 @@ func getTracerFactory() map[string]*traceBuilder {
 		description: "Trace sotfswiches registrations",
 		connectFunc: func(a *Apple2) { a.io.setTraceRegistrations(true) },
 	}
-	tracerFactory["panicSS"] = &traceBuilder{
-		name:        "panicSS",
+	tracerFactory["panicss"] = &traceBuilder{
+		name:        "panicss",
 		description: "Panic on unimplemented softswitches",
 		connectFunc: func(a *Apple2) { a.io.setPanicNotImplemented(true) },
 	}

traceProDOS.go

@@ -189,6 +189,8 @@ func (t *traceProDOS) dumpMLIReturn() {
 		default:
 			fmt.Printf("Ok\n")
 		}
+
+		t.a.cpu.SetTrace(false)
 	}
 }
 
@@ -217,7 +219,7 @@ func (t *traceProDOS) dumpDriverCall() {
 	if int(command) < len(proDosCommandNames) {
 		commandName = proDosCommandNames[command]
 	}
-	fmt.Printf("\n  Prodos driver $%04x command %02x-%s on unit $%x, block %v to $%04x ==> ", pc, command, commandName, unit, block, address)
+	fmt.Printf("\n  Prodos driver $%04x command %02x-%s on unit $%x, block %v to/from $%04x ==> ", pc, command, commandName, unit, block, address)
 }
 
 //lint:ignore U1000 unused but stays as reference