From 14a76af0d3fde94522cae7892f731ed1ddc8abe7 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 17 Mar 2017 20:28:07 -0400 Subject: [PATCH 01/14] Started trying to float out bus control to cartridges. --- Machines/Atari2600/Atari2600.hpp | 30 +-- Machines/Atari2600/Cartridge.hpp | 202 ++++++++++++++++++ Machines/Atari2600/CartridgeUnpaged.hpp | 18 ++ .../Clock Signal.xcodeproj/project.pbxproj | 4 + Processors/6502/CPU6502.hpp | 4 +- 5 files changed, 232 insertions(+), 26 deletions(-) create mode 100644 Machines/Atari2600/Cartridge.hpp create mode 100644 Machines/Atari2600/CartridgeUnpaged.hpp diff --git a/Machines/Atari2600/Atari2600.hpp b/Machines/Atari2600/Atari2600.hpp index be06b571b..8b5b807c7 100644 --- a/Machines/Atari2600/Atari2600.hpp +++ b/Machines/Atari2600/Atari2600.hpp @@ -16,6 +16,7 @@ #include "PIA.hpp" #include "Speaker.hpp" #include "TIA.hpp" +#include "Cartridge.hpp" #include "../ConfigurationTarget.hpp" #include "Atari2600Inputs.h" @@ -48,9 +49,9 @@ class Machine: // to satisfy CRTMachine::Machine virtual void setup_output(float aspect_ratio); virtual void close_output(); - virtual std::shared_ptr get_crt() { return tia_->get_crt(); } - virtual std::shared_ptr get_speaker() { return speaker_; } - virtual void run_for_cycles(int number_of_cycles) { CPU6502::Processor::run_for_cycles(number_of_cycles); } + virtual std::shared_ptr get_crt() { return cartridge_->tia_->get_crt(); } + virtual std::shared_ptr get_speaker() { return cartridge_->speaker_; } + virtual void run_for_cycles(int number_of_cycles) { cartridge_->run_for_cycles(number_of_cycles); } // to satisfy Outputs::CRT::Delegate virtual void crt_did_end_batch_of_frames(Outputs::CRT::CRT *crt, unsigned int number_of_frames, unsigned int number_of_unexpected_vertical_syncs); @@ -70,27 +71,8 @@ class Machine: // Activision stack records uint8_t last_opcode_; - // the RIOT and TIA - PIA mos6532_; - std::unique_ptr tia_; - - // joystick state - uint8_t tia_input_value_[2]; - - // outputs - std::shared_ptr speaker_; - - // speaker backlog accumlation counter - unsigned int cycles_since_speaker_update_; - inline void update_audio(); - - // video backlog accumulation counter - unsigned int cycles_since_video_update_; - inline void update_video(); - - // RIOT backlog accumulation counter - unsigned int cycles_since_6532_update_; - inline void update_6532(); + // the cartridge + std::unique_ptr cartridge_; // output frame rate tracker struct FrameRecord diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridge.hpp new file mode 100644 index 000000000..0f18673d9 --- /dev/null +++ b/Machines/Atari2600/Cartridge.hpp @@ -0,0 +1,202 @@ +// +// Cartridge.h +// Clock Signal +// +// Created by Thomas Harte on 17/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_Cartridge_hpp +#define Atari2600_Cartridge_hpp + +namespace Atari2600 { + +class CartridgeBase { + public: + virtual void run_for_cycles(int number_of_cycles) = 0; + + // the RIOT, TIA and speaker + PIA mos6532_; + std::shared_ptr tia_; + std::shared_ptr speaker_; + + // joystick state + uint8_t tia_input_value_[2]; + + protected: + // speaker backlog accumlation counter + unsigned int cycles_since_speaker_update_; + inline void update_audio() { + unsigned int audio_cycles = cycles_since_speaker_update_ / 114; + cycles_since_speaker_update_ %= 114; + speaker_->run_for_cycles(audio_cycles); + } + + // video backlog accumulation counter + unsigned int cycles_since_video_update_; + inline void update_video() { + tia_->run_for_cycles((int)cycles_since_video_update_); + cycles_since_video_update_ = 0; + } + + // RIOT backlog accumulation counter + unsigned int cycles_since_6532_update_; + inline void update_6532() { + mos6532_.run_for_cycles(cycles_since_6532_update_); + cycles_since_6532_update_ = 0; + } +}; + +template class Cartridge: + public CPU6502::Processor>, + public CartridgeBase { + + public: + void run_for_cycles(int number_of_cycles) {} + + // to satisfy CPU6502::Processor + unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + uint8_t returnValue = 0xff; + unsigned int cycles_run_for = 3; + + // this occurs as a feedback loop — the 2600 requests ready, then performs the cycles_run_for + // leap to the end of ready only once ready is signalled — because on a 6502 ready doesn't take + // effect until the next read; therefore it isn't safe to assume that signalling ready immediately + // skips to the end of the line. + if(operation == CPU6502::BusOperation::Ready) + cycles_run_for = (unsigned int)tia_->get_cycles_until_horizontal_blank(cycles_since_video_update_); + + cycles_since_speaker_update_ += cycles_run_for; + cycles_since_video_update_ += cycles_run_for; + cycles_since_6532_update_ += (cycles_run_for / 3); + + if(operation != CPU6502::BusOperation::Ready) { + uint16_t masked_address = address & 0x1fff; + + // give the cartridge a chance to respond to the bus access + static_cast(this)->perform_bus_operation(operation, address, value); + + // check for a RIOT RAM access + if((address&0x1280) == 0x80) { + if(isReadOperation(operation)) { + returnValue &= mos6532_.get_ram(address); + } else { + mos6532_.set_ram(address, *value); + } + } + + // check for a TIA access + if(!(address&0x1080)) { + if(isReadOperation(operation)) { + const uint16_t decodedAddress = address & 0xf; + switch(decodedAddress) { + case 0x00: // missile 0 / player collisions + case 0x01: // missile 1 / player collisions + case 0x02: // player 0 / playfield / ball collisions + case 0x03: // player 1 / playfield / ball collisions + case 0x04: // missile 0 / playfield / ball collisions + case 0x05: // missile 1 / playfield / ball collisions + case 0x06: // ball / playfield collisions + case 0x07: // player / player, missile / missile collisions + returnValue &= tia_->get_collision_flags(decodedAddress); + break; + + case 0x08: + case 0x09: + case 0x0a: + case 0x0b: + // TODO: pot ports + returnValue &= 0; + break; + + case 0x0c: + case 0x0d: + returnValue &= tia_input_value_[decodedAddress - 0x0c]; + break; + } + } else { + const uint16_t decodedAddress = address & 0x3f; + switch(decodedAddress) { + case 0x00: update_video(); tia_->set_sync(*value & 0x02); break; + case 0x01: update_video(); tia_->set_blank(*value & 0x02); break; + + case 0x02: set_ready_line(true); break; + case 0x03: update_video(); tia_->reset_horizontal_counter(); break; + // TODO: audio will now be out of synchronisation — fix + + case 0x04: + case 0x05: update_video(); tia_->set_player_number_and_size(decodedAddress - 0x04, *value); break; + case 0x06: + case 0x07: update_video(); tia_->set_player_missile_colour(decodedAddress - 0x06, *value); break; + case 0x08: update_video(); tia_->set_playfield_ball_colour(*value); break; + case 0x09: update_video(); tia_->set_background_colour(*value); break; + case 0x0a: update_video(); tia_->set_playfield_control_and_ball_size(*value); break; + case 0x0b: + case 0x0c: update_video(); tia_->set_player_reflected(decodedAddress - 0x0b, !((*value)&8)); break; + case 0x0d: + case 0x0e: + case 0x0f: update_video(); tia_->set_playfield(decodedAddress - 0x0d, *value); break; + case 0x10: + case 0x11: update_video(); tia_->set_player_position(decodedAddress - 0x10); break; + case 0x12: + case 0x13: update_video(); tia_->set_missile_position(decodedAddress - 0x12); break; + case 0x14: update_video(); tia_->set_ball_position(); break; + case 0x1b: + case 0x1c: update_video(); tia_->set_player_graphic(decodedAddress - 0x1b, *value); break; + case 0x1d: + case 0x1e: update_video(); tia_->set_missile_enable(decodedAddress - 0x1d, (*value)&2); break; + case 0x1f: update_video(); tia_->set_ball_enable((*value)&2); break; + case 0x20: + case 0x21: update_video(); tia_->set_player_motion(decodedAddress - 0x20, *value); break; + case 0x22: + case 0x23: update_video(); tia_->set_missile_motion(decodedAddress - 0x22, *value); break; + case 0x24: update_video(); tia_->set_ball_motion(*value); break; + case 0x25: + case 0x26: tia_->set_player_delay(decodedAddress - 0x25, (*value)&1); break; + case 0x27: tia_->set_ball_delay((*value)&1); break; + case 0x28: + case 0x29: update_video(); tia_->set_missile_position_to_player(decodedAddress - 0x28, (*value)&2); break; + case 0x2a: update_video(); tia_->move(); break; + case 0x2b: update_video(); tia_->clear_motion(); break; + case 0x2c: update_video(); tia_->clear_collision_flags(); break; + + case 0x15: + case 0x16: update_audio(); speaker_->set_control(decodedAddress - 0x15, *value); break; + case 0x17: + case 0x18: update_audio(); speaker_->set_divider(decodedAddress - 0x17, *value); break; + case 0x19: + case 0x1a: update_audio(); speaker_->set_volume(decodedAddress - 0x19, *value); break; + } + } + } + + // check for a PIA access + if((address&0x1280) == 0x280) { + update_6532(); + if(isReadOperation(operation)) { + returnValue &= mos6532_.get_register(address); + } else { + mos6532_.set_register(address, *value); + } + } + + if(isReadOperation(operation)) { + *value &= returnValue; + } + } + + if(!tia_->get_cycles_until_horizontal_blank(cycles_since_video_update_)) set_ready_line(false); + + return cycles_run_for / 3; + } + + void synchronise() { + update_audio(); + update_video(); + speaker_->flush(); + } +}; + +} + +#endif /* Atari2600_Cartridge_hpp */ diff --git a/Machines/Atari2600/CartridgeUnpaged.hpp b/Machines/Atari2600/CartridgeUnpaged.hpp new file mode 100644 index 000000000..2440d0612 --- /dev/null +++ b/Machines/Atari2600/CartridgeUnpaged.hpp @@ -0,0 +1,18 @@ +// +// CartridgeUnpaged.h +// Clock Signal +// +// Created by Thomas Harte on 17/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeUnpaged_hpp +#define Atari2600_CartridgeUnpaged_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +} + +#endif /* Atari2600_CartridgeUnpaged_hpp */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index e6c185ad8..9645d05f4 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -928,6 +928,8 @@ 4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSBestEffortUpdater.m; path = Updater/CSBestEffortUpdater.m; sourceTree = ""; }; 4BD69F921D98760000243FE1 /* AcornADF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AcornADF.cpp; sourceTree = ""; }; 4BD69F931D98760000243FE1 /* AcornADF.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = AcornADF.hpp; sourceTree = ""; }; + 4BE069991E7C942C00DD379F /* Cartridge.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; + 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeUnpaged.hpp; sourceTree = ""; }; 4BE77A2C1D84ADFB00BC3827 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = File.cpp; path = ../../StaticAnalyser/Commodore/File.cpp; sourceTree = ""; }; 4BE77A2D1D84ADFB00BC3827 /* File.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = File.hpp; path = ../../StaticAnalyser/Commodore/File.hpp; sourceTree = ""; }; 4BE7C9161E3D397100A5496D /* TIA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TIA.cpp; sourceTree = ""; }; @@ -1110,6 +1112,8 @@ 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, 4BE7C9171E3D397100A5496D /* TIA.hpp */, + 4BE069991E7C942C00DD379F /* Cartridge.hpp */, + 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, ); path = Atari2600; sourceTree = ""; diff --git a/Processors/6502/CPU6502.hpp b/Processors/6502/CPU6502.hpp index 9f1b4e125..930bb8329 100644 --- a/Processors/6502/CPU6502.hpp +++ b/Processors/6502/CPU6502.hpp @@ -646,8 +646,8 @@ template class Processor { scheduleProgramProgramCounter++; #define read_op(val, addr) nextBusOperation = BusOperation::ReadOpcode; busAddress = addr; busValue = &val -#define read_mem(val, addr) nextBusOperation = BusOperation::Read; busAddress = addr; busValue = &val -#define throwaway_read(addr) nextBusOperation = BusOperation::Read; busAddress = addr; busValue = &throwaway_target +#define read_mem(val, addr) nextBusOperation = BusOperation::Read; busAddress = addr; busValue = &val; val = 0xff +#define throwaway_read(addr) nextBusOperation = BusOperation::Read; busAddress = addr; busValue = &throwaway_target; throwaway_target = 0xff #define write_mem(val, addr) nextBusOperation = BusOperation::Write; busAddress = addr; busValue = &val switch(cycle) { From 7958459db9cae277f9f18fb96451159a3cb2e598 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 14:01:04 -0400 Subject: [PATCH 02/14] In theory unpaged cartridges should now work. Time to debug. --- Machines/Atari2600/Atari2600.cpp | 317 +++--------------------- Machines/Atari2600/Atari2600.hpp | 8 +- Machines/Atari2600/Cartridge.hpp | 18 +- Machines/Atari2600/CartridgeUnpaged.hpp | 15 ++ 4 files changed, 61 insertions(+), 297 deletions(-) diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index bcc99ee8e..32fd765c4 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -10,6 +10,8 @@ #include #include +#include "CartridgeUnpaged.hpp" + using namespace Atari2600; namespace { static const double NTSC_clock_rate = 1194720; @@ -19,278 +21,41 @@ namespace { Machine::Machine() : rom_(nullptr), rom_pages_{nullptr, nullptr, nullptr, nullptr}, - tia_input_value_{0xff, 0xff}, - cycles_since_speaker_update_(0), - cycles_since_video_update_(0), - cycles_since_6532_update_(0), frame_record_pointer_(0), is_ntsc_(true) { set_clock_rate(NTSC_clock_rate); } void Machine::setup_output(float aspect_ratio) { - tia_.reset(new TIA); - speaker_.reset(new Speaker); - speaker_->set_input_rate((float)(get_clock_rate() / 38.0)); - tia_->get_crt()->set_delegate(this); + bus_->tia_.reset(new TIA); + bus_->speaker_.reset(new Speaker); + bus_->speaker_->set_input_rate((float)(get_clock_rate() / 38.0)); + bus_->tia_->get_crt()->set_delegate(this); } void Machine::close_output() { - tia_ = nullptr; - speaker_ = nullptr; + bus_.reset(); } Machine::~Machine() { - delete[] rom_; close_output(); } -unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { - uint8_t returnValue = 0xff; - unsigned int cycles_run_for = 3; - - // this occurs as a feedback loop — the 2600 requests ready, then performs the cycles_run_for - // leap to the end of ready only once ready is signalled — because on a 6502 ready doesn't take - // effect until the next read; therefore it isn't safe to assume that signalling ready immediately - // skips to the end of the line. - if(operation == CPU6502::BusOperation::Ready) - cycles_run_for = (unsigned int)tia_->get_cycles_until_horizontal_blank(cycles_since_video_update_); - - cycles_since_speaker_update_ += cycles_run_for; - cycles_since_video_update_ += cycles_run_for; - cycles_since_6532_update_ += (cycles_run_for / 3); - - if(operation != CPU6502::BusOperation::Ready) { - uint16_t masked_address = address & 0x1fff; - -#define AtariPager(start, end) \ - if(masked_address >= start && masked_address <= end) { \ - uint8_t *base_ptr = &rom_[(masked_address - start) * 4096];\ - if(base_ptr != rom_pages_[0]) {\ - rom_pages_[0] = base_ptr;\ - rom_pages_[1] = base_ptr + 1024;\ - rom_pages_[2] = base_ptr + 2048;\ - rom_pages_[3] = base_ptr + 3072;\ - }\ - } - - // check for potential paging - switch(paging_model_) { - default: - break; - case StaticAnalyser::Atari2600PagingModel::Atari8k: AtariPager(0x1ff8, 0x1ff9); break; - case StaticAnalyser::Atari2600PagingModel::CBSRamPlus: AtariPager(0x1ff8, 0x1ffa); break; - case StaticAnalyser::Atari2600PagingModel::Atari16k: AtariPager(0x1ff6, 0x1ff9); break; - case StaticAnalyser::Atari2600PagingModel::Atari32k: AtariPager(0x1ff4, 0x1ffb); break; - case StaticAnalyser::Atari2600PagingModel::ParkerBros: - if(masked_address >= 0x1fe0 && masked_address < 0x1ff8) { - int slot = (masked_address >> 3) & 3; - int target = masked_address & 7; - rom_pages_[slot] = &rom_[target * 1024]; - } - break; - case StaticAnalyser::Atari2600PagingModel::MegaBoy: - if(masked_address == 0x1fec && isReadOperation(operation)) { - *value = mega_boy_page_; - } - if(masked_address == 0x1ff0) { - mega_boy_page_ = (mega_boy_page_ + 1) & 15; - rom_pages_[0] = &rom_[mega_boy_page_ * 4096]; - rom_pages_[1] = rom_pages_[0] + 1024; - rom_pages_[2] = rom_pages_[0] + 2048; - rom_pages_[3] = rom_pages_[0] + 3072; - } - break; - case StaticAnalyser::Atari2600PagingModel::MNetwork: - if(masked_address >= 0x1fe0 && masked_address < 0x1fe7) { - int target = (masked_address & 7) * 2048; - rom_pages_[0] = &rom_[target]; - rom_pages_[1] = &rom_[target] + 1024; - } else if(masked_address == 0x1fe7) { - for(int c = 0; c < 8; c++) { - ram_write_targets_[c] = ram_.data() + 1024 + c * 128; - ram_read_targets_[c + 8] = ram_write_targets_[c]; - } - } else if(masked_address >= 0x1fe8 && masked_address <= 0x1ffb) { - int offset = (masked_address - 0x1fe8) * 256; - ram_write_targets_[16] = ram_.data() + offset; - ram_write_targets_[17] = ram_write_targets_[16] + 128; - ram_read_targets_[18] = ram_write_targets_[16]; - ram_read_targets_[19] = ram_write_targets_[17]; - } - break; - case StaticAnalyser::Atari2600PagingModel::ActivisionStack: - if(operation == CPU6502::BusOperation::ReadOpcode) { - // if the last operation was either a JSR or an RTS, pick a new page - // based on the address now being accesses - if(last_opcode_ == 0x20 || last_opcode_ == 0x60) { - if(address & 0x2000) { - rom_pages_[0] = rom_; - } else { - rom_pages_[0] = &rom_[4096]; - } - rom_pages_[1] = rom_pages_[0] + 1024; - rom_pages_[2] = rom_pages_[0] + 2048; - rom_pages_[3] = rom_pages_[0] + 3072; - } - } - break; - } - -#undef AtariPager - - // check for a ROM read - if(address&0x1000) { - int ram_page = (masked_address & 0xfff) >> 7; - ram_write_targets_[ram_page][masked_address & 0x7f] = *value; - - if(isReadOperation(operation)) { - if(ram_read_targets_[ram_page]) { - returnValue &= ram_read_targets_[ram_page][masked_address & 0x7f]; - } else { - returnValue &= rom_pages_[(address >> 10)&3][address&1023]; - } - } - } - - // check for a RIOT RAM access - if((address&0x1280) == 0x80) { - if(isReadOperation(operation)) { - returnValue &= mos6532_.get_ram(address); - } else { - mos6532_.set_ram(address, *value); - } - } - - // check for a TIA access - if(!(address&0x1080)) { - if(isReadOperation(operation)) { - const uint16_t decodedAddress = address & 0xf; - switch(decodedAddress) { - case 0x00: // missile 0 / player collisions - case 0x01: // missile 1 / player collisions - case 0x02: // player 0 / playfield / ball collisions - case 0x03: // player 1 / playfield / ball collisions - case 0x04: // missile 0 / playfield / ball collisions - case 0x05: // missile 1 / playfield / ball collisions - case 0x06: // ball / playfield collisions - case 0x07: // player / player, missile / missile collisions - returnValue &= tia_->get_collision_flags(decodedAddress); - break; - - case 0x08: - case 0x09: - case 0x0a: - case 0x0b: - // TODO: pot ports - returnValue &= 0; - break; - - case 0x0c: - case 0x0d: - returnValue &= tia_input_value_[decodedAddress - 0x0c]; - break; - } - } else { - const uint16_t decodedAddress = address & 0x3f; - switch(decodedAddress) { - case 0x00: update_video(); tia_->set_sync(*value & 0x02); break; - case 0x01: update_video(); tia_->set_blank(*value & 0x02); break; - - case 0x02: set_ready_line(true); break; - case 0x03: update_video(); tia_->reset_horizontal_counter(); break; - // TODO: audio will now be out of synchronisation — fix - - case 0x04: - case 0x05: update_video(); tia_->set_player_number_and_size(decodedAddress - 0x04, *value); break; - case 0x06: - case 0x07: update_video(); tia_->set_player_missile_colour(decodedAddress - 0x06, *value); break; - case 0x08: update_video(); tia_->set_playfield_ball_colour(*value); break; - case 0x09: update_video(); tia_->set_background_colour(*value); break; - case 0x0a: update_video(); tia_->set_playfield_control_and_ball_size(*value); break; - case 0x0b: - case 0x0c: update_video(); tia_->set_player_reflected(decodedAddress - 0x0b, !((*value)&8)); break; - case 0x0d: - case 0x0e: - case 0x0f: update_video(); tia_->set_playfield(decodedAddress - 0x0d, *value); break; - case 0x10: - case 0x11: update_video(); tia_->set_player_position(decodedAddress - 0x10); break; - case 0x12: - case 0x13: update_video(); tia_->set_missile_position(decodedAddress - 0x12); break; - case 0x14: update_video(); tia_->set_ball_position(); break; - case 0x1b: - case 0x1c: update_video(); tia_->set_player_graphic(decodedAddress - 0x1b, *value); break; - case 0x1d: - case 0x1e: update_video(); tia_->set_missile_enable(decodedAddress - 0x1d, (*value)&2); break; - case 0x1f: update_video(); tia_->set_ball_enable((*value)&2); break; - case 0x20: - case 0x21: update_video(); tia_->set_player_motion(decodedAddress - 0x20, *value); break; - case 0x22: - case 0x23: update_video(); tia_->set_missile_motion(decodedAddress - 0x22, *value); break; - case 0x24: update_video(); tia_->set_ball_motion(*value); break; - case 0x25: - case 0x26: tia_->set_player_delay(decodedAddress - 0x25, (*value)&1); break; - case 0x27: tia_->set_ball_delay((*value)&1); break; - case 0x28: - case 0x29: update_video(); tia_->set_missile_position_to_player(decodedAddress - 0x28, (*value)&2); break; - case 0x2a: update_video(); tia_->move(); break; - case 0x2b: update_video(); tia_->clear_motion(); break; - case 0x2c: update_video(); tia_->clear_collision_flags(); break; - - case 0x15: - case 0x16: update_audio(); speaker_->set_control(decodedAddress - 0x15, *value); break; - case 0x17: - case 0x18: update_audio(); speaker_->set_divider(decodedAddress - 0x17, *value); break; - case 0x19: - case 0x1a: update_audio(); speaker_->set_volume(decodedAddress - 0x19, *value); break; - - case 0x3f: - if(paging_model_ == StaticAnalyser::Atari2600PagingModel::Tigervision && (masked_address == 0x3f)) { - int selected_page = (*value) % (rom_size_ / 2048); - rom_pages_[0] = &rom_[selected_page * 2048]; - rom_pages_[1] = rom_pages_[0] + 1024; - } - break; - } - } - } - - // check for a PIA access - if((address&0x1280) == 0x280) { - update_6532(); - if(isReadOperation(operation)) { - returnValue &= mos6532_.get_register(address); - } else { - mos6532_.set_register(address, *value); - } - } - - if(isReadOperation(operation)) { - if(operation == CPU6502::BusOperation::ReadOpcode) last_opcode_ = returnValue; - *value = returnValue; - } - } - - if(!tia_->get_cycles_until_horizontal_blank(cycles_since_video_update_)) set_ready_line(false); - - return cycles_run_for / 3; -} - void Machine::set_digital_input(Atari2600DigitalInput input, bool state) { switch (input) { - case Atari2600DigitalInputJoy1Up: mos6532_.update_port_input(0, 0x10, state); break; - case Atari2600DigitalInputJoy1Down: mos6532_.update_port_input(0, 0x20, state); break; - case Atari2600DigitalInputJoy1Left: mos6532_.update_port_input(0, 0x40, state); break; - case Atari2600DigitalInputJoy1Right: mos6532_.update_port_input(0, 0x80, state); break; + case Atari2600DigitalInputJoy1Up: bus_->mos6532_.update_port_input(0, 0x10, state); break; + case Atari2600DigitalInputJoy1Down: bus_->mos6532_.update_port_input(0, 0x20, state); break; + case Atari2600DigitalInputJoy1Left: bus_->mos6532_.update_port_input(0, 0x40, state); break; + case Atari2600DigitalInputJoy1Right: bus_->mos6532_.update_port_input(0, 0x80, state); break; - case Atari2600DigitalInputJoy2Up: mos6532_.update_port_input(0, 0x01, state); break; - case Atari2600DigitalInputJoy2Down: mos6532_.update_port_input(0, 0x02, state); break; - case Atari2600DigitalInputJoy2Left: mos6532_.update_port_input(0, 0x04, state); break; - case Atari2600DigitalInputJoy2Right: mos6532_.update_port_input(0, 0x08, state); break; + case Atari2600DigitalInputJoy2Up: bus_->mos6532_.update_port_input(0, 0x01, state); break; + case Atari2600DigitalInputJoy2Down: bus_->mos6532_.update_port_input(0, 0x02, state); break; + case Atari2600DigitalInputJoy2Left: bus_->mos6532_.update_port_input(0, 0x04, state); break; + case Atari2600DigitalInputJoy2Right: bus_->mos6532_.update_port_input(0, 0x08, state); break; // TODO: latching - case Atari2600DigitalInputJoy1Fire: if(state) tia_input_value_[0] &= ~0x80; else tia_input_value_[0] |= 0x80; break; - case Atari2600DigitalInputJoy2Fire: if(state) tia_input_value_[1] &= ~0x80; else tia_input_value_[1] |= 0x80; break; + case Atari2600DigitalInputJoy1Fire: if(state) bus_->tia_input_value_[0] &= ~0x80; else bus_->tia_input_value_[0] |= 0x80; break; + case Atari2600DigitalInputJoy2Fire: if(state) bus_->tia_input_value_[1] &= ~0x80; else bus_->tia_input_value_[1] |= 0x80; break; default: break; } @@ -298,16 +63,17 @@ void Machine::set_digital_input(Atari2600DigitalInput input, bool state) { void Machine::set_switch_is_enabled(Atari2600Switch input, bool state) { switch(input) { - case Atari2600SwitchReset: mos6532_.update_port_input(1, 0x01, state); break; - case Atari2600SwitchSelect: mos6532_.update_port_input(1, 0x02, state); break; - case Atari2600SwitchColour: mos6532_.update_port_input(1, 0x08, state); break; - case Atari2600SwitchLeftPlayerDifficulty: mos6532_.update_port_input(1, 0x40, state); break; - case Atari2600SwitchRightPlayerDifficulty: mos6532_.update_port_input(1, 0x80, state); break; + case Atari2600SwitchReset: bus_->mos6532_.update_port_input(1, 0x01, state); break; + case Atari2600SwitchSelect: bus_->mos6532_.update_port_input(1, 0x02, state); break; + case Atari2600SwitchColour: bus_->mos6532_.update_port_input(1, 0x08, state); break; + case Atari2600SwitchLeftPlayerDifficulty: bus_->mos6532_.update_port_input(1, 0x40, state); break; + case Atari2600SwitchRightPlayerDifficulty: bus_->mos6532_.update_port_input(1, 0x80, state); break; } } void Machine::configure_as_target(const StaticAnalyser::Target &target) { - if(!target.cartridges.front()->get_segments().size()) return; + bus_.reset(new CartridgeUnpaged(target.cartridges.front()->get_segments().front().data)); +/* if(!target.cartridges.front()->get_segments().size()) return; Storage::Cartridge::Cartridge::Segment segment = target.cartridges.front()->get_segments().front(); size_t length = segment.data.size(); @@ -382,32 +148,7 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { break; } - paging_model_ = target.atari.paging_model; -} - -#pragma mark - Audio and Video - -void Machine::update_audio() { - unsigned int audio_cycles = cycles_since_speaker_update_ / 114; - - speaker_->run_for_cycles(audio_cycles); - cycles_since_speaker_update_ %= 114; -} - -void Machine::update_video() { - tia_->run_for_cycles((int)cycles_since_video_update_); - cycles_since_video_update_ = 0; -} - -void Machine::update_6532() { - mos6532_.run_for_cycles(cycles_since_6532_update_); - cycles_since_6532_update_ = 0; -} - -void Machine::synchronise() { - update_audio(); - update_video(); - speaker_->flush(); + paging_model_ = target.atari.paging_model;*/ } #pragma mark - CRT delegate @@ -436,14 +177,14 @@ void Machine::crt_did_end_batch_of_frames(Outputs::CRT::CRT *crt, unsigned int n double clock_rate; if(is_ntsc_) { clock_rate = NTSC_clock_rate; - tia_->set_output_mode(TIA::OutputMode::NTSC); + bus_->tia_->set_output_mode(TIA::OutputMode::NTSC); } else { clock_rate = PAL_clock_rate; - tia_->set_output_mode(TIA::OutputMode::PAL); + bus_->tia_->set_output_mode(TIA::OutputMode::PAL); } - speaker_->set_input_rate((float)(clock_rate / 38.0)); - speaker_->set_high_frequency_cut_off((float)(clock_rate / (38.0 * 2.0))); + bus_->speaker_->set_input_rate((float)(clock_rate / 38.0)); + bus_->speaker_->set_high_frequency_cut_off((float)(clock_rate / (38.0 * 2.0))); set_clock_rate(clock_rate); } } diff --git a/Machines/Atari2600/Atari2600.hpp b/Machines/Atari2600/Atari2600.hpp index 8b5b807c7..c8703fb7c 100644 --- a/Machines/Atari2600/Atari2600.hpp +++ b/Machines/Atari2600/Atari2600.hpp @@ -49,9 +49,9 @@ class Machine: // to satisfy CRTMachine::Machine virtual void setup_output(float aspect_ratio); virtual void close_output(); - virtual std::shared_ptr get_crt() { return cartridge_->tia_->get_crt(); } - virtual std::shared_ptr get_speaker() { return cartridge_->speaker_; } - virtual void run_for_cycles(int number_of_cycles) { cartridge_->run_for_cycles(number_of_cycles); } + virtual std::shared_ptr get_crt() { return bus_->tia_->get_crt(); } + virtual std::shared_ptr get_speaker() { return bus_->speaker_; } + virtual void run_for_cycles(int number_of_cycles) { bus_->run_for_cycles(number_of_cycles); } // to satisfy Outputs::CRT::Delegate virtual void crt_did_end_batch_of_frames(Outputs::CRT::CRT *crt, unsigned int number_of_frames, unsigned int number_of_unexpected_vertical_syncs); @@ -72,7 +72,7 @@ class Machine: uint8_t last_opcode_; // the cartridge - std::unique_ptr cartridge_; + std::unique_ptr bus_; // output frame rate tracker struct FrameRecord diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridge.hpp index 0f18673d9..80e0e9973 100644 --- a/Machines/Atari2600/Cartridge.hpp +++ b/Machines/Atari2600/Cartridge.hpp @@ -9,10 +9,18 @@ #ifndef Atari2600_Cartridge_hpp #define Atari2600_Cartridge_hpp +#include "../../Processors/6502/CPU6502.hpp" + namespace Atari2600 { -class CartridgeBase { +class Bus { public: + Bus() : + tia_input_value_{0xff, 0xff}, + cycles_since_speaker_update_(0), + cycles_since_video_update_(0), + cycles_since_6532_update_(0) {} + virtual void run_for_cycles(int number_of_cycles) = 0; // the RIOT, TIA and speaker @@ -49,7 +57,7 @@ class CartridgeBase { template class Cartridge: public CPU6502::Processor>, - public CartridgeBase { + public Bus { public: void run_for_cycles(int number_of_cycles) {} @@ -71,7 +79,7 @@ template class Cartridge: cycles_since_6532_update_ += (cycles_run_for / 3); if(operation != CPU6502::BusOperation::Ready) { - uint16_t masked_address = address & 0x1fff; +// uint16_t masked_address = address & 0x1fff; // give the cartridge a chance to respond to the bus access static_cast(this)->perform_bus_operation(operation, address, value); @@ -120,7 +128,7 @@ template class Cartridge: case 0x00: update_video(); tia_->set_sync(*value & 0x02); break; case 0x01: update_video(); tia_->set_blank(*value & 0x02); break; - case 0x02: set_ready_line(true); break; + case 0x02: CPU6502::Processor>::set_ready_line(true); break; case 0x03: update_video(); tia_->reset_horizontal_counter(); break; // TODO: audio will now be out of synchronisation — fix @@ -185,7 +193,7 @@ template class Cartridge: } } - if(!tia_->get_cycles_until_horizontal_blank(cycles_since_video_update_)) set_ready_line(false); + if(!tia_->get_cycles_until_horizontal_blank(cycles_since_video_update_)) CPU6502::Processor>::set_ready_line(false); return cycles_run_for / 3; } diff --git a/Machines/Atari2600/CartridgeUnpaged.hpp b/Machines/Atari2600/CartridgeUnpaged.hpp index 2440d0612..19d17e2f4 100644 --- a/Machines/Atari2600/CartridgeUnpaged.hpp +++ b/Machines/Atari2600/CartridgeUnpaged.hpp @@ -13,6 +13,21 @@ namespace Atari2600 { +class CartridgeUnpaged: public Cartridge { + public: + CartridgeUnpaged(const std::vector &rom) : + rom_(rom) {} + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + if(isReadOperation(operation) && (address & 0x1000)) { + *value = rom_[address & (rom_.size() - 1)]; + } + } + + private: + std::vector rom_; +}; + } #endif /* Atari2600_CartridgeUnpaged_hpp */ From 36b58d03b752773ec6e92ea1fcb4ffa23cfefdbd Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 14:46:46 -0400 Subject: [PATCH 03/14] Formalised read bus value guarantee from the 6502, fixed missing clock signal wiring on the Atari cartridge class, reintroduced CommaVid support. --- Machines/Atari2600/Atari2600.cpp | 11 ++++++- Machines/Atari2600/Cartridge.hpp | 4 +-- Machines/Atari2600/CartridgeCommaVid.h | 43 ++++++++++++++++++++++++++ Processors/6502/CPU6502.hpp | 1 + 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 Machines/Atari2600/CartridgeCommaVid.h diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 32fd765c4..550e452b4 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -11,6 +11,7 @@ #include #include "CartridgeUnpaged.hpp" +#include "CartridgeCommaVid.h" using namespace Atari2600; namespace { @@ -72,7 +73,15 @@ void Machine::set_switch_is_enabled(Atari2600Switch input, bool state) { } void Machine::configure_as_target(const StaticAnalyser::Target &target) { - bus_.reset(new CartridgeUnpaged(target.cartridges.front()->get_segments().front().data)); + switch(target.atari.paging_model) { + case StaticAnalyser::Atari2600PagingModel::None: + bus_.reset(new CartridgeUnpaged(target.cartridges.front()->get_segments().front().data)); + break; + case StaticAnalyser::Atari2600PagingModel::CommaVid: + bus_.reset(new CartridgeCommaVid(target.cartridges.front()->get_segments().front().data)); + break; + } + /* if(!target.cartridges.front()->get_segments().size()) return; Storage::Cartridge::Cartridge::Segment segment = target.cartridges.front()->get_segments().front(); size_t length = segment.data.size(); diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridge.hpp index 80e0e9973..4a25bfdce 100644 --- a/Machines/Atari2600/Cartridge.hpp +++ b/Machines/Atari2600/Cartridge.hpp @@ -60,7 +60,7 @@ template class Cartridge: public Bus { public: - void run_for_cycles(int number_of_cycles) {} + void run_for_cycles(int number_of_cycles) { CPU6502::Processor>::run_for_cycles(number_of_cycles); } // to satisfy CPU6502::Processor unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { @@ -79,8 +79,6 @@ template class Cartridge: cycles_since_6532_update_ += (cycles_run_for / 3); if(operation != CPU6502::BusOperation::Ready) { -// uint16_t masked_address = address & 0x1fff; - // give the cartridge a chance to respond to the bus access static_cast(this)->perform_bus_operation(operation, address, value); diff --git a/Machines/Atari2600/CartridgeCommaVid.h b/Machines/Atari2600/CartridgeCommaVid.h new file mode 100644 index 000000000..d470f0ad7 --- /dev/null +++ b/Machines/Atari2600/CartridgeCommaVid.h @@ -0,0 +1,43 @@ +// +// CartridgeCommaVid.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeCommaVid_hpp +#define Atari2600_CartridgeCommaVid_hpp + +namespace Atari2600 { + +class CartridgeCommaVid: public Cartridge { + public: + CartridgeCommaVid(const std::vector &rom) : + rom_(rom) {} + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + if(!(address & 0x1000)) return; + address &= 0x1fff; + + if(address < 0x1400) { + if(isReadOperation(operation)) *value = ram_[address & 1023]; + return; + } + + if(address < 0x1800) { + ram_[address & 1023] = *value; + return; + } + + if(isReadOperation(operation)) *value = rom_[address & 2047]; + } + + private: + std::vector rom_; + uint8_t ram_[1024]; +}; + +} + +#endif /* Atari2600_CartridgeCommaVid_hpp */ diff --git a/Processors/6502/CPU6502.hpp b/Processors/6502/CPU6502.hpp index 930bb8329..eade34959 100644 --- a/Processors/6502/CPU6502.hpp +++ b/Processors/6502/CPU6502.hpp @@ -568,6 +568,7 @@ template class Processor { @discussion Subclasses must implement @c perform_bus_operation(BusOperation operation, uint16_t address, uint8_t *value) . The 6502 will call that method for all bus accesses. The 6502 is guaranteed to perform one bus operation call per cycle. + If it is a read operation then @c value will be seeded with the value 0xff. @param number_of_cycles The number of cycles to run the 6502 for. */ From bb3daaa99b0952991d18036f47f8008af32bf893 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 15:04:01 -0400 Subject: [PATCH 04/14] Sought to reintroduce the Atari 8k paging scheme, at the same time deciding to do away with the copy and paste of holding on to ROM data. --- Machines/Atari2600/Atari2600.cpp | 10 ++- Machines/Atari2600/Cartridge.hpp | 6 ++ Machines/Atari2600/CartridgeAtari8k.hpp | 68 +++++++++++++++++++ ...tridgeCommaVid.h => CartridgeCommaVid.hpp} | 3 +- Machines/Atari2600/CartridgeUnpaged.hpp | 5 +- .../Clock Signal.xcodeproj/project.pbxproj | 4 ++ 6 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 Machines/Atari2600/CartridgeAtari8k.hpp rename Machines/Atari2600/{CartridgeCommaVid.h => CartridgeCommaVid.hpp} (95%) diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 550e452b4..483fd3409 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -11,7 +11,8 @@ #include #include "CartridgeUnpaged.hpp" -#include "CartridgeCommaVid.h" +#include "CartridgeCommaVid.hpp" +#include "CartridgeAtari8k.hpp" using namespace Atari2600; namespace { @@ -80,6 +81,13 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { case StaticAnalyser::Atari2600PagingModel::CommaVid: bus_.reset(new CartridgeCommaVid(target.cartridges.front()->get_segments().front().data)); break; + case StaticAnalyser::Atari2600PagingModel::Atari8k: + if(target.atari.uses_superchip) { + bus_.reset(new CartridgeAtari8kSuperChip(target.cartridges.front()->get_segments().front().data)); + } else { + bus_.reset(new CartridgeAtari8k(target.cartridges.front()->get_segments().front().data)); + } + break; } /* if(!target.cartridges.front()->get_segments().size()) return; diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridge.hpp index 4a25bfdce..a94d3f71c 100644 --- a/Machines/Atari2600/Cartridge.hpp +++ b/Machines/Atari2600/Cartridge.hpp @@ -60,6 +60,9 @@ template class Cartridge: public Bus { public: + Cartridge(const std::vector &rom) : + rom_(rom) {} + void run_for_cycles(int number_of_cycles) { CPU6502::Processor>::run_for_cycles(number_of_cycles); } // to satisfy CPU6502::Processor @@ -201,6 +204,9 @@ template class Cartridge: update_video(); speaker_->flush(); } + + protected: + std::vector rom_; }; } diff --git a/Machines/Atari2600/CartridgeAtari8k.hpp b/Machines/Atari2600/CartridgeAtari8k.hpp new file mode 100644 index 000000000..a5c508738 --- /dev/null +++ b/Machines/Atari2600/CartridgeAtari8k.hpp @@ -0,0 +1,68 @@ +// +// CartridgeAtari8k.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef CartridgeAtari8k_h +#define CartridgeAtari8k_h + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeAtari8k: public Cartridge { + public: + CartridgeAtari8k(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address == 0x1ff8) rom_ptr_ = rom_.data(); + else if(address == 0x1ff9) rom_ptr_ = rom_.data() + 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + } + + private: + uint8_t *rom_ptr_; +}; + +class CartridgeAtari8kSuperChip: public Cartridge { + public: + CartridgeAtari8kSuperChip(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address == 0x1ff8) rom_ptr_ = rom_.data(); + if(address == 0x1ff9) rom_ptr_ = rom_.data() + 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + + if(address < 0x1080) ram_[address & 0x7f] = *value; + else if(address < 0x1100 && isReadOperation(operation)) *value = ram_[address & 0x7f]; + } + + private: + uint8_t *rom_ptr_; + uint8_t ram_[128]; +}; + +} + +#endif /* CartridgeAtari8k_h */ diff --git a/Machines/Atari2600/CartridgeCommaVid.h b/Machines/Atari2600/CartridgeCommaVid.hpp similarity index 95% rename from Machines/Atari2600/CartridgeCommaVid.h rename to Machines/Atari2600/CartridgeCommaVid.hpp index d470f0ad7..09cd49fce 100644 --- a/Machines/Atari2600/CartridgeCommaVid.h +++ b/Machines/Atari2600/CartridgeCommaVid.hpp @@ -14,7 +14,7 @@ namespace Atari2600 { class CartridgeCommaVid: public Cartridge { public: CartridgeCommaVid(const std::vector &rom) : - rom_(rom) {} + Cartridge(rom) {} void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { if(!(address & 0x1000)) return; @@ -34,7 +34,6 @@ class CartridgeCommaVid: public Cartridge { } private: - std::vector rom_; uint8_t ram_[1024]; }; diff --git a/Machines/Atari2600/CartridgeUnpaged.hpp b/Machines/Atari2600/CartridgeUnpaged.hpp index 19d17e2f4..2cab2fd3e 100644 --- a/Machines/Atari2600/CartridgeUnpaged.hpp +++ b/Machines/Atari2600/CartridgeUnpaged.hpp @@ -16,16 +16,13 @@ namespace Atari2600 { class CartridgeUnpaged: public Cartridge { public: CartridgeUnpaged(const std::vector &rom) : - rom_(rom) {} + Cartridge(rom) {} void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { if(isReadOperation(operation) && (address & 0x1000)) { *value = rom_[address & (rom_.size() - 1)]; } } - - private: - std::vector rom_; }; } diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 9645d05f4..9d8046b66 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -582,6 +582,8 @@ 4B9CCDA21DA27C3F0098B625 /* CSJoystickMachine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSJoystickMachine.h; sourceTree = ""; }; 4BA22B051D8817CE0008C640 /* Disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Disk.cpp; path = ../../StaticAnalyser/Commodore/Disk.cpp; sourceTree = ""; }; 4BA22B061D8817CE0008C640 /* Disk.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Disk.hpp; path = ../../StaticAnalyser/Commodore/Disk.hpp; sourceTree = ""; }; + 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCommaVid.hpp; sourceTree = ""; }; + 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari8k.hpp; sourceTree = ""; }; 4BA61EAE1D91515900B3C876 /* NSData+StdVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+StdVector.h"; sourceTree = ""; }; 4BA61EAF1D91515900B3C876 /* NSData+StdVector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSData+StdVector.mm"; sourceTree = ""; }; 4BA799931D8B656E0045123D /* StaticAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticAnalyser.cpp; path = ../../StaticAnalyser/Atari/StaticAnalyser.cpp; sourceTree = ""; }; @@ -1114,6 +1116,8 @@ 4BE7C9171E3D397100A5496D /* TIA.hpp */, 4BE069991E7C942C00DD379F /* Cartridge.hpp */, 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, + 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, + 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */, ); path = Atari2600; sourceTree = ""; From e8d34f2eb4076b32ba1cda2e92f4ff6279b000b3 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 16:34:41 -0400 Subject: [PATCH 05/14] Having farmed out the bus, the Atari itself no longer is/owns a 6502. --- Machines/Atari2600/Atari2600.hpp | 6 +----- Machines/Atari2600/Cartridge.hpp | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Machines/Atari2600/Atari2600.hpp b/Machines/Atari2600/Atari2600.hpp index c8703fb7c..1c9414a27 100644 --- a/Machines/Atari2600/Atari2600.hpp +++ b/Machines/Atari2600/Atari2600.hpp @@ -27,7 +27,6 @@ const unsigned int number_of_upcoming_events = 6; const unsigned int number_of_recorded_counters = 7; class Machine: - public CPU6502::Processor, public CRTMachine::Machine, public ConfigurationTarget::Machine, public Outputs::CRT::Delegate { @@ -41,10 +40,7 @@ class Machine: void set_digital_input(Atari2600DigitalInput input, bool state); void set_switch_is_enabled(Atari2600Switch input, bool state); - - // to satisfy CPU6502::Processor - unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value); - void synchronise(); + void set_reset_line(bool state) { bus_->set_reset_line(state); } // to satisfy CRTMachine::Machine virtual void setup_output(float aspect_ratio); diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridge.hpp index a94d3f71c..24a2d291c 100644 --- a/Machines/Atari2600/Cartridge.hpp +++ b/Machines/Atari2600/Cartridge.hpp @@ -22,6 +22,7 @@ class Bus { cycles_since_6532_update_(0) {} virtual void run_for_cycles(int number_of_cycles) = 0; + virtual void set_reset_line(bool state) = 0; // the RIOT, TIA and speaker PIA mos6532_; @@ -64,6 +65,7 @@ template class Cartridge: rom_(rom) {} void run_for_cycles(int number_of_cycles) { CPU6502::Processor>::run_for_cycles(number_of_cycles); } + void set_reset_line(bool state) { CPU6502::Processor>::set_reset_line(state); } // to satisfy CPU6502::Processor unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { From 55ce851bb2ea45a1a6009700c800bb3e3a18b6dc Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 17:04:01 -0400 Subject: [PATCH 06/14] Fixed types of the 8k cartridges, ensured the 6502 starts without an IRQ request history. --- Machines/Atari2600/CartridgeAtari8k.hpp | 4 ++-- Processors/6502/CPU6502.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Machines/Atari2600/CartridgeAtari8k.hpp b/Machines/Atari2600/CartridgeAtari8k.hpp index a5c508738..8dfe02e76 100644 --- a/Machines/Atari2600/CartridgeAtari8k.hpp +++ b/Machines/Atari2600/CartridgeAtari8k.hpp @@ -13,7 +13,7 @@ namespace Atari2600 { -class CartridgeAtari8k: public Cartridge { +class CartridgeAtari8k: public Cartridge { public: CartridgeAtari8k(const std::vector &rom) : Cartridge(rom) { @@ -36,7 +36,7 @@ class CartridgeAtari8k: public Cartridge { uint8_t *rom_ptr_; }; -class CartridgeAtari8kSuperChip: public Cartridge { +class CartridgeAtari8kSuperChip: public Cartridge { public: CartridgeAtari8kSuperChip(const std::vector &rom) : Cartridge(rom) { diff --git a/Processors/6502/CPU6502.hpp b/Processors/6502/CPU6502.hpp index eade34959..9e76e5559 100644 --- a/Processors/6502/CPU6502.hpp +++ b/Processors/6502/CPU6502.hpp @@ -548,6 +548,7 @@ template class Processor { ready_is_active_(false), scheduled_programs_{nullptr, nullptr, nullptr, nullptr}, inverse_interrupt_flag_(0), + irq_request_history_(0), s_(0), next_bus_operation_(BusOperation::None), interrupt_requests_(InterruptRequestFlags::PowerOn), @@ -657,7 +658,7 @@ template class Processor { case CycleFetchOperation: { last_operation_pc_ = pc_; -// printf("%04x x:%02x\n", pc_.full, x_); +// printf("%04x\n", pc_.full); pc_.full++; read_op(operation_, last_operation_pc_.full); From e0bca1e37b398a8f1e262dc3927f97b2e5954bc0 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 17:34:34 -0400 Subject: [PATCH 07/14] Reinstated the 16 and 32 kb Atari pagers, and ensured the 6532 always starts in a valid state. --- Components/6532/6532.hpp | 3 +- Machines/Atari2600/Atari2600.cpp | 16 ++++++ Machines/Atari2600/CartridgeAtari16k.hpp | 66 ++++++++++++++++++++++++ Machines/Atari2600/CartridgeAtari32k.hpp | 66 ++++++++++++++++++++++++ Machines/Atari2600/CartridgeAtari8k.hpp | 6 +-- 5 files changed, 153 insertions(+), 4 deletions(-) create mode 100644 Machines/Atari2600/CartridgeAtari16k.hpp create mode 100644 Machines/Atari2600/CartridgeAtari32k.hpp diff --git a/Components/6532/6532.hpp b/Components/6532/6532.hpp index bac2a3c3d..69f85b996 100644 --- a/Components/6532/6532.hpp +++ b/Components/6532/6532.hpp @@ -130,7 +130,8 @@ template class MOS6532 { interrupt_status_(0), port_{{.output_mask = 0, .output = 0}, {.output_mask = 0, .output = 0}}, a7_interrupt_({.last_port_value = 0, .enabled = false}), - interrupt_line_(false) + interrupt_line_(false), + timer_{.value = 0, .activeShift = 0, .writtenShift = 0, .interrupt_enabled = false} {} inline void set_port_did_change(int port) diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 483fd3409..3c049ba55 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -13,6 +13,8 @@ #include "CartridgeUnpaged.hpp" #include "CartridgeCommaVid.hpp" #include "CartridgeAtari8k.hpp" +#include "CartridgeAtari16k.hpp" +#include "CartridgeAtari32k.hpp" using namespace Atari2600; namespace { @@ -88,6 +90,20 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { bus_.reset(new CartridgeAtari8k(target.cartridges.front()->get_segments().front().data)); } break; + case StaticAnalyser::Atari2600PagingModel::Atari16k: + if(target.atari.uses_superchip) { + bus_.reset(new CartridgeAtari16kSuperChip(target.cartridges.front()->get_segments().front().data)); + } else { + bus_.reset(new CartridgeAtari16k(target.cartridges.front()->get_segments().front().data)); + } + break; + case StaticAnalyser::Atari2600PagingModel::Atari32k: + if(target.atari.uses_superchip) { + bus_.reset(new CartridgeAtari32kSuperChip(target.cartridges.front()->get_segments().front().data)); + } else { + bus_.reset(new CartridgeAtari32k(target.cartridges.front()->get_segments().front().data)); + } + break; } /* if(!target.cartridges.front()->get_segments().size()) return; diff --git a/Machines/Atari2600/CartridgeAtari16k.hpp b/Machines/Atari2600/CartridgeAtari16k.hpp new file mode 100644 index 000000000..f4504c550 --- /dev/null +++ b/Machines/Atari2600/CartridgeAtari16k.hpp @@ -0,0 +1,66 @@ +// +// CartridgeAtari8k.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeAtari16k_hpp +#define Atari2600_CartridgeAtari16k_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeAtari16k: public Cartridge { + public: + CartridgeAtari16k(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1ff6 && address <= 0x1ff9) rom_ptr_ = rom_.data() + (address - 0x1ff6) * 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + } + + private: + uint8_t *rom_ptr_; +}; + +class CartridgeAtari16kSuperChip: public Cartridge { + public: + CartridgeAtari16kSuperChip(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1ff6 && address <= 0x1ff9) rom_ptr_ = rom_.data() + (address - 0x1ff6) * 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + + if(address < 0x1080) ram_[address & 0x7f] = *value; + else if(address < 0x1100 && isReadOperation(operation)) *value = ram_[address & 0x7f]; + } + + private: + uint8_t *rom_ptr_; + uint8_t ram_[128]; +}; + +} + +#endif /* Atari2600_CartridgeAtari16k_hpp */ diff --git a/Machines/Atari2600/CartridgeAtari32k.hpp b/Machines/Atari2600/CartridgeAtari32k.hpp new file mode 100644 index 000000000..b8d828785 --- /dev/null +++ b/Machines/Atari2600/CartridgeAtari32k.hpp @@ -0,0 +1,66 @@ +// +// CartridgeAtari8k.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeAtari32k_hpp +#define Atari2600_CartridgeAtari32k_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeAtari32k: public Cartridge { + public: + CartridgeAtari32k(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1ff4 && address <= 0x1ffb) rom_ptr_ = rom_.data() + (address - 0x1ff4) * 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + } + + private: + uint8_t *rom_ptr_; +}; + +class CartridgeAtari32kSuperChip: public Cartridge { + public: + CartridgeAtari32kSuperChip(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1ff4 && address <= 0x1ffb) rom_ptr_ = rom_.data() + (address - 0x1ff4) * 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + + if(address < 0x1080) ram_[address & 0x7f] = *value; + else if(address < 0x1100 && isReadOperation(operation)) *value = ram_[address & 0x7f]; + } + + private: + uint8_t *rom_ptr_; + uint8_t ram_[128]; +}; + +} + +#endif /* Atari2600_CartridgeAtari32k_hpp */ diff --git a/Machines/Atari2600/CartridgeAtari8k.hpp b/Machines/Atari2600/CartridgeAtari8k.hpp index 8dfe02e76..9fcfb4509 100644 --- a/Machines/Atari2600/CartridgeAtari8k.hpp +++ b/Machines/Atari2600/CartridgeAtari8k.hpp @@ -6,8 +6,8 @@ // Copyright © 2017 Thomas Harte. All rights reserved. // -#ifndef CartridgeAtari8k_h -#define CartridgeAtari8k_h +#ifndef Atari2600_CartridgeAtari8k_hpp +#define Atari2600_CartridgeAtari8k_hpp #include "Cartridge.hpp" @@ -65,4 +65,4 @@ class CartridgeAtari8kSuperChip: public Cartridge { } -#endif /* CartridgeAtari8k_h */ +#endif /* Atari2600_CartridgeAtari8k_hpp */ From a4cd12394eac8d0f17ea7c46b3ea70c94249ecc0 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 18:03:48 -0400 Subject: [PATCH 08/14] Reinstated the Activision stack pager. --- Machines/Atari2600/Atari2600.cpp | 8 +++- .../Atari2600/CartridgeActivisionStack.hpp | 47 +++++++++++++++++++ .../Clock Signal.xcodeproj/project.pbxproj | 14 ++++-- 3 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 Machines/Atari2600/CartridgeActivisionStack.hpp diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 3c049ba55..cdd9eef6e 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -10,11 +10,12 @@ #include #include -#include "CartridgeUnpaged.hpp" -#include "CartridgeCommaVid.hpp" #include "CartridgeAtari8k.hpp" #include "CartridgeAtari16k.hpp" #include "CartridgeAtari32k.hpp" +#include "CartridgeActivisionStack.hpp" +#include "CartridgeCommaVid.hpp" +#include "CartridgeUnpaged.hpp" using namespace Atari2600; namespace { @@ -104,6 +105,9 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { bus_.reset(new CartridgeAtari32k(target.cartridges.front()->get_segments().front().data)); } break; + case StaticAnalyser::Atari2600PagingModel::ActivisionStack: + bus_.reset(new CartridgeActivisionStack(target.cartridges.front()->get_segments().front().data)); + break; } /* if(!target.cartridges.front()->get_segments().size()) return; diff --git a/Machines/Atari2600/CartridgeActivisionStack.hpp b/Machines/Atari2600/CartridgeActivisionStack.hpp new file mode 100644 index 000000000..8cf8a2713 --- /dev/null +++ b/Machines/Atari2600/CartridgeActivisionStack.hpp @@ -0,0 +1,47 @@ +// +// CartridgeActivisionStack.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeActivisionStack_hpp +#define Atari2600_CartridgeActivisionStack_hpp + +namespace Atari2600 { + +class CartridgeActivisionStack: public Cartridge { + public: + CartridgeActivisionStack(const std::vector &rom) : + Cartridge(rom), + last_opcode_(0x00) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + if(!(address & 0x1000)) return; + + if(operation == CPU6502::BusOperation::ReadOpcode && (last_opcode_ == 0x20 || last_opcode_ == 0x60)) { + if(address & 0x2000) { + rom_ptr_ = rom_.data(); + } else { + rom_ptr_ = rom_.data() + 4096; + } + } + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + + if(operation == CPU6502::BusOperation::ReadOpcode) last_opcode_ = *value; + } + + private: + uint8_t *rom_ptr_; + uint8_t last_opcode_; +}; + +} + +#endif /* Atari2600_CartridgeActivisionStack_hpp */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 9d8046b66..c734eb154 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -944,6 +944,9 @@ 4BEA52641DF3472B007E74F2 /* Speaker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Speaker.cpp; sourceTree = ""; }; 4BEA52651DF3472B007E74F2 /* Speaker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Speaker.hpp; sourceTree = ""; }; 4BEA52671DF34909007E74F2 /* PIA.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PIA.hpp; sourceTree = ""; }; + 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari16k.hpp; sourceTree = ""; }; + 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari32k.hpp; sourceTree = ""; }; + 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeActivisionStack.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1111,13 +1114,16 @@ 4BE7C9161E3D397100A5496D /* TIA.cpp */, 4B2E2D991C3A06EC00138695 /* Atari2600Inputs.h */, 4B2E2D981C3A06EC00138695 /* Atari2600.hpp */, + 4BE069991E7C942C00DD379F /* Cartridge.hpp */, + 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */, + 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */, + 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */, + 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */, + 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, + 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, 4BE7C9171E3D397100A5496D /* TIA.hpp */, - 4BE069991E7C942C00DD379F /* Cartridge.hpp */, - 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, - 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, - 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */, ); path = Atari2600; sourceTree = ""; From df6861c9dc3cfe64872cb03077d75c1a293581a2 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 18:21:01 -0400 Subject: [PATCH 09/14] Parker Bros paging is back. --- Machines/Atari2600/Atari2600.cpp | 73 +++---------------- Machines/Atari2600/CartridgeParkerBros.hpp | 46 ++++++++++++ .../Clock Signal.xcodeproj/project.pbxproj | 2 + 3 files changed, 60 insertions(+), 61 deletions(-) create mode 100644 Machines/Atari2600/CartridgeParkerBros.hpp diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index cdd9eef6e..21891340a 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -15,6 +15,7 @@ #include "CartridgeAtari32k.hpp" #include "CartridgeActivisionStack.hpp" #include "CartridgeCommaVid.hpp" +#include "CartridgeParkerBros.hpp" #include "CartridgeUnpaged.hpp" using namespace Atari2600; @@ -77,18 +78,15 @@ void Machine::set_switch_is_enabled(Atari2600Switch input, bool state) { } void Machine::configure_as_target(const StaticAnalyser::Target &target) { + const std::vector &rom = target.cartridges.front()->get_segments().front().data; switch(target.atari.paging_model) { - case StaticAnalyser::Atari2600PagingModel::None: - bus_.reset(new CartridgeUnpaged(target.cartridges.front()->get_segments().front().data)); - break; - case StaticAnalyser::Atari2600PagingModel::CommaVid: - bus_.reset(new CartridgeCommaVid(target.cartridges.front()->get_segments().front().data)); - break; + case StaticAnalyser::Atari2600PagingModel::None: bus_.reset(new CartridgeUnpaged(rom)); break; + case StaticAnalyser::Atari2600PagingModel::CommaVid: bus_.reset(new CartridgeCommaVid(rom)); break; case StaticAnalyser::Atari2600PagingModel::Atari8k: if(target.atari.uses_superchip) { - bus_.reset(new CartridgeAtari8kSuperChip(target.cartridges.front()->get_segments().front().data)); + bus_.reset(new CartridgeAtari8kSuperChip(rom)); } else { - bus_.reset(new CartridgeAtari8k(target.cartridges.front()->get_segments().front().data)); + bus_.reset(new CartridgeAtari8k(rom)); } break; case StaticAnalyser::Atari2600PagingModel::Atari16k: @@ -108,49 +106,12 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { case StaticAnalyser::Atari2600PagingModel::ActivisionStack: bus_.reset(new CartridgeActivisionStack(target.cartridges.front()->get_segments().front().data)); break; - } - -/* if(!target.cartridges.front()->get_segments().size()) return; - Storage::Cartridge::Cartridge::Segment segment = target.cartridges.front()->get_segments().front(); - size_t length = segment.data.size(); - - rom_size_ = length; - delete[] rom_; - rom_ = new uint8_t[rom_size_]; - - size_t offset = 0; - const size_t copy_step = std::min(rom_size_, length); - while(offset < rom_size_) { - size_t copy_length = std::min(copy_step, rom_size_ - offset); - memcpy(&rom_[offset], &segment.data[0], copy_length); - offset += copy_length; - } - - // On a real paged cartridge, any page may initially be visible. Various homebrew authors appear to have - // decided the last page will always be initially visible. So do that. - size_t rom_mask = rom_size_ - 1; - uint8_t *rom_base = rom_; - if(rom_size_ > 4096) rom_base = &rom_[rom_size_ - 4096]; - rom_pages_[0] = rom_base; - rom_pages_[1] = &rom_base[1024 & rom_mask]; - rom_pages_[2] = &rom_base[2048 & rom_mask]; - rom_pages_[3] = &rom_base[3072 & rom_mask]; - - // By default, throw all stores away, and don't ever read from RAM - for(int c = 0; c < sizeof(ram_write_targets_) / sizeof(*ram_write_targets_); c++) { - ram_write_targets_[c] = throwaway_ram_; - ram_read_targets_[c] = nullptr; - } - - switch(target.atari.paging_model) { - default: - if(target.atari.uses_superchip) { - // allocate 128 bytes of RAM; allow writing from 0x1000, reading from 0x1080 - ram_.resize(128); - ram_write_targets_[0] = ram_.data(); - ram_read_targets_[1] = ram_write_targets_[0]; - } + case StaticAnalyser::Atari2600PagingModel::ParkerBros: + bus_.reset(new CartridgeParkerBros(rom)); break; + } + +/* switch(target.atari.paging_model) { case StaticAnalyser::Atari2600PagingModel::CBSRamPlus: // allocate 256 bytes of RAM; allow writing from 0x1000, reading from 0x1100 ram_.resize(256); @@ -159,14 +120,6 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { ram_read_targets_[2] = ram_write_targets_[0]; ram_read_targets_[3] = ram_write_targets_[1]; break; - case StaticAnalyser::Atari2600PagingModel::CommaVid: - // allocate 1kb of RAM; allow reading from 0x1000, writing from 0x1400 - ram_.resize(1024); - for(int c = 0; c < 8; c++) { - ram_read_targets_[c] = ram_.data() + 128 * c; - ram_write_targets_[c + 8] = ram_.data() + 128 * c; - } - break; case StaticAnalyser::Atari2600PagingModel::MegaBoy: mega_boy_page_ = 15; break; @@ -183,9 +136,7 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { rom_pages_[2] = rom_pages_[0] + 2048; rom_pages_[3] = rom_pages_[0] + 3072; break; - } - - paging_model_ = target.atari.paging_model;*/ + }*/ } #pragma mark - CRT delegate diff --git a/Machines/Atari2600/CartridgeParkerBros.hpp b/Machines/Atari2600/CartridgeParkerBros.hpp new file mode 100644 index 000000000..2b52d5710 --- /dev/null +++ b/Machines/Atari2600/CartridgeParkerBros.hpp @@ -0,0 +1,46 @@ +// +// CartridgeParkerBros.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeParkerBros_hpp +#define Atari2600_CartridgeParkerBros_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeParkerBros: public Cartridge { + public: + CartridgeParkerBros(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_[0] = rom_.data() + 4096; + rom_ptr_[1] = rom_ptr_[0] + 1024; + rom_ptr_[2] = rom_ptr_[1] + 1024; + rom_ptr_[3] = rom_ptr_[2] + 1024; + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1fe0 && address < 0x1ff8) { + int slot = (address >> 3)&3; + rom_ptr_[slot] = rom_.data() + ((address & 7) * 1024); + } + + if(isReadOperation(operation)) { + *value = rom_ptr_[(address >> 10)&3][address & 1023]; + } + } + + private: + uint8_t *rom_ptr_[4]; +}; + +} + +#endif /* Atari2600_CartridgeParkerBros_hpp */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index c734eb154..b7dabddb6 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -947,6 +947,7 @@ 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari16k.hpp; sourceTree = ""; }; 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari32k.hpp; sourceTree = ""; }; 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeActivisionStack.hpp; sourceTree = ""; }; + 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeParkerBros.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1120,6 +1121,7 @@ 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */, 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */, 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, + 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */, 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, From 0b611a14b933e023b32d3c2901f2ba83a2a8881d Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 18:50:13 -0400 Subject: [PATCH 10/14] Tigervision paging returns. --- Machines/Atari2600/Atari2600.cpp | 4 ++ Machines/Atari2600/CartridgeTigervision.hpp | 40 +++++++++++++++++++ .../Clock Signal.xcodeproj/project.pbxproj | 2 + 3 files changed, 46 insertions(+) create mode 100644 Machines/Atari2600/CartridgeTigervision.hpp diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 21891340a..557b5c348 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -16,6 +16,7 @@ #include "CartridgeActivisionStack.hpp" #include "CartridgeCommaVid.hpp" #include "CartridgeParkerBros.hpp" +#include "CartridgeTigervision.hpp" #include "CartridgeUnpaged.hpp" using namespace Atari2600; @@ -109,6 +110,9 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { case StaticAnalyser::Atari2600PagingModel::ParkerBros: bus_.reset(new CartridgeParkerBros(rom)); break; + case StaticAnalyser::Atari2600PagingModel::Tigervision: + bus_.reset(new CartridgeTigervision(rom)); + break; } /* switch(target.atari.paging_model) { diff --git a/Machines/Atari2600/CartridgeTigervision.hpp b/Machines/Atari2600/CartridgeTigervision.hpp new file mode 100644 index 000000000..81c564c4e --- /dev/null +++ b/Machines/Atari2600/CartridgeTigervision.hpp @@ -0,0 +1,40 @@ +// +// CartridgeTigervision.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeTigervision_hpp +#define Atari2600_CartridgeTigervision_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeTigervision: public Cartridge { + public: + CartridgeTigervision(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_[0] = rom_.data() + rom_.size() - 4096; + rom_ptr_[1] = rom_ptr_[0] + 2048; + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + if((address&0x1fff) == 0x3f) { + int offset = ((*value) * 2048) & (rom_.size() - 1); + rom_ptr_[0] = rom_.data() + offset; + return; + } else if((address&0x1000) && isReadOperation(operation)) { + *value = rom_ptr_[(address >> 11)&1][address & 2047]; + } + } + + private: + uint8_t *rom_ptr_[2]; +}; + +} + +#endif /* Atari2600_CartridgeTigervision_hpp */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index b7dabddb6..b7dc076bd 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -948,6 +948,7 @@ 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari32k.hpp; sourceTree = ""; }; 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeActivisionStack.hpp; sourceTree = ""; }; 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeParkerBros.hpp; sourceTree = ""; }; + 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeTigervision.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1126,6 +1127,7 @@ 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, 4BE7C9171E3D397100A5496D /* TIA.hpp */, + 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */, ); path = Atari2600; sourceTree = ""; From 217fbf257e6c345c249669d8d3cbf7ef25a5e529 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 18:56:20 -0400 Subject: [PATCH 11/14] CBS RAM Plus returns. --- Machines/Atari2600/Atari2600.cpp | 34 +++++--------- Machines/Atari2600/CartridgeCBSRAMPlus.hpp | 44 +++++++++++++++++++ .../Clock Signal.xcodeproj/project.pbxproj | 4 +- 3 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 Machines/Atari2600/CartridgeCBSRAMPlus.hpp diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 557b5c348..af2f81733 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -14,6 +14,7 @@ #include "CartridgeAtari16k.hpp" #include "CartridgeAtari32k.hpp" #include "CartridgeActivisionStack.hpp" +#include "CartridgeCBSRAMPlus.hpp" #include "CartridgeCommaVid.hpp" #include "CartridgeParkerBros.hpp" #include "CartridgeTigervision.hpp" @@ -81,8 +82,12 @@ void Machine::set_switch_is_enabled(Atari2600Switch input, bool state) { void Machine::configure_as_target(const StaticAnalyser::Target &target) { const std::vector &rom = target.cartridges.front()->get_segments().front().data; switch(target.atari.paging_model) { - case StaticAnalyser::Atari2600PagingModel::None: bus_.reset(new CartridgeUnpaged(rom)); break; - case StaticAnalyser::Atari2600PagingModel::CommaVid: bus_.reset(new CartridgeCommaVid(rom)); break; + case StaticAnalyser::Atari2600PagingModel::None: bus_.reset(new CartridgeUnpaged(rom)); break; + case StaticAnalyser::Atari2600PagingModel::CommaVid: bus_.reset(new CartridgeCommaVid(rom)); break; + case StaticAnalyser::Atari2600PagingModel::ActivisionStack: bus_.reset(new CartridgeActivisionStack(rom)); break; + case StaticAnalyser::Atari2600PagingModel::ParkerBros: bus_.reset(new CartridgeParkerBros(rom)); break; + case StaticAnalyser::Atari2600PagingModel::Tigervision: bus_.reset(new CartridgeTigervision(rom)); break; + case StaticAnalyser::Atari2600PagingModel::CBSRamPlus: bus_.reset(new CartridgeCBSRAMPlus(rom)); break; case StaticAnalyser::Atari2600PagingModel::Atari8k: if(target.atari.uses_superchip) { bus_.reset(new CartridgeAtari8kSuperChip(rom)); @@ -92,38 +97,21 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { break; case StaticAnalyser::Atari2600PagingModel::Atari16k: if(target.atari.uses_superchip) { - bus_.reset(new CartridgeAtari16kSuperChip(target.cartridges.front()->get_segments().front().data)); + bus_.reset(new CartridgeAtari16kSuperChip(rom)); } else { - bus_.reset(new CartridgeAtari16k(target.cartridges.front()->get_segments().front().data)); + bus_.reset(new CartridgeAtari16k(rom)); } break; case StaticAnalyser::Atari2600PagingModel::Atari32k: if(target.atari.uses_superchip) { - bus_.reset(new CartridgeAtari32kSuperChip(target.cartridges.front()->get_segments().front().data)); + bus_.reset(new CartridgeAtari32kSuperChip(rom)); } else { - bus_.reset(new CartridgeAtari32k(target.cartridges.front()->get_segments().front().data)); + bus_.reset(new CartridgeAtari32k(rom)); } break; - case StaticAnalyser::Atari2600PagingModel::ActivisionStack: - bus_.reset(new CartridgeActivisionStack(target.cartridges.front()->get_segments().front().data)); - break; - case StaticAnalyser::Atari2600PagingModel::ParkerBros: - bus_.reset(new CartridgeParkerBros(rom)); - break; - case StaticAnalyser::Atari2600PagingModel::Tigervision: - bus_.reset(new CartridgeTigervision(rom)); - break; } /* switch(target.atari.paging_model) { - case StaticAnalyser::Atari2600PagingModel::CBSRamPlus: - // allocate 256 bytes of RAM; allow writing from 0x1000, reading from 0x1100 - ram_.resize(256); - ram_write_targets_[0] = ram_.data(); - ram_write_targets_[1] = ram_write_targets_[0] + 128; - ram_read_targets_[2] = ram_write_targets_[0]; - ram_read_targets_[3] = ram_write_targets_[1]; - break; case StaticAnalyser::Atari2600PagingModel::MegaBoy: mega_boy_page_ = 15; break; diff --git a/Machines/Atari2600/CartridgeCBSRAMPlus.hpp b/Machines/Atari2600/CartridgeCBSRAMPlus.hpp new file mode 100644 index 000000000..20653f7af --- /dev/null +++ b/Machines/Atari2600/CartridgeCBSRAMPlus.hpp @@ -0,0 +1,44 @@ +// +// CartridgeCBSRAMPlus.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeCBSRAMPlus_hpp +#define Atari2600_CartridgeCBSRAMPlus_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeCBSRAMPlus: public Cartridge { + public: + CartridgeCBSRAMPlus(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1ff8 && address <= 0x1ffa) rom_ptr_ = rom_.data() + (address - 0x1ff8) * 4096; + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + + if(address < 0x1100) ram_[address & 0xff] = *value; + else if(address < 0x1200 && isReadOperation(operation)) *value = ram_[address & 0xff]; + } + + private: + uint8_t *rom_ptr_; + uint8_t ram_[256]; +}; + +} + +#endif /* Atari2600_CartridgeCBSRAMPlus_hpp */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index b7dc076bd..db22f8e49 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -949,6 +949,7 @@ 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeActivisionStack.hpp; sourceTree = ""; }; 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeParkerBros.hpp; sourceTree = ""; }; 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeTigervision.hpp; sourceTree = ""; }; + 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCBSRAMPlus.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1121,13 +1122,14 @@ 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */, 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */, 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */, + 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */, 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */, + 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */, 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, 4BE7C9171E3D397100A5496D /* TIA.hpp */, - 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */, ); path = Atari2600; sourceTree = ""; From c31d85f820c65390545b9dbf13a969d46bcd364e Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 19:02:34 -0400 Subject: [PATCH 12/14] Re-emplaced the MegaBoy. Also cut detritus from the main Atari header. --- Machines/Atari2600/Atari2600.cpp | 7 +-- Machines/Atari2600/Atari2600.hpp | 16 +------ Machines/Atari2600/CartridgeMegaBoy.hpp | 45 +++++++++++++++++++ .../Clock Signal.xcodeproj/project.pbxproj | 2 + 4 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 Machines/Atari2600/CartridgeMegaBoy.hpp diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index af2f81733..40457ca7f 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -16,6 +16,7 @@ #include "CartridgeActivisionStack.hpp" #include "CartridgeCBSRAMPlus.hpp" #include "CartridgeCommaVid.hpp" +#include "CartridgeMegaBoy.hpp" #include "CartridgeParkerBros.hpp" #include "CartridgeTigervision.hpp" #include "CartridgeUnpaged.hpp" @@ -27,8 +28,6 @@ namespace { } Machine::Machine() : - rom_(nullptr), - rom_pages_{nullptr, nullptr, nullptr, nullptr}, frame_record_pointer_(0), is_ntsc_(true) { set_clock_rate(NTSC_clock_rate); @@ -88,6 +87,7 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { case StaticAnalyser::Atari2600PagingModel::ParkerBros: bus_.reset(new CartridgeParkerBros(rom)); break; case StaticAnalyser::Atari2600PagingModel::Tigervision: bus_.reset(new CartridgeTigervision(rom)); break; case StaticAnalyser::Atari2600PagingModel::CBSRamPlus: bus_.reset(new CartridgeCBSRAMPlus(rom)); break; + case StaticAnalyser::Atari2600PagingModel::MegaBoy: bus_.reset(new CartridgeMegaBoy(rom)); break; case StaticAnalyser::Atari2600PagingModel::Atari8k: if(target.atari.uses_superchip) { bus_.reset(new CartridgeAtari8kSuperChip(rom)); @@ -112,9 +112,6 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { } /* switch(target.atari.paging_model) { - case StaticAnalyser::Atari2600PagingModel::MegaBoy: - mega_boy_page_ = 15; - break; case StaticAnalyser::Atari2600PagingModel::MNetwork: ram_.resize(2048); // Put 256 bytes of RAM for writing at 0x1800 and reading at 0x1900 diff --git a/Machines/Atari2600/Atari2600.hpp b/Machines/Atari2600/Atari2600.hpp index 1c9414a27..e579e1896 100644 --- a/Machines/Atari2600/Atari2600.hpp +++ b/Machines/Atari2600/Atari2600.hpp @@ -53,21 +53,7 @@ class Machine: virtual void crt_did_end_batch_of_frames(Outputs::CRT::CRT *crt, unsigned int number_of_frames, unsigned int number_of_unexpected_vertical_syncs); private: - // ROM information - uint8_t *rom_; - size_t rom_size_; - - // Memory model - uint8_t *rom_pages_[4], *ram_write_targets_[32], *ram_read_targets_[32]; - uint8_t mega_boy_page_; - StaticAnalyser::Atari2600PagingModel paging_model_; - std::vector ram_; - uint8_t throwaway_ram_[128]; - - // Activision stack records - uint8_t last_opcode_; - - // the cartridge + // the bus std::unique_ptr bus_; // output frame rate tracker diff --git a/Machines/Atari2600/CartridgeMegaBoy.hpp b/Machines/Atari2600/CartridgeMegaBoy.hpp new file mode 100644 index 000000000..0a543ca65 --- /dev/null +++ b/Machines/Atari2600/CartridgeMegaBoy.hpp @@ -0,0 +1,45 @@ +// +// CartridgeMegaBoy.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeMegaBoy_hpp +#define Atari2600_CartridgeMegaBoy_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeMegaBoy: public Cartridge { + public: + CartridgeMegaBoy(const std::vector &rom) : + Cartridge(rom), + current_page_(0) { + rom_ptr_ = rom_.data(); + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address == 0x1ff0) { + current_page_ = (current_page_ + 1) & 15; + rom_ptr_ = rom_.data() + current_page_ * 4096; + } + + if(isReadOperation(operation)) { + *value = rom_ptr_[address & 4095]; + } + } + + private: + uint8_t *rom_ptr_; + uint8_t current_page_; +}; + +} + +#endif /* CartridgeMegaBoy_h */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index db22f8e49..d4e620bc5 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -950,6 +950,7 @@ 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeParkerBros.hpp; sourceTree = ""; }; 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeTigervision.hpp; sourceTree = ""; }; 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCBSRAMPlus.hpp; sourceTree = ""; }; + 4BEAC07E1E7DF2D000EE56B2 /* CartridgeMegaBoy.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMegaBoy.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1124,6 +1125,7 @@ 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */, 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */, 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, + 4BEAC07E1E7DF2D000EE56B2 /* CartridgeMegaBoy.hpp */, 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */, 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */, 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, From c033bad0b959b26f0be310d097d210ab729912bf Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 20:51:49 -0400 Subject: [PATCH 13/14] Here's MNetwork! --- Machines/Atari2600/Atari2600.cpp | 2 + Machines/Atari2600/CartridgeMNetwork.hpp | 68 +++++++++++++++++++ .../Clock Signal.xcodeproj/project.pbxproj | 2 + 3 files changed, 72 insertions(+) create mode 100644 Machines/Atari2600/CartridgeMNetwork.hpp diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 40457ca7f..3d6bea78c 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -17,6 +17,7 @@ #include "CartridgeCBSRAMPlus.hpp" #include "CartridgeCommaVid.hpp" #include "CartridgeMegaBoy.hpp" +#include "CartridgeMNetwork.hpp" #include "CartridgeParkerBros.hpp" #include "CartridgeTigervision.hpp" #include "CartridgeUnpaged.hpp" @@ -88,6 +89,7 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { case StaticAnalyser::Atari2600PagingModel::Tigervision: bus_.reset(new CartridgeTigervision(rom)); break; case StaticAnalyser::Atari2600PagingModel::CBSRamPlus: bus_.reset(new CartridgeCBSRAMPlus(rom)); break; case StaticAnalyser::Atari2600PagingModel::MegaBoy: bus_.reset(new CartridgeMegaBoy(rom)); break; + case StaticAnalyser::Atari2600PagingModel::MNetwork: bus_.reset(new CartridgeMNetwork(rom)); break; case StaticAnalyser::Atari2600PagingModel::Atari8k: if(target.atari.uses_superchip) { bus_.reset(new CartridgeAtari8kSuperChip(rom)); diff --git a/Machines/Atari2600/CartridgeMNetwork.hpp b/Machines/Atari2600/CartridgeMNetwork.hpp new file mode 100644 index 000000000..fcd392d36 --- /dev/null +++ b/Machines/Atari2600/CartridgeMNetwork.hpp @@ -0,0 +1,68 @@ +// +// CartridgeMNetwork.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_CartridgeMNetwork_hpp +#define Atari2600_CartridgeMNetwork_hpp + +#include "Cartridge.hpp" + +namespace Atari2600 { + +class CartridgeMNetwork: public Cartridge { + public: + CartridgeMNetwork(const std::vector &rom) : + Cartridge(rom) { + rom_ptr_[0] = rom_.data() + rom_.size() - 4096; + rom_ptr_[1] = rom_ptr_[0] + 2048; + high_ram_ptr_ = high_ram_; + } + + void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { + address &= 0x1fff; + if(!(address & 0x1000)) return; + + if(address >= 0x1fe0 && address <= 0x1fe6) { + rom_ptr_[0] = rom_.data() + (address - 0x1fe0) * 2048; + } else if(address == 0x1fe7) { + rom_ptr_[0] = nullptr; + } else if(address >= 0x1ff8 && address <= 0x1ffb) { + int offset = (address - 0x1ff8) * 256; + high_ram_ptr_ = &high_ram_[offset]; + } + + if(address & 0x800) { + if(address < 0x1900) { + high_ram_ptr_[address & 255] = *value; + } else if(address < 0x1a00) { + if(isReadOperation(operation)) *value = high_ram_ptr_[address & 255]; + } else { + if(isReadOperation(operation)) *value = rom_ptr_[1][address & 2047]; + } + } else { + if(rom_ptr_[0]) { + if(isReadOperation(operation)) *value = rom_ptr_[0][address & 2047]; + } else { + if(address < 0x1400) { + low_ram_[address & 1023] = *value; + } else { + if(isReadOperation(operation)) *value = low_ram_[address & 1023]; + } + } + } + + } + + private: + uint8_t *rom_ptr_[2]; + uint8_t *high_ram_ptr_; + uint8_t low_ram_[1024], high_ram_[1024]; +}; + +} + +#endif /* Atari2600_CartridgeMNetwork_hpp */ diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index d4e620bc5..450d31b92 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -951,6 +951,7 @@ 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeTigervision.hpp; sourceTree = ""; }; 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCBSRAMPlus.hpp; sourceTree = ""; }; 4BEAC07E1E7DF2D000EE56B2 /* CartridgeMegaBoy.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMegaBoy.hpp; sourceTree = ""; }; + 4BEAC07F1E7DF45900EE56B2 /* CartridgeMNetwork.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMNetwork.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1132,6 +1133,7 @@ 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, 4BE7C9171E3D397100A5496D /* TIA.hpp */, + 4BEAC07F1E7DF45900EE56B2 /* CartridgeMNetwork.hpp */, ); path = Atari2600; sourceTree = ""; From c3d82f88a546f69a6171d28845febeb525f032de Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 18 Mar 2017 21:01:58 -0400 Subject: [PATCH 14/14] Tidied up and commented on the Activision stack implementation. --- Machines/Atari2600/Atari2600.cpp | 38 ++++------- Machines/Atari2600/Atari2600.hpp | 2 +- Machines/Atari2600/Bus.hpp | 63 +++++++++++++++++++ .../Atari2600/{ => Cartridges}/Cartridge.hpp | 46 +------------- .../CartridgeActivisionStack.hpp | 3 + .../{ => Cartridges}/CartridgeAtari16k.hpp | 0 .../{ => Cartridges}/CartridgeAtari32k.hpp | 0 .../{ => Cartridges}/CartridgeAtari8k.hpp | 0 .../{ => Cartridges}/CartridgeCBSRAMPlus.hpp | 0 .../{ => Cartridges}/CartridgeCommaVid.hpp | 0 .../{ => Cartridges}/CartridgeMNetwork.hpp | 0 .../{ => Cartridges}/CartridgeMegaBoy.hpp | 0 .../{ => Cartridges}/CartridgeParkerBros.hpp | 0 .../{ => Cartridges}/CartridgeTigervision.hpp | 0 .../{ => Cartridges}/CartridgeUnpaged.hpp | 0 .../Clock Signal.xcodeproj/project.pbxproj | 58 ++++++++++------- 16 files changed, 114 insertions(+), 96 deletions(-) create mode 100644 Machines/Atari2600/Bus.hpp rename Machines/Atari2600/{ => Cartridges}/Cartridge.hpp (84%) rename Machines/Atari2600/{ => Cartridges}/CartridgeActivisionStack.hpp (83%) rename Machines/Atari2600/{ => Cartridges}/CartridgeAtari16k.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeAtari32k.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeAtari8k.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeCBSRAMPlus.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeCommaVid.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeMNetwork.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeMegaBoy.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeParkerBros.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeTigervision.hpp (100%) rename Machines/Atari2600/{ => Cartridges}/CartridgeUnpaged.hpp (100%) diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 3d6bea78c..3353c7290 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -10,17 +10,17 @@ #include #include -#include "CartridgeAtari8k.hpp" -#include "CartridgeAtari16k.hpp" -#include "CartridgeAtari32k.hpp" -#include "CartridgeActivisionStack.hpp" -#include "CartridgeCBSRAMPlus.hpp" -#include "CartridgeCommaVid.hpp" -#include "CartridgeMegaBoy.hpp" -#include "CartridgeMNetwork.hpp" -#include "CartridgeParkerBros.hpp" -#include "CartridgeTigervision.hpp" -#include "CartridgeUnpaged.hpp" +#include "Cartridges/CartridgeAtari8k.hpp" +#include "Cartridges/CartridgeAtari16k.hpp" +#include "Cartridges/CartridgeAtari32k.hpp" +#include "Cartridges/CartridgeActivisionStack.hpp" +#include "Cartridges/CartridgeCBSRAMPlus.hpp" +#include "Cartridges/CartridgeCommaVid.hpp" +#include "Cartridges/CartridgeMegaBoy.hpp" +#include "Cartridges/CartridgeMNetwork.hpp" +#include "Cartridges/CartridgeParkerBros.hpp" +#include "Cartridges/CartridgeTigervision.hpp" +#include "Cartridges/CartridgeUnpaged.hpp" using namespace Atari2600; namespace { @@ -112,22 +112,6 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) { } break; } - -/* switch(target.atari.paging_model) { - case StaticAnalyser::Atari2600PagingModel::MNetwork: - ram_.resize(2048); - // Put 256 bytes of RAM for writing at 0x1800 and reading at 0x1900 - ram_write_targets_[16] = ram_.data(); - ram_write_targets_[17] = ram_write_targets_[16] + 128; - ram_read_targets_[18] = ram_write_targets_[16]; - ram_read_targets_[19] = ram_write_targets_[17]; - - rom_pages_[0] = rom_; - rom_pages_[1] = rom_pages_[0] + 1024; - rom_pages_[2] = rom_pages_[0] + 2048; - rom_pages_[3] = rom_pages_[0] + 3072; - break; - }*/ } #pragma mark - CRT delegate diff --git a/Machines/Atari2600/Atari2600.hpp b/Machines/Atari2600/Atari2600.hpp index e579e1896..f5055b30c 100644 --- a/Machines/Atari2600/Atari2600.hpp +++ b/Machines/Atari2600/Atari2600.hpp @@ -13,10 +13,10 @@ #include "../../Processors/6502/CPU6502.hpp" #include "../CRTMachine.hpp" +#include "Bus.hpp" #include "PIA.hpp" #include "Speaker.hpp" #include "TIA.hpp" -#include "Cartridge.hpp" #include "../ConfigurationTarget.hpp" #include "Atari2600Inputs.h" diff --git a/Machines/Atari2600/Bus.hpp b/Machines/Atari2600/Bus.hpp new file mode 100644 index 000000000..864d22715 --- /dev/null +++ b/Machines/Atari2600/Bus.hpp @@ -0,0 +1,63 @@ +// +// Bus.h +// Clock Signal +// +// Created by Thomas Harte on 18/03/2017. +// Copyright © 2017 Thomas Harte. All rights reserved. +// + +#ifndef Atari2600_Bus_hpp +#define Atari2600_Bus_hpp + +#include "PIA.hpp" +#include "TIA.hpp" +#include "Speaker.hpp" + +namespace Atari2600 { + +class Bus { + public: + Bus() : + tia_input_value_{0xff, 0xff}, + cycles_since_speaker_update_(0), + cycles_since_video_update_(0), + cycles_since_6532_update_(0) {} + + virtual void run_for_cycles(int number_of_cycles) = 0; + virtual void set_reset_line(bool state) = 0; + + // the RIOT, TIA and speaker + PIA mos6532_; + std::shared_ptr tia_; + std::shared_ptr speaker_; + + // joystick state + uint8_t tia_input_value_[2]; + + protected: + // speaker backlog accumlation counter + unsigned int cycles_since_speaker_update_; + inline void update_audio() { + unsigned int audio_cycles = cycles_since_speaker_update_ / 114; + cycles_since_speaker_update_ %= 114; + speaker_->run_for_cycles(audio_cycles); + } + + // video backlog accumulation counter + unsigned int cycles_since_video_update_; + inline void update_video() { + tia_->run_for_cycles((int)cycles_since_video_update_); + cycles_since_video_update_ = 0; + } + + // RIOT backlog accumulation counter + unsigned int cycles_since_6532_update_; + inline void update_6532() { + mos6532_.run_for_cycles(cycles_since_6532_update_); + cycles_since_6532_update_ = 0; + } +}; + +} + +#endif /* Atari2600_Bus_hpp */ diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridges/Cartridge.hpp similarity index 84% rename from Machines/Atari2600/Cartridge.hpp rename to Machines/Atari2600/Cartridges/Cartridge.hpp index 24a2d291c..8581270fe 100644 --- a/Machines/Atari2600/Cartridge.hpp +++ b/Machines/Atari2600/Cartridges/Cartridge.hpp @@ -9,53 +9,11 @@ #ifndef Atari2600_Cartridge_hpp #define Atari2600_Cartridge_hpp -#include "../../Processors/6502/CPU6502.hpp" +#include "../../../Processors/6502/CPU6502.hpp" +#include "../Bus.hpp" namespace Atari2600 { -class Bus { - public: - Bus() : - tia_input_value_{0xff, 0xff}, - cycles_since_speaker_update_(0), - cycles_since_video_update_(0), - cycles_since_6532_update_(0) {} - - virtual void run_for_cycles(int number_of_cycles) = 0; - virtual void set_reset_line(bool state) = 0; - - // the RIOT, TIA and speaker - PIA mos6532_; - std::shared_ptr tia_; - std::shared_ptr speaker_; - - // joystick state - uint8_t tia_input_value_[2]; - - protected: - // speaker backlog accumlation counter - unsigned int cycles_since_speaker_update_; - inline void update_audio() { - unsigned int audio_cycles = cycles_since_speaker_update_ / 114; - cycles_since_speaker_update_ %= 114; - speaker_->run_for_cycles(audio_cycles); - } - - // video backlog accumulation counter - unsigned int cycles_since_video_update_; - inline void update_video() { - tia_->run_for_cycles((int)cycles_since_video_update_); - cycles_since_video_update_ = 0; - } - - // RIOT backlog accumulation counter - unsigned int cycles_since_6532_update_; - inline void update_6532() { - mos6532_.run_for_cycles(cycles_since_6532_update_); - cycles_since_6532_update_ = 0; - } -}; - template class Cartridge: public CPU6502::Processor>, public Bus { diff --git a/Machines/Atari2600/CartridgeActivisionStack.hpp b/Machines/Atari2600/Cartridges/CartridgeActivisionStack.hpp similarity index 83% rename from Machines/Atari2600/CartridgeActivisionStack.hpp rename to Machines/Atari2600/Cartridges/CartridgeActivisionStack.hpp index 8cf8a2713..1b67bfd10 100644 --- a/Machines/Atari2600/CartridgeActivisionStack.hpp +++ b/Machines/Atari2600/Cartridges/CartridgeActivisionStack.hpp @@ -22,6 +22,9 @@ class CartridgeActivisionStack: public Cartridge { void perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) { if(!(address & 0x1000)) return; + // This is a bit of a hack; a real cartridge can't see either the sync or read lines, and can't see + // address line 13. Instead it looks for a pattern in recent address accesses that would imply an + // RST or JSR. if(operation == CPU6502::BusOperation::ReadOpcode && (last_opcode_ == 0x20 || last_opcode_ == 0x60)) { if(address & 0x2000) { rom_ptr_ = rom_.data(); diff --git a/Machines/Atari2600/CartridgeAtari16k.hpp b/Machines/Atari2600/Cartridges/CartridgeAtari16k.hpp similarity index 100% rename from Machines/Atari2600/CartridgeAtari16k.hpp rename to Machines/Atari2600/Cartridges/CartridgeAtari16k.hpp diff --git a/Machines/Atari2600/CartridgeAtari32k.hpp b/Machines/Atari2600/Cartridges/CartridgeAtari32k.hpp similarity index 100% rename from Machines/Atari2600/CartridgeAtari32k.hpp rename to Machines/Atari2600/Cartridges/CartridgeAtari32k.hpp diff --git a/Machines/Atari2600/CartridgeAtari8k.hpp b/Machines/Atari2600/Cartridges/CartridgeAtari8k.hpp similarity index 100% rename from Machines/Atari2600/CartridgeAtari8k.hpp rename to Machines/Atari2600/Cartridges/CartridgeAtari8k.hpp diff --git a/Machines/Atari2600/CartridgeCBSRAMPlus.hpp b/Machines/Atari2600/Cartridges/CartridgeCBSRAMPlus.hpp similarity index 100% rename from Machines/Atari2600/CartridgeCBSRAMPlus.hpp rename to Machines/Atari2600/Cartridges/CartridgeCBSRAMPlus.hpp diff --git a/Machines/Atari2600/CartridgeCommaVid.hpp b/Machines/Atari2600/Cartridges/CartridgeCommaVid.hpp similarity index 100% rename from Machines/Atari2600/CartridgeCommaVid.hpp rename to Machines/Atari2600/Cartridges/CartridgeCommaVid.hpp diff --git a/Machines/Atari2600/CartridgeMNetwork.hpp b/Machines/Atari2600/Cartridges/CartridgeMNetwork.hpp similarity index 100% rename from Machines/Atari2600/CartridgeMNetwork.hpp rename to Machines/Atari2600/Cartridges/CartridgeMNetwork.hpp diff --git a/Machines/Atari2600/CartridgeMegaBoy.hpp b/Machines/Atari2600/Cartridges/CartridgeMegaBoy.hpp similarity index 100% rename from Machines/Atari2600/CartridgeMegaBoy.hpp rename to Machines/Atari2600/Cartridges/CartridgeMegaBoy.hpp diff --git a/Machines/Atari2600/CartridgeParkerBros.hpp b/Machines/Atari2600/Cartridges/CartridgeParkerBros.hpp similarity index 100% rename from Machines/Atari2600/CartridgeParkerBros.hpp rename to Machines/Atari2600/Cartridges/CartridgeParkerBros.hpp diff --git a/Machines/Atari2600/CartridgeTigervision.hpp b/Machines/Atari2600/Cartridges/CartridgeTigervision.hpp similarity index 100% rename from Machines/Atari2600/CartridgeTigervision.hpp rename to Machines/Atari2600/Cartridges/CartridgeTigervision.hpp diff --git a/Machines/Atari2600/CartridgeUnpaged.hpp b/Machines/Atari2600/Cartridges/CartridgeUnpaged.hpp similarity index 100% rename from Machines/Atari2600/CartridgeUnpaged.hpp rename to Machines/Atari2600/Cartridges/CartridgeUnpaged.hpp diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 450d31b92..3915a3812 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -582,8 +582,6 @@ 4B9CCDA21DA27C3F0098B625 /* CSJoystickMachine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSJoystickMachine.h; sourceTree = ""; }; 4BA22B051D8817CE0008C640 /* Disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Disk.cpp; path = ../../StaticAnalyser/Commodore/Disk.cpp; sourceTree = ""; }; 4BA22B061D8817CE0008C640 /* Disk.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Disk.hpp; path = ../../StaticAnalyser/Commodore/Disk.hpp; sourceTree = ""; }; - 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCommaVid.hpp; sourceTree = ""; }; - 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari8k.hpp; sourceTree = ""; }; 4BA61EAE1D91515900B3C876 /* NSData+StdVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+StdVector.h"; sourceTree = ""; }; 4BA61EAF1D91515900B3C876 /* NSData+StdVector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSData+StdVector.mm"; sourceTree = ""; }; 4BA799931D8B656E0045123D /* StaticAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticAnalyser.cpp; path = ../../StaticAnalyser/Atari/StaticAnalyser.cpp; sourceTree = ""; }; @@ -930,8 +928,6 @@ 4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSBestEffortUpdater.m; path = Updater/CSBestEffortUpdater.m; sourceTree = ""; }; 4BD69F921D98760000243FE1 /* AcornADF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AcornADF.cpp; sourceTree = ""; }; 4BD69F931D98760000243FE1 /* AcornADF.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = AcornADF.hpp; sourceTree = ""; }; - 4BE069991E7C942C00DD379F /* Cartridge.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; - 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeUnpaged.hpp; sourceTree = ""; }; 4BE77A2C1D84ADFB00BC3827 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = File.cpp; path = ../../StaticAnalyser/Commodore/File.cpp; sourceTree = ""; }; 4BE77A2D1D84ADFB00BC3827 /* File.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = File.hpp; path = ../../StaticAnalyser/Commodore/File.hpp; sourceTree = ""; }; 4BE7C9161E3D397100A5496D /* TIA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TIA.cpp; sourceTree = ""; }; @@ -944,14 +940,19 @@ 4BEA52641DF3472B007E74F2 /* Speaker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Speaker.cpp; sourceTree = ""; }; 4BEA52651DF3472B007E74F2 /* Speaker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Speaker.hpp; sourceTree = ""; }; 4BEA52671DF34909007E74F2 /* PIA.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PIA.hpp; sourceTree = ""; }; - 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari16k.hpp; sourceTree = ""; }; - 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari32k.hpp; sourceTree = ""; }; - 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeActivisionStack.hpp; sourceTree = ""; }; - 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeParkerBros.hpp; sourceTree = ""; }; - 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeTigervision.hpp; sourceTree = ""; }; - 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCBSRAMPlus.hpp; sourceTree = ""; }; - 4BEAC07E1E7DF2D000EE56B2 /* CartridgeMegaBoy.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMegaBoy.hpp; sourceTree = ""; }; - 4BEAC07F1E7DF45900EE56B2 /* CartridgeMNetwork.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMNetwork.hpp; sourceTree = ""; }; + 4BEAC0811E7E0DF800EE56B2 /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; + 4BEAC0821E7E0DF800EE56B2 /* CartridgeActivisionStack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeActivisionStack.hpp; sourceTree = ""; }; + 4BEAC0831E7E0DF800EE56B2 /* CartridgeAtari16k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari16k.hpp; sourceTree = ""; }; + 4BEAC0841E7E0DF800EE56B2 /* CartridgeAtari32k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari32k.hpp; sourceTree = ""; }; + 4BEAC0851E7E0DF800EE56B2 /* CartridgeAtari8k.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeAtari8k.hpp; sourceTree = ""; }; + 4BEAC0861E7E0DF800EE56B2 /* CartridgeCBSRAMPlus.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCBSRAMPlus.hpp; sourceTree = ""; }; + 4BEAC0871E7E0DF800EE56B2 /* CartridgeCommaVid.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeCommaVid.hpp; sourceTree = ""; }; + 4BEAC0881E7E0DF800EE56B2 /* CartridgeMegaBoy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMegaBoy.hpp; sourceTree = ""; }; + 4BEAC0891E7E0DF800EE56B2 /* CartridgeMNetwork.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeMNetwork.hpp; sourceTree = ""; }; + 4BEAC08A1E7E0DF800EE56B2 /* CartridgeParkerBros.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeParkerBros.hpp; sourceTree = ""; }; + 4BEAC08B1E7E0DF800EE56B2 /* CartridgeTigervision.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeTigervision.hpp; sourceTree = ""; }; + 4BEAC08C1E7E0DF800EE56B2 /* CartridgeUnpaged.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartridgeUnpaged.hpp; sourceTree = ""; }; + 4BEAC08D1E7E0E1A00EE56B2 /* Bus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Bus.hpp; sourceTree = ""; }; 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cartridge.cpp; sourceTree = ""; }; 4BEE0A6B1D72496600532C7B /* Cartridge.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cartridge.hpp; sourceTree = ""; }; 4BEE0A6D1D72496600532C7B /* PRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PRG.cpp; sourceTree = ""; }; @@ -1119,21 +1120,11 @@ 4BE7C9161E3D397100A5496D /* TIA.cpp */, 4B2E2D991C3A06EC00138695 /* Atari2600Inputs.h */, 4B2E2D981C3A06EC00138695 /* Atari2600.hpp */, - 4BE069991E7C942C00DD379F /* Cartridge.hpp */, - 4BEAC07A1E7DDFDA00EE56B2 /* CartridgeActivisionStack.hpp */, - 4BA443E81E7DB8F900C86749 /* CartridgeAtari8k.hpp */, - 4BEAC0781E7DD86E00EE56B2 /* CartridgeAtari16k.hpp */, - 4BEAC0791E7DD86E00EE56B2 /* CartridgeAtari32k.hpp */, - 4BEAC07D1E7DF13E00EE56B2 /* CartridgeCBSRAMPlus.hpp */, - 4BA443E71E7DB54700C86749 /* CartridgeCommaVid.hpp */, - 4BEAC07E1E7DF2D000EE56B2 /* CartridgeMegaBoy.hpp */, - 4BEAC07B1E7DE74200EE56B2 /* CartridgeParkerBros.hpp */, - 4BEAC07C1E7DEA6B00EE56B2 /* CartridgeTigervision.hpp */, - 4BE0699A1E7C9C5A00DD379F /* CartridgeUnpaged.hpp */, + 4BEAC08D1E7E0E1A00EE56B2 /* Bus.hpp */, 4BEA52671DF34909007E74F2 /* PIA.hpp */, 4BEA52651DF3472B007E74F2 /* Speaker.hpp */, 4BE7C9171E3D397100A5496D /* TIA.hpp */, - 4BEAC07F1E7DF45900EE56B2 /* CartridgeMNetwork.hpp */, + 4BEAC0801E7E0DF800EE56B2 /* Cartridges */, ); path = Atari2600; sourceTree = ""; @@ -1965,6 +1956,25 @@ path = Resources; sourceTree = ""; }; + 4BEAC0801E7E0DF800EE56B2 /* Cartridges */ = { + isa = PBXGroup; + children = ( + 4BEAC0811E7E0DF800EE56B2 /* Cartridge.hpp */, + 4BEAC0821E7E0DF800EE56B2 /* CartridgeActivisionStack.hpp */, + 4BEAC0831E7E0DF800EE56B2 /* CartridgeAtari16k.hpp */, + 4BEAC0841E7E0DF800EE56B2 /* CartridgeAtari32k.hpp */, + 4BEAC0851E7E0DF800EE56B2 /* CartridgeAtari8k.hpp */, + 4BEAC0861E7E0DF800EE56B2 /* CartridgeCBSRAMPlus.hpp */, + 4BEAC0871E7E0DF800EE56B2 /* CartridgeCommaVid.hpp */, + 4BEAC0881E7E0DF800EE56B2 /* CartridgeMegaBoy.hpp */, + 4BEAC0891E7E0DF800EE56B2 /* CartridgeMNetwork.hpp */, + 4BEAC08A1E7E0DF800EE56B2 /* CartridgeParkerBros.hpp */, + 4BEAC08B1E7E0DF800EE56B2 /* CartridgeTigervision.hpp */, + 4BEAC08C1E7E0DF800EE56B2 /* CartridgeUnpaged.hpp */, + ); + path = Cartridges; + sourceTree = ""; + }; 4BEE0A691D72496600532C7B /* Cartridge */ = { isa = PBXGroup; children = (