ac6502 1.10.0 → 1.12.0

package/README.md

@@ -4,7 +4,7 @@ A comprehensive, cycle-accurate emulator for the [A.C. Wright 6502](https://gith
 
 ## Overview
 
-This emulator provides a complete software implementation of a 65C02-based computer system, designed to run the same code as the hardware implementation. It features full I/O peripheral support, including video, sound, serial communication, storage, and GPIO interfaces. The emulator supports four different system configurations (targets) to accommodate various use cases from full-featured systems to minimal development boards.
+This emulator provides a complete software implementation of a 65C02-based computer system, designed to run the same code as the hardware implementation. It features full I/O peripheral support, including video, sound, serial communication, storage, and GPIO interfaces.
 
 ## Features
 
@@ -42,7 +42,6 @@ This emulator provides a complete software implementation of a 65C02-based compu
 - **Input Devices**
   - Keyboard support (matrix and encoder modes)
   - Joystick/gamepad support with button mapping (dual controller support)
-  - Keypad support (KIM mode)
   - SDL input handling
   
 - **Development Features**
@@ -59,16 +58,11 @@ Get up and running in seconds:
 # Install globally
 npm install -g ac6502
 
-# Run the emulator (default COB target)
+# Run the emulator
 ac6502
 
 # Load a ROM
 ac6502 --rom /path/to/rom.bin
-
-# Run in different system configurations
-ac6502 --target kim --rom /path/to/kim.bin
-ac6502 --target dev --cart /path/to/program.bin
-ac6502 --target vcs --cart /path/to/game.bin
 ```
 
 ## Installation
@@ -120,7 +114,6 @@ ac6502 [options]
 - `-r, --rom <path>` - Load a system ROM file
 - `-f, --freq <frequency>` - Set CPU frequency in Hz (default: 1000000)
 - `-s, --scale <factor>` - Set display scale factor (default: 1)
-- `-T, --target <target>` - System target: cob, vcs, kim, dev (default: cob)
 - `-p, --port <device>` - Serial port device path
 - `-b, --baudrate <rate>` - Serial baud rate (default: 9600)
 - `-a, --parity <type>` - Serial parity: none, even, odd (default: none)
@@ -135,99 +128,29 @@ ac6502 [options]
 Load a cartridge:
 
 ```bash
-ac6502 --cart /path/to/game.bin
+ac6502 --rom /path/to/rom.bin --cart /path/to/cart.bin
 ```
 
 Connect to serial hardware:
 
 ```bash
-ac6502 --port /dev/ttyUSB0 --baudrate 9600 --rom /path/to/monitor.bin
-```
-
-Run in KIM mode with LCD and keypad:
-
-```bash
-ac6502 --target kim --rom /path/to/kim.bin --scale 2
-```
-
-Run in development mode with terminal:
-
-```bash
-ac6502 --target dev --cart /path/to/program.bin
+ac6502 --port /dev/ttyUSB0 --baudrate 9600 --rom /path/to/rom.bin
 ```
 
 Set custom CPU frequency and storage:
 
 ```bash
-ac6502 --freq 2000000 --storage ./disk.img --cart /path/to/program.bin
+ac6502 --freq 2000000 --storage ./disk.img --rom /path/to/rom.bin --cart /path/to/cart.bin
 ```
 
 ## Architecture
 
-### System Targets
-
-The emulator supports four different system configurations via the `--target` option:
-
-#### COB (Complete On-Board) - Default
-
-Full-featured system with all peripherals:
-
-```
-Machine (COB)
-├── CPU (65C02)
-├── RAM (System Memory)
-├── ROM (System BIOS/Monitor)
-├── Cart (Optional Cartridge)
-└── I/O Cards (8 slots)
-    ├── IO1: RAM Card (Expansion)
-    ├── IO2: RAM Card (Expansion)
-    ├── IO3: RTC Card (DS1511Y+ Real-Time Clock)
-    ├── IO4: Storage Card (Compact Flash 8-bit IDE Mode)
-    ├── IO5: Serial Card (6551 ACIA)
-    ├── IO6: VIA Card (6522 GPIO)
-    ├── IO7: Sound Card (6581 SID)
-    └── IO8: Video Card (TMS9918)
-```
-
-#### VCS (Video Computer System)
+### System Configuration
 
-Minimal system focused on video and sound:
+The emulator implements a full-featured 65C02 system with all peripherals:
 
 ```
-Machine (VCS)
-├── CPU (65C02)
-├── RAM (System Memory)
-├── ROM (System BIOS/Monitor)
-├── Cart (Optional Cartridge)
-└── I/O Cards (8 slots)
-    ├── IO6: VIA Card (6522 GPIO)
-    ├── IO7: Sound Card (6581 SID)
-    └── IO8: Video Card (TMS9918)
-```
-
-#### KIM (Keyboard Input Monitor)
-
-Single-board computer with LCD and keypad:
-
-```
-Machine (KIM)
-├── CPU (65C02)
-├── RAM (System Memory)
-├── ROM (System BIOS/Monitor)
-├── Cart (Optional Cartridge)
-└── I/O Cards (8 slots)
-    ├── IO5: Serial Card (6551 ACIA)
-    └── IO8: VIA Card (6522 GPIO)
-            ├── LCD Attachment (HD44780 16×2 character display)
-            └── Keypad Attachment (4×6 matrix keypad)
-```
-
-#### DEV (Development)
-
-System for software development with terminal interface:
-
-```
-Machine (DEV)
+Machine
 ├── CPU (65C02)
 ├── RAM (System Memory)
 ├── ROM (System BIOS/Monitor)
@@ -245,17 +168,12 @@ Machine (DEV)
 
 ### VIA (GPIO) Attachments
 
-The VIA card supports multiple attachment types depending on the target:
+The VIA card supports multiple attachment types:
 
-#### Standard Attachments (COB/DEV/VCS)
 - **Keyboard Matrix**: PS/2-style keyboard matrix scanning
 - **Keyboard Encoder**: Parallel keyboard encoder
 - **Joystick A/B**: Game controllers with 8 buttons and directional input
 
-#### KIM Attachments
-- **LCD Display**: HD44780-compatible 16×2 character LCD with 5×8 pixel characters
-- **Keypad**: 4×6 matrix keypad with 24-key layout
-
 ### Memory Map
 
 The system uses a standard 6502 memory layout with I/O cards mapped into the address space. Each I/O card occupies a dedicated region accessible via memory-mapped registers.
@@ -288,9 +206,7 @@ src/
 │           ├── Attachment.ts
 │           ├── JoystickAttachment.ts
 │           ├── KeyboardEncoderAttachment.ts
-│           ├── KeyboardMatrixAttachment.ts
-│           ├── KeypadAttachment.ts
-│           └── LCDAttachment.ts
+│           └── KeyboardMatrixAttachment.ts
 └── tests/                  # Comprehensive test suite
 ```
 
@@ -337,11 +253,10 @@ The emulator targets 1 MHz operation by default (configurable) and attempts to m
 
 ## Supported Input Devices
 
-- **Keyboard**: Full keyboard support via SDL for all targets
-- **Game Controllers**: Dual controller support (Player A and Player B) for VCS and COB targets
+- **Keyboard**: Full keyboard support via SDL
+- **Game Controllers**: Dual controller support (Player A and Player B)
   - D-pad and analog stick support
   - 8 buttons: Up, Down, Left, Right, A, B, Select, Start
-- **Keypad**: 4×6 matrix keypad for KIM target (24 keys including arrows, numbers, and function keys)
 
 ## Credits
 

package/dist/components/CPU.d.ts

@@ -20,6 +20,7 @@ export declare class CPU {
     private opcode;
     cyclesRem: number;
     cycles: number;
+    private irqLine;
     a: number;
     x: number;
     y: number;
@@ -31,6 +32,8 @@ export declare class CPU {
     constructor(read: (address: number) => number, write: (address: number, data: number) => void);
     reset(): void;
     irq(): void;
+    irqTrigger(): void;
+    irqClear(): void;
     nmi(): void;
     tick(): void;
     step(): number;
@@ -62,6 +65,7 @@ export declare class CPU {
     private BCS;
     private BEQ;
     private BIT;
+    private BIT_IMM;
     private BMI;
     private BNE;
     private BPL;

package/dist/components/CPU.js

@@ -12,6 +12,7 @@ class CPU {
         this.opcode = 0x00; // The instruction byte
         this.cyclesRem = 0; // Counts how many cycles the current instruction has remaining
         this.cycles = 0; // Counts the total number of cycles executed
+        this.irqLine = false;
         this.a = 0x00;
         this.x = 0x00;
         this.y = 0x00;
@@ -159,7 +160,7 @@ class CPU {
             { name: 'STX', cycles: 3, opcode: this.STX.bind(this), addrMode: this.ZP0.bind(this) },
             { name: 'SMB0', cycles: 5, opcode: this.SMB0.bind(this), addrMode: this.ZP0.bind(this) },
             { name: 'DEY', cycles: 2, opcode: this.DEY.bind(this), addrMode: this.IMP.bind(this) },
-            { name: 'BIT', cycles: 2, opcode: this.BIT.bind(this), addrMode: this.IMM.bind(this) },
+            { name: 'BIT', cycles: 2, opcode: this.BIT_IMM.bind(this), addrMode: this.IMM.bind(this) },
             { name: 'TXA', cycles: 2, opcode: this.TXA.bind(this), addrMode: this.IMP.bind(this) },
             { name: '???', cycles: 2, opcode: this.XXX.bind(this), addrMode: this.IMP.bind(this) },
             { name: 'STY', cycles: 4, opcode: this.STY.bind(this), addrMode: this.ABS.bind(this) },
@@ -329,6 +330,12 @@ class CPU {
             this.cycles += 7;
         }
     }
+    irqTrigger() {
+        this.irqLine = true;
+    }
+    irqClear() {
+        this.irqLine = false;
+    }
     nmi() {
         // Push the program counter onto the stack
         this.write(0x0100 + this.sp, (this.pc >> 8) & 0x00FF);
@@ -364,6 +371,10 @@ class CPU {
             // addrMode() and opcode() return 1 or 0 if additional clock cycles are required
             this.cyclesRem += addCycleAddrMode & addCycleOpcode;
             this.cycles += addCycleAddrMode & addCycleOpcode;
+            // Level-triggered IRQ: check after instruction decode
+            if (this.irqLine) {
+                this.irq();
+            }
         }
         this.cyclesRem--;
     }
@@ -576,12 +587,31 @@ class CPU {
     //
     ADC() {
         this.fetch();
-        this.temp = this.a + this.fetched + this.getFlag(CPU.C);
-        this.setFlag(CPU.C, (this.temp & 0xFF00) != 0);
-        this.setFlag(CPU.Z, (this.temp & 0x00FF) == 0);
-        this.setFlag(CPU.V, ((this.temp ^ this.a) & (this.temp ^ this.fetched) & 0x0080) != 0);
-        this.setFlag(CPU.N, (this.temp & 0x0080) != 0);
-        this.a = this.temp & 0x00FF;
+        if (this.getFlag(CPU.D)) {
+            // BCD decimal mode (65C02)
+            const c = this.getFlag(CPU.C);
+            const bin = this.a + this.fetched + c;
+            let lo = (this.a & 0x0F) + (this.fetched & 0x0F) + c;
+            if (lo > 0x09)
+                lo += 0x06;
+            let hi = (this.a >> 4) + (this.fetched >> 4) + (lo > 0x0F ? 1 : 0);
+            if (hi > 0x09)
+                hi += 0x06;
+            const result = (hi << 4) | (lo & 0x0F);
+            this.setFlag(CPU.Z, (bin & 0xFF) === 0);
+            this.setFlag(CPU.V, ((this.a ^ bin) & (this.fetched ^ bin) & 0x80) !== 0);
+            this.setFlag(CPU.N, (bin & 0x80) !== 0);
+            this.setFlag(CPU.C, hi > 0x0F);
+            this.a = result & 0xFF;
+        }
+        else {
+            this.temp = this.a + this.fetched + this.getFlag(CPU.C);
+            this.setFlag(CPU.C, (this.temp & 0xFF00) != 0);
+            this.setFlag(CPU.Z, (this.temp & 0x00FF) == 0);
+            this.setFlag(CPU.V, ((this.temp ^ this.a) & (this.temp ^ this.fetched) & 0x0080) != 0);
+            this.setFlag(CPU.N, (this.temp & 0x0080) != 0);
+            this.a = this.temp & 0x00FF;
+        }
         return 1;
     }
     AND() {
@@ -608,10 +638,10 @@ class CPU {
     }
     BCC() {
         if (this.getFlag(CPU.C) == 0) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -619,10 +649,10 @@ class CPU {
     }
     BCS() {
         if (this.getFlag(CPU.C) == 1) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -630,10 +660,10 @@ class CPU {
     }
     BEQ() {
         if (this.getFlag(CPU.Z) == 1) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -647,12 +677,19 @@ class CPU {
         this.setFlag(CPU.V, (this.fetched & (1 << 6)) != 0);
         return 0;
     }
+    BIT_IMM() {
+        this.fetch();
+        this.temp = this.a & this.fetched;
+        this.setFlag(CPU.Z, (this.temp & 0x00FF) == 0x00);
+        // N and V are NOT modified for BIT immediate (65C02)
+        return 0;
+    }
     BMI() {
         if (this.getFlag(CPU.N) == 1) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -660,10 +697,10 @@ class CPU {
     }
     BNE() {
         if (this.getFlag(CPU.Z) == 0) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -671,10 +708,10 @@ class CPU {
     }
     BPL() {
         if (this.getFlag(CPU.N) == 0) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -696,10 +733,10 @@ class CPU {
     }
     BVC() {
         if (this.getFlag(CPU.V) == 0) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -707,10 +744,10 @@ class CPU {
     }
     BVS() {
         if (this.getFlag(CPU.V) == 1) {
-            this.cycles++;
+            this.cyclesRem++;
             this.addrAbs = this.pc + this.addrRel;
             if ((this.addrAbs & 0xFF00) != (this.pc & 0xFF00)) {
-                this.cycles++;
+                this.cyclesRem++;
             }
             this.pc = this.addrAbs;
         }
@@ -959,13 +996,33 @@ class CPU {
     }
     SBC() {
         this.fetch();
-        const value = this.fetched ^ 0x00FF;
-        this.temp = this.a + value + this.getFlag(CPU.C);
-        this.setFlag(CPU.C, (this.temp & 0xFF00) != 0);
-        this.setFlag(CPU.Z, (this.temp & 0x00FF) == 0);
-        this.setFlag(CPU.V, ((this.temp ^ this.a) & (this.temp ^ value) & 0x0080) != 0);
-        this.setFlag(CPU.N, (this.temp & 0x0080) != 0);
-        this.a = this.temp & 0x00FF;
+        if (this.getFlag(CPU.D)) {
+            // BCD decimal mode (65C02)
+            const c = this.getFlag(CPU.C);
+            const bin = this.a - this.fetched - (1 - c);
+            let lo = (this.a & 0x0F) - (this.fetched & 0x0F) - (1 - c);
+            if (lo < 0)
+                lo = ((lo - 0x06) & 0x0F) | ((this.a & 0xF0) - (this.fetched & 0xF0) - 0x10);
+            else
+                lo = (lo & 0x0F) | ((this.a & 0xF0) - (this.fetched & 0xF0));
+            if (lo < 0)
+                lo -= 0x60;
+            const result = lo & 0xFF;
+            this.setFlag(CPU.Z, (bin & 0xFF) === 0);
+            this.setFlag(CPU.V, ((this.a ^ bin) & (~this.fetched ^ bin) & 0x80) !== 0);
+            this.setFlag(CPU.N, (bin & 0x80) !== 0);
+            this.setFlag(CPU.C, (bin & 0xFFFF) < 0x100);
+            this.a = result;
+        }
+        else {
+            const value = this.fetched ^ 0x00FF;
+            this.temp = this.a + value + this.getFlag(CPU.C);
+            this.setFlag(CPU.C, (this.temp & 0xFF00) != 0);
+            this.setFlag(CPU.Z, (this.temp & 0x00FF) == 0);
+            this.setFlag(CPU.V, ((this.temp ^ this.a) & (this.temp ^ value) & 0x0080) != 0);
+            this.setFlag(CPU.N, (this.temp & 0x0080) != 0);
+            this.a = this.temp & 0x00FF;
+        }
         return 1;
     }
     SEC() {