From 76a73c835cc59cbf23ae1ad1a6974291b5307342 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 6 Aug 2018 20:06:07 -0400 Subject: [PATCH] =?UTF-8?q?Forces=206502=20consumers=20to=20declare=20whic?= =?UTF-8?q?h=20model=20=E2=80=94=20the=20original,=2065C02=20or=2065SC02.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All present machines use a regular 6502. --- Machines/AppleII/AppleII.cpp | 2 +- Machines/Atari2600/Cartridges/Cartridge.hpp | 2 +- Machines/Commodore/1540/Implementation/C1540.cpp | 2 +- Machines/Commodore/Vic-20/Vic20.cpp | 2 +- Machines/Electron/Electron.cpp | 2 +- Machines/Oric/Oric.cpp | 2 +- Processors/6502/6502.hpp | 8 +++++++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Machines/AppleII/AppleII.cpp b/Machines/AppleII/AppleII.cpp index e2c3c26f1..2e876de93 100644 --- a/Machines/AppleII/AppleII.cpp +++ b/Machines/AppleII/AppleII.cpp @@ -298,7 +298,7 @@ template class ConcreteMachine: public: ConcreteMachine(const Analyser::Static::AppleII::Target &target, const ROMMachine::ROMFetcher &rom_fetcher): - m6502_(*this), + m6502_(CPU::MOS6502::Personality::P6502, *this), video_bus_handler_(ram_, aux_ram_), audio_toggle_(audio_queue_), speaker_(audio_toggle_) { diff --git a/Machines/Atari2600/Cartridges/Cartridge.hpp b/Machines/Atari2600/Cartridges/Cartridge.hpp index c52c47d26..f5e7987d9 100644 --- a/Machines/Atari2600/Cartridges/Cartridge.hpp +++ b/Machines/Atari2600/Cartridges/Cartridge.hpp @@ -32,7 +32,7 @@ template class Cartridge: public: Cartridge(const std::vector &rom) : - m6502_(*this), + m6502_(CPU::MOS6502::Personality::P6502, *this), rom_(rom), bus_extender_(rom_.data(), rom.size()) { // The above works because bus_extender_ is declared after rom_ in the instance storage list; diff --git a/Machines/Commodore/1540/Implementation/C1540.cpp b/Machines/Commodore/1540/Implementation/C1540.cpp index be61e8cb8..b6cf3416e 100644 --- a/Machines/Commodore/1540/Implementation/C1540.cpp +++ b/Machines/Commodore/1540/Implementation/C1540.cpp @@ -18,7 +18,7 @@ using namespace Commodore::C1540; MachineBase::MachineBase(Personality personality, const ROMMachine::ROMFetcher &rom_fetcher) : Storage::Disk::Controller(1000000), - m6502_(*this), + m6502_(CPU::MOS6502::Personality::P6502, *this), drive_(new Storage::Disk::Drive(1000000, 300, 2)), serial_port_VIA_port_handler_(new SerialPortVIA(serial_port_VIA_)), serial_port_(new SerialPort), diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp index f4eb15ef7..027fec716 100644 --- a/Machines/Commodore/Vic-20/Vic20.cpp +++ b/Machines/Commodore/Vic-20/Vic20.cpp @@ -293,7 +293,7 @@ class ConcreteMachine: public Activity::Source { public: ConcreteMachine(const Analyser::Static::Commodore::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) : - m6502_(*this), + m6502_(CPU::MOS6502::Personality::P6502, *this), user_port_via_port_handler_(new UserPortVIA), keyboard_via_port_handler_(new KeyboardVIA), serial_port_(new SerialPort), diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index 584e066ad..4cb17c68e 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -50,7 +50,7 @@ class ConcreteMachine: public Activity::Source { public: ConcreteMachine(const Analyser::Static::Acorn::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) : - m6502_(*this), + m6502_(CPU::MOS6502::Personality::P6502, *this), sound_generator_(audio_queue_), speaker_(sound_generator_) { memset(key_states_, 0, sizeof(key_states_)); diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index 1dd153f58..62ee0afbe 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -207,7 +207,7 @@ template class Co public: ConcreteMachine(const Analyser::Static::Oric::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) : - m6502_(*this), + m6502_(CPU::MOS6502::Personality::P6502, *this), ay8910_(audio_queue_), speaker_(ay8910_), via_port_handler_(audio_queue_, ay8910_, speaker_, tape_player_, keyboard_), diff --git a/Processors/6502/6502.hpp b/Processors/6502/6502.hpp index ffe19f53b..075f70c2b 100644 --- a/Processors/6502/6502.hpp +++ b/Processors/6502/6502.hpp @@ -180,6 +180,12 @@ class ProcessorBase: public ProcessorStorage { bool is_jammed(); }; +enum Personality { + P6502, // the original 6502, replete with various undocumented instructions + P65C02, // the 65C02; an extended 6502 with a few extra instructions and addressing modes for existing instructions + P65SC02, // like the 65C02, but lacking bit instructions +}; + /*! @abstact Template providing emulation of a 6502 processor. @@ -193,7 +199,7 @@ template class Processor: public ProcessorBas /*! Constructs an instance of the 6502 that will use @c bus_handler for all bus communications. */ - Processor(T &bus_handler) : bus_handler_(bus_handler) {} + Processor(Personality personality, T &bus_handler) : bus_handler_(bus_handler) {} /*! Runs the 6502 for a supplied number of cycles.