ac6502 1.11.0 → 1.13.0

package/src/components/Machine.ts

@@ -12,9 +12,6 @@ import { Video } from './IO/Video'
 import { KeyboardMatrixAttachment } from './IO/Attachments/KeyboardMatrixAttachment'
 import { KeyboardEncoderAttachment } from './IO/Attachments/KeyboardEncoderAttachment'
 import { JoystickAttachment } from './IO/Attachments/JoystickAttachment'
-import { LCDAttachment } from './IO/Attachments/LCDAttachment'
-import { KeypadAttachment } from './IO/Attachments/KeypadAttachment'
-import { Empty } from './IO/Empty'
 import { IO } from './IO'
 
 export class Machine {
@@ -29,14 +26,14 @@ export class Machine {
   rom: ROM
   cart?: Cart
 
-  io1: IO
-  io2: IO
-  io3: IO
-  io4: IO
-  io5: IO
-  io6: IO
-  io7: IO
-  io8: IO
+  io1!: IO
+  io2!: IO
+  io3!: IO
+  io4!: IO
+  io5!: IO
+  io6!: IO
+  io7!: IO
+  io8!: IO
 
   // VIA Attachments
   keyboardMatrixAttachment?: KeyboardMatrixAttachment
@@ -44,11 +41,6 @@ export class Machine {
   joystickAttachmentA?: JoystickAttachment
   joystickAttachmentB?: JoystickAttachment
 
-  // KIM mode attachments
-  lcdAttachment?: LCDAttachment
-  keypadAttachment?: KeypadAttachment
-
-  target: string
   isRunning: boolean = false
   frequency: number = 1000000 // 1 MHz
   scale: number = 2
@@ -64,194 +56,62 @@ export class Machine {
   // Initialization
   //
 
-  constructor(target: string) {
-    this.target = target
+  constructor() {
     this.cpu = new CPU(this.read.bind(this), this.write.bind(this))
     this.ram = new RAM()
     this.rom = new ROM()
 
-    this.io1 = new Empty()
-    this.io2 = new Empty()
-    this.io3 = new Empty()
-    this.io4 = new Empty()
-    this.io5 = new Empty()
-    this.io6 = new Empty()
-    this.io7 = new Empty()
-    this.io8 = new Empty()
-
-    this.configureTarget(target)
+    this.configure()
     
     this.startTime = Date.now()
     this.cpu.reset()
   }
 
-  configureTarget(target: string): void {
-    if (target === 'kim') {
-      const acia = new ACIA()
-      this.io5 = acia
-
-      // Connect ACIA transmit callback
-      acia.transmit = (data: number) => {
-        if (this.transmit) {
-          this.transmit(data)
-        }
-      }
-
-      this.io1 = new Empty()
-      this.io2 = new Empty()
-      this.io3 = new Empty()
-      this.io4 = new Empty()
-      this.io6 = new Empty()
-      this.io7 = new Empty()
-
-      const via = new VIA()
-      this.io8 = via
-
-      // Create KIM GPIO Attachments
-      this.lcdAttachment = new LCDAttachment(16, 2, 10)
-      this.keypadAttachment = new KeypadAttachment(true, 20)
-
-      // Attach LCD to Port A (control: RS/RW/E on bits 5-7) and Port B (data bus)
-      via.attachToPortA(this.lcdAttachment)
-      via.attachToPortB(this.lcdAttachment)
-
-      // Attach keypad to Port A (bits 0-4)
-      via.attachToPortA(this.keypadAttachment)
-    } else if (target === 'dev') {
-      const acia = new ACIA()
-      this.io5 = acia
-
-      // Connect ACIA transmit callback
-      acia.transmit = (data: number) => {
-        if (this.transmit) {
-          this.transmit(data)
-        }
-      }
-
-      const rtc = new RTC()
-      const storage = new Storage()
-      const via = new VIA()
-      const sound = new Sound()
-      const video = new Video()
-
-      this.io1 = new RAMBank()
-      this.io2 = new RAMBank()
-      this.io3 = rtc
-      this.io4 = storage
-      this.io6 = via
-      this.io7 = sound
-      this.io8 = video
-
-      // Connect Sound pushSamples callback
-      sound.pushSamples = (samples: Float32Array) => {
-        if (this.play) {
-          this.play(samples)
-        }
-      }
-
-      // Create standard GPIO attachments
-      this.keyboardMatrixAttachment = new KeyboardMatrixAttachment(10)
-      this.keyboardEncoderAttachment = new KeyboardEncoderAttachment(20)
-      this.joystickAttachmentA = new JoystickAttachment(false, 100)
-      this.joystickAttachmentB = new JoystickAttachment(false, 100)
-
-      // Attach peripherals to GPIO Card
-      via.attachToPortA(this.keyboardMatrixAttachment)
-      via.attachToPortB(this.keyboardMatrixAttachment)
-      via.attachToPortA(this.keyboardEncoderAttachment)
-      via.attachToPortB(this.keyboardEncoderAttachment)
-      via.attachToPortA(this.joystickAttachmentA)
-      via.attachToPortB(this.joystickAttachmentB)
-    } else if (target === 'vcs') {
-      this.io5 = new Empty()
-
-      const via = new VIA()
-      const sound = new Sound()
-      const video = new Video()
-
-      this.io1 = new Empty()
-      this.io2 = new Empty()
-      this.io3 = new Empty()
-      this.io4 = new Empty()
-      this.io6 = via
-      this.io7 = sound
-      this.io8 = video
-
-      // Connect Sound pushSamples callback
-      sound.pushSamples = (samples: Float32Array) => {
-        if (this.play) {
-          this.play(samples)
-        }
-      }
+  private configure(): void {
+    const acia = new ACIA()
+    this.io5 = acia
 
-      // Create standard GPIO attachments
-      this.keyboardMatrixAttachment = new KeyboardMatrixAttachment(10)
-      this.keyboardEncoderAttachment = new KeyboardEncoderAttachment(20)
-      this.joystickAttachmentA = new JoystickAttachment(false, 100)
-      this.joystickAttachmentB = new JoystickAttachment(false, 100)
-
-      // Attach peripherals to GPIO Card
-      via.attachToPortA(this.keyboardMatrixAttachment)
-      via.attachToPortB(this.keyboardMatrixAttachment)
-      via.attachToPortA(this.keyboardEncoderAttachment)
-      via.attachToPortB(this.keyboardEncoderAttachment)
-      via.attachToPortA(this.joystickAttachmentA)
-      via.attachToPortB(this.joystickAttachmentB)
-    } else if (target === 'cob') {
-      const acia = new ACIA()
-      this.io5 = acia
-
-      // Connect ACIA transmit callback
-      acia.transmit = (data: number) => {
-        if (this.transmit) {
-          this.transmit(data)
-        }
+    // Connect ACIA transmit callback
+    acia.transmit = (data: number) => {
+      if (this.transmit) {
+        this.transmit(data)
       }
+    }
 
-      const rtc = new RTC()
-      const storage = new Storage()
-      const via = new VIA()
-      const sound = new Sound()
-      const video = new Video()
-
-      this.io1 = new RAMBank()
-      this.io2 = new RAMBank()
-      this.io3 = rtc
-      this.io4 = storage
-      this.io6 = via
-      this.io7 = sound
-      this.io8 = video
-
-      // Connect Sound pushSamples callback
-      sound.pushSamples = (samples: Float32Array) => {
-        if (this.play) {
-          this.play(samples)
-        }
+    const rtc = new RTC()
+    const storage = new Storage()
+    const via = new VIA()
+    const sound = new Sound()
+    const video = new Video()
+
+    this.io1 = new RAMBank()
+    this.io2 = new RAMBank()
+    this.io3 = rtc
+    this.io4 = storage
+    this.io6 = via
+    this.io7 = sound
+    this.io8 = video
+
+    // Connect Sound pushSamples callback
+    sound.pushSamples = (samples: Float32Array) => {
+      if (this.play) {
+        this.play(samples)
       }
-
-      // Create standard GPIO attachments
-      this.keyboardMatrixAttachment = new KeyboardMatrixAttachment(10)
-      this.keyboardEncoderAttachment = new KeyboardEncoderAttachment(20)
-      this.joystickAttachmentA = new JoystickAttachment(false, 100)
-      this.joystickAttachmentB = new JoystickAttachment(false, 100)
-
-      // Attach peripherals to GPIO Card
-      via.attachToPortA(this.keyboardMatrixAttachment)
-      via.attachToPortB(this.keyboardMatrixAttachment)
-      via.attachToPortA(this.keyboardEncoderAttachment)
-      via.attachToPortB(this.keyboardEncoderAttachment)
-      via.attachToPortA(this.joystickAttachmentA)
-      via.attachToPortB(this.joystickAttachmentB)
-    } else {
-      this.io1 = new Empty()
-      this.io2 = new Empty()
-      this.io3 = new Empty()
-      this.io4 = new Empty()
-      this.io5 = new Empty()
-      this.io6 = new Empty()
-      this.io7 = new Empty()
-      this.io8 = new Empty()
     }
+
+    // Create standard GPIO attachments
+    this.keyboardMatrixAttachment = new KeyboardMatrixAttachment(10)
+    this.keyboardEncoderAttachment = new KeyboardEncoderAttachment(20)
+    this.joystickAttachmentA = new JoystickAttachment(false, 100)
+    this.joystickAttachmentB = new JoystickAttachment(false, 100)
+
+    // Attach peripherals to GPIO Card
+    via.attachToPortA(this.keyboardMatrixAttachment)
+    via.attachToPortB(this.keyboardMatrixAttachment)
+    via.attachToPortA(this.keyboardEncoderAttachment)
+    via.attachToPortB(this.keyboardEncoderAttachment)
+    via.attachToPortA(this.joystickAttachmentA)
+    via.attachToPortB(this.joystickAttachmentB)
   }
 
   //
@@ -350,25 +210,17 @@ export class Machine {
   }
 
   onReceive(data: number): void {
-    if (this.target !== 'vcs') {
-      (this.io5 as ACIA).onData(data) // Pass data to Serial card
-    }
+    (this.io5 as ACIA).onData(data) // Pass data to Serial card
   }
 
   onKeyDown(scancode: number): void {
-    if (this.target === 'kim') {
-      this.keypadAttachment?.updateKey(scancode, true)
-    } else {
-      this.keyboardMatrixAttachment?.updateKey(scancode, true)
-      this.keyboardEncoderAttachment?.updateKey(scancode, true)
-    }
+    this.keyboardMatrixAttachment?.updateKey(scancode, true)
+    this.keyboardEncoderAttachment?.updateKey(scancode, true)
   }
 
   onKeyUp(scancode: number): void {
-    if (this.target !== 'kim') {
-      this.keyboardMatrixAttachment?.updateKey(scancode, false)
-      this.keyboardEncoderAttachment?.updateKey(scancode, false)
-    }
+    this.keyboardMatrixAttachment?.updateKey(scancode, false)
+    this.keyboardEncoderAttachment?.updateKey(scancode, false)
   }
 
   onJoystickA(buttons: number): void {
@@ -408,13 +260,10 @@ export class Machine {
       (this as any)._accumulatorMs = accumulator
     }
 
-    if (this.render && (this.target === 'kim' || this.target === 'dev')) {
-      this.render()
-      this.frames += 1
-    } else if (this.render && (this.target === 'cob' || this.target === 'vcs')) {
-      const Video = this.io8 as Video
-      if (Video.frameReady) {
-        Video.frameReady = false
+    if (this.render) {
+      const video = this.io8 as Video
+      if (video.frameReady) {
+        video.frameReady = false
         this.render()
         this.frames += 1
       }

package/src/index.ts

@@ -11,7 +11,7 @@ import sdl from '@kmamal/sdl'
 import { readFile, writeFile } from 'fs/promises'
 import { existsSync } from 'fs'
 
-const VERSION = '1.11.0'
+const VERSION = '1.13.0'
 const WIDTH = 320
 const HEIGHT = 240
 
@@ -37,6 +37,7 @@ const AXIS_THRESHOLD = 0.5
 interface EmulatorOptions {
   cart?: string
   freq?: string
+  program?: string
   rom?: string
   scale?: string
   baudrate?: string
@@ -45,7 +46,6 @@ interface EmulatorOptions {
   stopbits?: string
   port?: string
   storage?: string
-  target?: string
   encoder?: string
 }
 
@@ -61,7 +61,7 @@ class Emulator {
 
   constructor(options: EmulatorOptions) {
     this.options = options
-    this.machine = new Machine(options.target ?? 'cob')
+    this.machine = new Machine()
     this.controllers = new Map()
     this.joystickButtonStateA = 0x00
     this.joystickButtonStateB = 0x00
@@ -78,6 +78,26 @@ class Emulator {
     this.setupWindow()
     this.setupControllers()
     this.machine.reset(true)
+    await this.loadProgram()
+  }
+
+  private async loadProgram(): Promise<void> {
+    if (this.options.program) {
+      const programData = await readFile(this.options.program)
+      const programStart = 0x0800
+      const programEnd = 0x7FFF
+      const maxSize = programEnd - programStart + 1
+      if (programData.length > maxSize) {
+        console.log(`Error: Program file too large (${programData.length} bytes, max ${maxSize} bytes)`)
+        process.exit(1)
+      }
+      for (let i = 0; i < programData.length; i++) {
+        this.machine.ram.write(programStart + i, programData[i])
+      }
+      console.log(`Loaded Program: ${this.options.program} (${programData.length} bytes at $${programStart.toString(16).toUpperCase().padStart(4, '0')})`)
+    } else {
+      console.log('Loaded Program: NONE')
+    }
   }
 
   private validateOptions(): void {
@@ -111,7 +131,7 @@ class Emulator {
       console.log('Loaded Cart: NONE')
     }
 
-    if (this.options.storage && this.options.target !== 'kim') {
+    if (this.options.storage) {
       if (existsSync(this.options.storage)) {
         const storageData = await readFile(this.options.storage)
         ;(this.machine.io4 as Storage).loadData(new Uint8Array(storageData))
@@ -217,7 +237,6 @@ class Emulator {
   }
 
   private setupAudio(): void {
-    if (this.options.target === 'kim') return
     try {
       this.audioDevice = sdl.audio.openDevice({ type: 'playback' }, {
         channels: AUDIO_CHANNELS as 1,
@@ -226,10 +245,7 @@ class Emulator {
         buffered: AUDIO_BUFFERED,
       })
 
-      // Configure Sound sample rate to match audio device (not needed for dev target)
-      if (this.options.target !== 'dev') {
-        ;(this.machine.io7 as Sound).sampleRate = this.audioDevice.frequency
-      }
+      ;(this.machine.io7 as Sound).sampleRate = this.audioDevice.frequency
 
       // Connect the Machine's audio callback to the SDL audio device
       this.machine.play = (samples: Float32Array) => {
@@ -254,29 +270,10 @@ class Emulator {
   }
 
   private setupWindow(): void {
-    const isKIM = this.options.target === 'kim'
-    const lcd = this.machine.lcdAttachment
-
-    // LCD dot-matrix rendering constants
-    const DOT_SIZE = 2      // Each LCD dot rendered as DOT_SIZE x DOT_SIZE pixels
-    const DOT_GAP = 1       // Gap between dots
-    const LCD_PADDING = 8   // Green border padding around the display
-    const CELL = DOT_SIZE + DOT_GAP
-
-    let windowWidth: number
-    let windowHeight: number
-    if (isKIM && lcd) {
-      windowWidth = LCD_PADDING * 2 + lcd.pixelsWidth * CELL
-      windowHeight = LCD_PADDING * 2 + lcd.pixelsHeight * CELL
-    } else {
-      windowWidth = WIDTH
-      windowHeight = HEIGHT
-    }
-
     this.window = sdl.video.createWindow({
-      title: `6502 Emulator (${(this.options.target ?? 'cob').toUpperCase()})`,
-      width: windowWidth * this.machine.scale,
-      height: windowHeight * this.machine.scale,
+      title: '6502 Emulator (COB)',
+      width: WIDTH * this.machine.scale,
+      height: HEIGHT * this.machine.scale,
       accelerated: true,
       vsync: true
     })
@@ -291,83 +288,10 @@ class Emulator {
       this.machine.onKeyUp(event.scancode)
     })
 
-    if (isKIM && lcd) {
-      const lcdWidth = lcd.pixelsWidth
-      const lcdHeight = lcd.pixelsHeight
-      const renderWidth = windowWidth
-      const renderHeight = windowHeight
-      const rgbaBuffer = Buffer.alloc(renderWidth * renderHeight * 4)
-
-      // Pre-fill with background color (LCD green for padding + gaps)
-      for (let i = 0; i < renderWidth * renderHeight; i++) {
-        const off = i * 4
-        rgbaBuffer[off] = 0x50
-        rgbaBuffer[off + 1] = 0x88
-        rgbaBuffer[off + 2] = 0x38
-        rgbaBuffer[off + 3] = 0xFF
-      }
-
-      this.machine.render = () => {
-        if (!this.window) { return }
-        const buf = lcd.buffer
-
-        // Reset buffer to background color
-        for (let i = 0; i < renderWidth * renderHeight; i++) {
-          const off = i * 4
-          rgbaBuffer[off] = 0x50
-          rgbaBuffer[off + 1] = 0x88
-          rgbaBuffer[off + 2] = 0x38
-          rgbaBuffer[off + 3] = 0xFF
-        }
-
-        // Render each buffer pixel as a dot block
-        for (let by = 0; by < lcdHeight; by++) {
-          for (let bx = 0; bx < lcdWidth; bx++) {
-            const val = buf[by * lcdWidth + bx]
-
-            if (val < 0) {
-              // Gap pixel - skip, shows background color
-              continue
-            }
-
-            let r: number, g: number, b: number
-            if (val === 0) {
-              // Pixel off - slightly brighter than background for visible dot grid
-              r = 0x60; g = 0xA0; b = 0x40
-            } else {
-              // Pixel on - dark
-              r = 0x10; g = 0x20; b = 0x10
-            }
-
-            // Draw DOT_SIZE x DOT_SIZE block
-            const screenX = LCD_PADDING + bx * CELL
-            const screenY = LCD_PADDING + by * CELL
-            for (let dy = 0; dy < DOT_SIZE; dy++) {
-              for (let dx = 0; dx < DOT_SIZE; dx++) {
-                const off = ((screenY + dy) * renderWidth + (screenX + dx)) * 4
-                rgbaBuffer[off] = r
-                rgbaBuffer[off + 1] = g
-                rgbaBuffer[off + 2] = b
-                rgbaBuffer[off + 3] = 0xFF
-              }
-            }
-          }
-        }
-
-        this.window.render(renderWidth, renderHeight, renderWidth * 4, 'rgba32', rgbaBuffer)
-      }
-    } else if (this.options.target === 'cob' || this.options.target === 'vcs') {
-      const Video = this.machine.io8 as Video
-      this.machine.render = () => {
-        if (!this.window) { return }
-        this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', Video.buffer)
-      }
-    } else if (this.options.target === 'dev') {
-      const video = this.machine.io8 as Video
-      this.machine.render = () => {
-        if (!this.window) { return }
-        this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', video.buffer)
-      }
+    const video = this.machine.io8 as Video
+    this.machine.render = () => {
+      if (!this.window) { return }
+      this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', video.buffer)
     }
 
     this.window.on('close', () => this.shutdown())
@@ -379,7 +303,6 @@ class Emulator {
   }
 
   private setupControllers(): void {
-    if (this.options.target === 'kim') return
     // Controller device add/remove handlers
     (sdl.controller as any).on('deviceAdd', (device: any) => {
       console.log(`Controller added: ${device.name || device.id}`)
@@ -557,7 +480,7 @@ class Emulator {
     })
     
     // Save storage data if path was provided
-    if (this.options.storage && this.options.target !== 'kim') {
+    if (this.options.storage) {
       const storageData = (this.machine.io4 as Storage).getData()
       writeFile(this.options.storage, storageData).then(() => {
         console.log(`Storage saved to: ${this.options.storage}`)
@@ -588,12 +511,12 @@ program
   .addOption(new Option('-c, --cart <path>', 'Path to 32K Cart binary file'))
   .addOption(new Option('-d, --databits <databits>', 'Data Bits (5 | 6 | 7 | 8)').default('8'))
   .addOption(new Option('-f, --freq <freq>', 'Set the clock frequency in Hz').default('1000000'))
+  .addOption(new Option('-g, --program <path>', 'Path to program binary file (loaded into RAM at $0800-$7FFF)'))
   .addOption(new Option('-p, --port <port>', 'Path to the serial port (e.g., /dev/ttyUSB0)'))
   .addOption(new Option('-r, --rom <path>', 'Path to 32K ROM binary file'))
   .addOption(new Option('-s, --scale <scale>', 'Set the emulator scale').default('2'))
   .addOption(new Option('-S, --storage <path>', 'Path to storage data file for Compact Flash card persistence'))
   .addOption(new Option('-t, --stopbits <stopbits>', 'Stop Bits (1 | 1.5 | 2)').default('1'))
-  .addOption(new Option('-T, --target <target>', 'System target').choices(['cob', 'vcs', 'kim', 'dev']).default('cob'))
   .addOption(new Option('-e, --encoder <mode>', 'Keyboard encoder active port (ps2 = Port A / CA1, matrix = Port B / CB1)').choices(['ps2', 'matrix', 'both']).default('matrix'))
   .addHelpText('beforeAll', figlet.textSync('6502 Emulator', { font: 'cricket' }) + '\n' + `Version: ${VERSION} | A.C. Wright Design\n`)
   .parse(process.argv)

package/src/lib.ts

@@ -22,5 +22,3 @@ export { AttachmentBase } from './components/IO/Attachments/Attachment'
 export { JoystickAttachment } from './components/IO/Attachments/JoystickAttachment'
 export { KeyboardEncoderAttachment } from './components/IO/Attachments/KeyboardEncoderAttachment'
 export { KeyboardMatrixAttachment } from './components/IO/Attachments/KeyboardMatrixAttachment'
-export { KeypadAttachment } from './components/IO/Attachments/KeypadAttachment'
-export { LCDAttachment } from './components/IO/Attachments/LCDAttachment'

package/src/tests/Machine.test.ts

@@ -8,7 +8,7 @@ describe('Machine', () => {
   let machine: Machine
 
   beforeEach(() => {
-    machine = new Machine('cob')
+    machine = new Machine()
   })
 
   afterEach(() => {