6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Brought the Vic-20 into suffix naming.

Browse Source
This commit is contained in:
Thomas Harte 2016-12-03 13:30:27 -05:00
parent 063a62372f
commit 1b1a8d3e52
2 changed files with 157 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
Machines/Commodore/Vic-20/Vic20.cpp
View File

@ -15,28 +15,28 @@
using namespace Commodore::Vic20; using namespace Commodore::Vic20;
Machine::Machine() : Machine::Machine() :
_rom(nullptr), rom_(nullptr),
_is_running_at_zero_cost(false), is_running_at_zero_cost_(false),
_tape(1022727) tape_(1022727)
{ {
// create 6522s, serial port and bus // create 6522s, serial port and bus
_userPortVIA.reset(new UserPortVIA); user_port_via_.reset(new UserPortVIA);
_keyboardVIA.reset(new KeyboardVIA); keyboard_via_.reset(new KeyboardVIA);
_serialPort.reset(new SerialPort); serial_port_.reset(new SerialPort);
_serialBus.reset(new ::Commodore::Serial::Bus); serial_bus_.reset(new ::Commodore::Serial::Bus);
// wire up the serial bus and serial port // wire up the serial bus and serial port
Commodore::Serial::AttachPortAndBus(_serialPort, _serialBus); Commodore::Serial::AttachPortAndBus(serial_port_, serial_bus_);
// wire up 6522s and serial port // wire up 6522s and serial port
_userPortVIA->set_serial_port(_serialPort); user_port_via_->set_serial_port(serial_port_);
_keyboardVIA->set_serial_port(_serialPort); keyboard_via_->set_serial_port(serial_port_);
_serialPort->set_user_port_via(_userPortVIA); serial_port_->set_user_port_via(user_port_via_);
// wire up the 6522s, tape and machine // wire up the 6522s, tape and machine
_userPortVIA->set_interrupt_delegate(this); user_port_via_->set_interrupt_delegate(this);
_keyboardVIA->set_interrupt_delegate(this); keyboard_via_->set_interrupt_delegate(this);
_tape.set_delegate(this); tape_.set_delegate(this);
// establish the memory maps // establish the memory maps
set_memory_size(MemorySize::Default); set_memory_size(MemorySize::Default);
@ -44,44 +44,44 @@ Machine::Machine() :
// set the NTSC clock rate // set the NTSC clock rate
set_region(NTSC); set_region(NTSC);
// _debugPort.reset(new ::Commodore::Serial::DebugPort); // _debugPort.reset(new ::Commodore::Serial::DebugPort);
// _debugPort->set_serial_bus(_serialBus); // _debugPort->set_serial_bus(serial_bus_);
// _serialBus->add_port(_debugPort); // serial_bus_->add_port(_debugPort);
} }
void Machine::set_memory_size(MemorySize size) void Machine::set_memory_size(MemorySize size)
{ {
memset(_processorReadMemoryMap, 0, sizeof(_processorReadMemoryMap)); memset(processor_read_memory_map_, 0, sizeof(processor_read_memory_map_));
memset(_processorWriteMemoryMap, 0, sizeof(_processorWriteMemoryMap)); memset(processor_write_memory_map_, 0, sizeof(processor_write_memory_map_));
switch(size) switch(size)
{ {
default: break; default: break;
case ThreeKB: case ThreeKB:
write_to_map(_processorReadMemoryMap, _expansionRAM, 0x0000, 0x1000); write_to_map(processor_read_memory_map_, expansion_ram_, 0x0000, 0x1000);
write_to_map(_processorWriteMemoryMap, _expansionRAM, 0x0000, 0x1000); write_to_map(processor_write_memory_map_, expansion_ram_, 0x0000, 0x1000);
break; break;
case ThirtyTwoKB: case ThirtyTwoKB:
write_to_map(_processorReadMemoryMap, _expansionRAM, 0x0000, 0x8000); write_to_map(processor_read_memory_map_, expansion_ram_, 0x0000, 0x8000);
write_to_map(_processorWriteMemoryMap, _expansionRAM, 0x0000, 0x8000); write_to_map(processor_write_memory_map_, expansion_ram_, 0x0000, 0x8000);
break; break;
} }
// install the system ROMs and VIC-visible memory // install the system ROMs and VIC-visible memory
write_to_map(_processorReadMemoryMap, _userBASICMemory, 0x0000, sizeof(_userBASICMemory)); write_to_map(processor_read_memory_map_, user_basic_memory_, 0x0000, sizeof(user_basic_memory_));
write_to_map(_processorReadMemoryMap, _screenMemory, 0x1000, sizeof(_screenMemory)); write_to_map(processor_read_memory_map_, screen_memory_, 0x1000, sizeof(screen_memory_));
write_to_map(_processorReadMemoryMap, _colorMemory, 0x9400, sizeof(_colorMemory)); write_to_map(processor_read_memory_map_, colour_memory_, 0x9400, sizeof(colour_memory_));
write_to_map(_processorReadMemoryMap, _characterROM, 0x8000, sizeof(_characterROM)); write_to_map(processor_read_memory_map_, character_rom_, 0x8000, sizeof(character_rom_));
write_to_map(_processorReadMemoryMap, _basicROM, 0xc000, sizeof(_basicROM)); write_to_map(processor_read_memory_map_, basic_rom_, 0xc000, sizeof(basic_rom_));
write_to_map(_processorReadMemoryMap, _kernelROM, 0xe000, sizeof(_kernelROM)); write_to_map(processor_read_memory_map_, kernel_rom_, 0xe000, sizeof(kernel_rom_));
write_to_map(_processorWriteMemoryMap, _userBASICMemory, 0x0000, sizeof(_userBASICMemory)); write_to_map(processor_write_memory_map_, user_basic_memory_, 0x0000, sizeof(user_basic_memory_));
write_to_map(_processorWriteMemoryMap, _screenMemory, 0x1000, sizeof(_screenMemory)); write_to_map(processor_write_memory_map_, screen_memory_, 0x1000, sizeof(screen_memory_));
write_to_map(_processorWriteMemoryMap, _colorMemory, 0x9400, sizeof(_colorMemory)); write_to_map(processor_write_memory_map_, colour_memory_, 0x9400, sizeof(colour_memory_));
// install the inserted ROM if there is one // install the inserted ROM if there is one
if(_rom) if(rom_)
{ {
write_to_map(_processorReadMemoryMap, _rom, _rom_address, _rom_length); write_to_map(processor_read_memory_map_, rom_, rom_address_, rom_length_);
} }
} }
@ -99,7 +99,7 @@ void Machine::write_to_map(uint8_t **map, uint8_t *area, uint16_t address, uint1
Machine::~Machine() Machine::~Machine()
{ {
delete[] _rom; delete[] rom_;
} }
unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value)
@ -117,17 +117,17 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
// } // }
// run the phase-1 part of this cycle, in which the VIC accesses memory // run the phase-1 part of this cycle, in which the VIC accesses memory
if(!_is_running_at_zero_cost) _mos6560->run_for_cycles(1); if(!is_running_at_zero_cost_) mos6560_->run_for_cycles(1);
// run the phase-2 part of the cycle, which is whatever the 6502 said it should be // run the phase-2 part of the cycle, which is whatever the 6502 said it should be
if(isReadOperation(operation)) if(isReadOperation(operation))
{ {
uint8_t result = _processorReadMemoryMap[address >> 10] ? _processorReadMemoryMap[address >> 10][address & 0x3ff] : 0xff; uint8_t result = processor_read_memory_map_[address >> 10] ? processor_read_memory_map_[address >> 10][address & 0x3ff] : 0xff;
if((address&0xfc00) == 0x9000) if((address&0xfc00) == 0x9000)
{ {
if((address&0xff00) == 0x9000) result &= _mos6560->get_register(address); if((address&0xff00) == 0x9000) result &= mos6560_->get_register(address);
if((address&0xfc10) == 0x9010) result &= _userPortVIA->get_register(address); if((address&0xfc10) == 0x9010) result &= user_port_via_->get_register(address);
if((address&0xfc20) == 0x9020) result &= _keyboardVIA->get_register(address); if((address&0xfc20) == 0x9020) result &= keyboard_via_->get_register(address);
} }
*value = result; *value = result;
@ -135,30 +135,30 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
// PC hits the start of the loop that just waits for an interesting tape interrupt to have // PC hits the start of the loop that just waits for an interesting tape interrupt to have
// occurred then skip both 6522s and the tape ahead to the next interrupt without any further // occurred then skip both 6522s and the tape ahead to the next interrupt without any further
// CPU or 6560 costs. // CPU or 6560 costs.
if(_use_fast_tape_hack && _tape.has_tape() && address == 0xf92f && operation == CPU6502::BusOperation::ReadOpcode) if(use_fast_tape_hack_ && tape_.has_tape() && address == 0xf92f && operation == CPU6502::BusOperation::ReadOpcode)
{ {
while(!_userPortVIA->get_interrupt_line() && !_keyboardVIA->get_interrupt_line() && !_tape.get_tape()->is_at_end()) while(!user_port_via_->get_interrupt_line() && !keyboard_via_->get_interrupt_line() && !tape_.get_tape()->is_at_end())
{ {
_userPortVIA->run_for_cycles(1); user_port_via_->run_for_cycles(1);
_keyboardVIA->run_for_cycles(1); keyboard_via_->run_for_cycles(1);
_tape.run_for_cycles(1); tape_.run_for_cycles(1);
} }
} }
} }
else else
{ {
uint8_t *ram = _processorWriteMemoryMap[address >> 10]; uint8_t *ram = processor_write_memory_map_[address >> 10];
if(ram) ram[address & 0x3ff] = *value; if(ram) ram[address & 0x3ff] = *value;
if((address&0xfc00) == 0x9000) if((address&0xfc00) == 0x9000)
{ {
if((address&0xff00) == 0x9000) _mos6560->set_register(address, *value); if((address&0xff00) == 0x9000) mos6560_->set_register(address, *value);
if((address&0xfc10) == 0x9010) _userPortVIA->set_register(address, *value); if((address&0xfc10) == 0x9010) user_port_via_->set_register(address, *value);
if((address&0xfc20) == 0x9020) _keyboardVIA->set_register(address, *value); if((address&0xfc20) == 0x9020) keyboard_via_->set_register(address, *value);
} }
} }
_userPortVIA->run_for_cycles(1); user_port_via_->run_for_cycles(1);
_keyboardVIA->run_for_cycles(1); keyboard_via_->run_for_cycles(1);
if(typer_ && operation == CPU6502::BusOperation::ReadOpcode && address == 0xEB1E) if(typer_ && operation == CPU6502::BusOperation::ReadOpcode && address == 0xEB1E)
{ {
if(!typer_->type_next_character()) if(!typer_->type_next_character())
@ -167,8 +167,8 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
typer_.reset(); typer_.reset();
} }
} }
_tape.run_for_cycles(1); tape_.run_for_cycles(1);
if(_c1540) _c1540->run_for_cycles(1); if(c1540_) c1540_->run_for_cycles(1);
// If using fast tape then: // If using fast tape then:
// if the PC hits 0xf98e, the ROM's tape loading routine, then begin zero cost processing; // if the PC hits 0xf98e, the ROM's tape loading routine, then begin zero cost processing;
@ -181,19 +181,19 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
// Note the additional test above for PC hitting 0xf92f, which is a loop in the ROM that waits // Note the additional test above for PC hitting 0xf92f, which is a loop in the ROM that waits
// for an interesting interrupt. Up there the fast tape hack goes even further in also cutting // for an interesting interrupt. Up there the fast tape hack goes even further in also cutting
// the CPU out of the action. // the CPU out of the action.
if(_use_fast_tape_hack && _tape.has_tape()) if(use_fast_tape_hack_ && tape_.has_tape())
{ {
if(address == 0xf98e && operation == CPU6502::BusOperation::ReadOpcode) if(address == 0xf98e && operation == CPU6502::BusOperation::ReadOpcode)
{ {
_is_running_at_zero_cost = true; is_running_at_zero_cost_ = true;
set_clock_is_unlimited(true); set_clock_is_unlimited(true);
} }
if( if(
(address < 0xe000 && operation == CPU6502::BusOperation::ReadOpcode) || (address < 0xe000 && operation == CPU6502::BusOperation::ReadOpcode) ||
_tape.get_tape()->is_at_end() tape_.get_tape()->is_at_end()
) )
{ {
_is_running_at_zero_cost = false; is_running_at_zero_cost_ = false;
set_clock_is_unlimited(false); set_clock_is_unlimited(false);
} }
} }
@ -205,31 +205,31 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
void Machine::mos6522_did_change_interrupt_status(void *mos6522) void Machine::mos6522_did_change_interrupt_status(void *mos6522)
{ {
set_nmi_line(_userPortVIA->get_interrupt_line()); set_nmi_line(user_port_via_->get_interrupt_line());
set_irq_line(_keyboardVIA->get_interrupt_line()); set_irq_line(keyboard_via_->get_interrupt_line());
} }
#pragma mark - Setup #pragma mark - Setup
void Machine::set_region(Commodore::Vic20::Region region) void Machine::set_region(Commodore::Vic20::Region region)
{ {
_region = region; region_ = region;
switch(region) switch(region)
{ {
case PAL: case PAL:
set_clock_rate(1108404); set_clock_rate(1108404);
if(_mos6560) if(mos6560_)
{ {
_mos6560->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::PAL); mos6560_->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::PAL);
_mos6560->set_clock_rate(1108404); mos6560_->set_clock_rate(1108404);
} }
break; break;
case NTSC: case NTSC:
set_clock_rate(1022727); set_clock_rate(1022727);
if(_mos6560) if(mos6560_)
{ {
_mos6560->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::NTSC); mos6560_->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::NTSC);
_mos6560->set_clock_rate(1022727); mos6560_->set_clock_rate(1022727);
} }
break; break;
} }
@ -237,20 +237,20 @@ void Machine::set_region(Commodore::Vic20::Region region)
void Machine::setup_output(float aspect_ratio) void Machine::setup_output(float aspect_ratio)
{ {
_mos6560.reset(new Vic6560()); mos6560_.reset(new Vic6560());
_mos6560->get_speaker()->set_high_frequency_cut_off(1600); // There is a 1.6Khz low-pass filter in the Vic-20. mos6560_->get_speaker()->set_high_frequency_cut_off(1600); // There is a 1.6Khz low-pass filter in the Vic-20.
set_region(_region); set_region(region_);
memset(_mos6560->_videoMemoryMap, 0, sizeof(_mos6560->_videoMemoryMap)); memset(mos6560_->video_memory_map, 0, sizeof(mos6560_->video_memory_map));
write_to_map(_mos6560->_videoMemoryMap, _characterROM, 0x0000, sizeof(_characterROM)); write_to_map(mos6560_->video_memory_map, character_rom_, 0x0000, sizeof(character_rom_));
write_to_map(_mos6560->_videoMemoryMap, _userBASICMemory, 0x2000, sizeof(_userBASICMemory)); write_to_map(mos6560_->video_memory_map, user_basic_memory_, 0x2000, sizeof(user_basic_memory_));
write_to_map(_mos6560->_videoMemoryMap, _screenMemory, 0x3000, sizeof(_screenMemory)); write_to_map(mos6560_->video_memory_map, screen_memory_, 0x3000, sizeof(screen_memory_));
_mos6560->_colorMemory = _colorMemory; mos6560_->colour_memory = colour_memory_;
} }
void Machine::close_output() void Machine::close_output()
{ {
_mos6560 = nullptr; mos6560_ = nullptr;
} }
void Machine::set_rom(ROMSlot slot, size_t length, const uint8_t *data) void Machine::set_rom(ROMSlot slot, size_t length, const uint8_t *data)
@ -259,12 +259,12 @@ void Machine::set_rom(ROMSlot slot, size_t length, const uint8_t *data)
size_t max_length = 0x2000; size_t max_length = 0x2000;
switch(slot) switch(slot)
{ {
case Kernel: target = _kernelROM; break; case Kernel: target = kernel_rom_; break;
case Characters: target = _characterROM; max_length = 0x1000; break; case Characters: target = character_rom_; max_length = 0x1000; break;
case BASIC: target = _basicROM; break; case BASIC: target = basic_rom_; break;
case Drive: case Drive:
_driveROM.reset(new uint8_t[length]); drive_rom_.reset(new uint8_t[length]);
memcpy(_driveROM.get(), data, length); memcpy(drive_rom_.get(), data, length);
install_disk_rom(); install_disk_rom();
return; return;
} }
@ -288,7 +288,7 @@ void Machine::set_rom(ROMSlot slot, size_t length, const uint8_t *data)
// { // {
// _rom = new uint8_t[0x2000]; // _rom = new uint8_t[0x2000];
// memcpy(_rom, &data[2], length - 2); // memcpy(_rom, &data[2], length - 2);
// write_to_map(_processorReadMemoryMap, _rom, _rom_address, 0x2000); // write_to_map(processor_read_memory_map_, _rom, _rom_address, 0x2000);
// } // }
// else // else
// { // {
@ -303,19 +303,19 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target)
{ {
if(target.tapes.size()) if(target.tapes.size())
{ {
_tape.set_tape(target.tapes.front()); tape_.set_tape(target.tapes.front());
} }
if(target.disks.size()) if(target.disks.size())
{ {
// construct the 1540 // construct the 1540
_c1540.reset(new ::Commodore::C1540::Machine); c1540_.reset(new ::Commodore::C1540::Machine);
// attach it to the serial bus // attach it to the serial bus
_c1540->set_serial_bus(_serialBus); c1540_->set_serial_bus(serial_bus_);
// hand it the disk // hand it the disk
_c1540->set_disk(target.disks.front()); c1540_->set_disk(target.disks.front());
// install the ROM if it was previously set // install the ROM if it was previously set
install_disk_rom(); install_disk_rom();
@ -323,16 +323,16 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target)
if(target.cartridges.size()) if(target.cartridges.size())
{ {
_rom_address = 0xa000; rom_address_ = 0xa000;
std::vector<uint8_t> rom_image = target.cartridges.front()->get_segments().front().data; std::vector<uint8_t> rom_image = target.cartridges.front()->get_segments().front().data;
_rom_length = (uint16_t)(rom_image.size()); rom_length_ = (uint16_t)(rom_image.size());
_rom = new uint8_t[0x2000]; rom_ = new uint8_t[0x2000];
memcpy(_rom, rom_image.data(), rom_image.size()); memcpy(rom_, rom_image.data(), rom_image.size());
write_to_map(_processorReadMemoryMap, _rom, _rom_address, 0x2000); write_to_map(processor_read_memory_map_, rom_, rom_address_, 0x2000);
} }
if(_should_automatically_load_media) if(should_automatically_load_media_)
{ {
if(target.loadingCommand.length()) // TODO: and automatic loading option enabled if(target.loadingCommand.length()) // TODO: and automatic loading option enabled
{ {
@ -356,18 +356,18 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target)
void Machine::tape_did_change_input(Storage::Tape::BinaryTapePlayer *tape) void Machine::tape_did_change_input(Storage::Tape::BinaryTapePlayer *tape)
{ {
_keyboardVIA->set_control_line_input(KeyboardVIA::Port::A, KeyboardVIA::Line::One, tape->get_input()); keyboard_via_->set_control_line_input(KeyboardVIA::Port::A, KeyboardVIA::Line::One, tape->get_input());
} }
#pragma mark - Disc #pragma mark - Disc
void Machine::install_disk_rom() void Machine::install_disk_rom()
{ {
if(_driveROM && _c1540) if(drive_rom_ && c1540_)
{ {
_c1540->set_rom(_driveROM.get()); c1540_->set_rom(drive_rom_.get());
_c1540->run_for_cycles(2000000); c1540_->run_for_cycles(2000000);
_driveROM.reset(); drive_rom_.reset();
} }
} }
@ -377,7 +377,7 @@ uint8_t UserPortVIA::get_port_input(Port port)
{ {
if(!port) if(!port)
{ {
return _portA; // TODO: bit 6 should be high if there is no tape, low otherwise return port_a_; // TODO: bit 6 should be high if there is no tape, low otherwise
} }
return 0xff; return 0xff;
} }
@ -394,8 +394,8 @@ void UserPortVIA::set_serial_line_state(::Commodore::Serial::Line line, bool val
switch(line) switch(line)
{ {
default: break; default: break;
case ::Commodore::Serial::Line::Data: _portA = (_portA & ~0x02) | (value ? 0x02 : 0x00); break; case ::Commodore::Serial::Line::Data: port_a_ = (port_a_ & ~0x02) | (value ? 0x02 : 0x00); break;
case ::Commodore::Serial::Line::Clock: _portA = (_portA & ~0x01) | (value ? 0x01 : 0x00); break; case ::Commodore::Serial::Line::Clock: port_a_ = (port_a_ & ~0x01) | (value ? 0x01 : 0x00); break;
} }
} }
@ -403,7 +403,7 @@ void UserPortVIA::set_joystick_state(JoystickInput input, bool value)
{ {
if(input != JoystickInput::Right) if(input != JoystickInput::Right)
{ {
_portA = (_portA & ~input) | (value ? 0 : input); port_a_ = (port_a_ & ~input) | (value ? 0 : input);
} }
} }
@ -412,22 +412,22 @@ void UserPortVIA::set_port_output(Port port, uint8_t value, uint8_t mask)
// Line 7 of port A is inverted and output as serial ATN // Line 7 of port A is inverted and output as serial ATN
if(!port) if(!port)
{ {
std::shared_ptr<::Commodore::Serial::Port> serialPort = _serialPort.lock(); std::shared_ptr<::Commodore::Serial::Port> serialPort = serial_port_.lock();
if(serialPort) if(serialPort)
serialPort->set_output(::Commodore::Serial::Line::Attention, (::Commodore::Serial::LineLevel)!(value&0x80)); serialPort->set_output(::Commodore::Serial::Line::Attention, (::Commodore::Serial::LineLevel)!(value&0x80));
} }
} }
UserPortVIA::UserPortVIA() : _portA(0xbf) {} UserPortVIA::UserPortVIA() : port_a_(0xbf) {}
void UserPortVIA::set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort) void UserPortVIA::set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort)
{ {
_serialPort = serialPort; serial_port_ = serialPort;
} }
#pragma mark - KeyboardVIA #pragma mark - KeyboardVIA
KeyboardVIA::KeyboardVIA() : _portB(0xff) KeyboardVIA::KeyboardVIA() : port_b_(0xff)
{ {
clear_all_keys(); clear_all_keys();
} }
@ -435,14 +435,14 @@ KeyboardVIA::KeyboardVIA() : _portB(0xff)
void KeyboardVIA::set_key_state(uint16_t key, bool isPressed) void KeyboardVIA::set_key_state(uint16_t key, bool isPressed)
{ {
if(isPressed) if(isPressed)
_columns[key & 7] &= ~(key >> 3); columns_[key & 7] &= ~(key >> 3);
else else
_columns[key & 7] |= (key >> 3); columns_[key & 7] |= (key >> 3);
} }
void KeyboardVIA::clear_all_keys() void KeyboardVIA::clear_all_keys()
{ {
memset(_columns, 0xff, sizeof(_columns)); memset(columns_, 0xff, sizeof(columns_));
} }
uint8_t KeyboardVIA::get_port_input(Port port) uint8_t KeyboardVIA::get_port_input(Port port)
@ -452,26 +452,26 @@ uint8_t KeyboardVIA::get_port_input(Port port)
uint8_t result = 0xff; uint8_t result = 0xff;
for(int c = 0; c < 8; c++) for(int c = 0; c < 8; c++)
{ {
if(!(_activation_mask&(1 << c))) if(!(activation_mask_&(1 << c)))
result &= _columns[c]; result &= columns_[c];
} }
return result; return result;
} }
return _portB; return port_b_;
} }
void KeyboardVIA::set_port_output(Port port, uint8_t value, uint8_t mask) void KeyboardVIA::set_port_output(Port port, uint8_t value, uint8_t mask)
{ {
if(port) if(port)
_activation_mask = (value & mask) | (~mask); activation_mask_ = (value & mask) | (~mask);
} }
void KeyboardVIA::set_control_line_output(Port port, Line line, bool value) void KeyboardVIA::set_control_line_output(Port port, Line line, bool value)
{ {
if(line == Line::Two) if(line == Line::Two)
{ {
std::shared_ptr<::Commodore::Serial::Port> serialPort = _serialPort.lock(); std::shared_ptr<::Commodore::Serial::Port> serialPort = serial_port_.lock();
if(serialPort) if(serialPort)
{ {
// CB2 is inverted to become serial data; CA2 is inverted to become serial clock // CB2 is inverted to become serial data; CA2 is inverted to become serial clock
@ -487,24 +487,24 @@ void KeyboardVIA::set_joystick_state(JoystickInput input, bool value)
{ {
if(input == JoystickInput::Right) if(input == JoystickInput::Right)
{ {
_portB = (_portB & ~input) | (value ? 0 : input); port_b_ = (port_b_ & ~input) | (value ? 0 : input);
} }
} }
void KeyboardVIA::set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort) void KeyboardVIA::set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort)
{ {
_serialPort = serialPort; serial_port_ = serialPort;
} }
#pragma mark - SerialPort #pragma mark - SerialPort
void SerialPort::set_input(::Commodore::Serial::Line line, ::Commodore::Serial::LineLevel level) void SerialPort::set_input(::Commodore::Serial::Line line, ::Commodore::Serial::LineLevel level)
{ {
std::shared_ptr<UserPortVIA> userPortVIA = _userPortVIA.lock(); std::shared_ptr<UserPortVIA> userPortVIA = user_port_via_.lock();
if(userPortVIA) userPortVIA->set_serial_line_state(line, (bool)level); if(userPortVIA) userPortVIA->set_serial_line_state(line, (bool)level);
} }
void SerialPort::set_user_port_via(std::shared_ptr<UserPortVIA> userPortVIA) void SerialPort::set_user_port_via(std::shared_ptr<UserPortVIA> userPortVIA)
{ {
_userPortVIA = userPortVIA; user_port_via_ = userPortVIA;
} }

90
Machines/Commodore/Vic-20/Vic20.hpp
View File

@ -89,8 +89,8 @@ class UserPortVIA: public MOS::MOS6522<UserPortVIA>, public MOS::MOS6522IRQDeleg
void set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort); void set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort);
private: private:
uint8_t _portA; uint8_t port_a_;
std::weak_ptr<::Commodore::Serial::Port> _serialPort; std::weak_ptr<::Commodore::Serial::Port> serial_port_;
}; };
class KeyboardVIA: public MOS::MOS6522<KeyboardVIA>, public MOS::MOS6522IRQDelegate { class KeyboardVIA: public MOS::MOS6522<KeyboardVIA>, public MOS::MOS6522IRQDelegate {
@ -112,10 +112,10 @@ class KeyboardVIA: public MOS::MOS6522<KeyboardVIA>, public MOS::MOS6522IRQDeleg
void set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort); void set_serial_port(std::shared_ptr<::Commodore::Serial::Port> serialPort);
private: private:
uint8_t _portB; uint8_t port_b_;
uint8_t _columns[8]; uint8_t columns_[8];
uint8_t _activation_mask; uint8_t activation_mask_;
std::weak_ptr<::Commodore::Serial::Port> _serialPort; std::weak_ptr<::Commodore::Serial::Port> serial_port_;
}; };
class SerialPort : public ::Commodore::Serial::Port { class SerialPort : public ::Commodore::Serial::Port {
@ -124,19 +124,19 @@ class SerialPort : public ::Commodore::Serial::Port {
void set_user_port_via(std::shared_ptr<UserPortVIA> userPortVIA); void set_user_port_via(std::shared_ptr<UserPortVIA> userPortVIA);
private: private:
std::weak_ptr<UserPortVIA> _userPortVIA; std::weak_ptr<UserPortVIA> user_port_via_;
}; };
class Vic6560: public MOS::MOS6560<Vic6560> { class Vic6560: public MOS::MOS6560<Vic6560> {
public: public:
inline void perform_read(uint16_t address, uint8_t *pixel_data, uint8_t *colour_data) inline void perform_read(uint16_t address, uint8_t *pixel_data, uint8_t *colour_data)
{ {
*pixel_data = _videoMemoryMap[address >> 10] ? _videoMemoryMap[address >> 10][address & 0x3ff] : 0xff; // TODO *pixel_data = video_memory_map[address >> 10] ? video_memory_map[address >> 10][address & 0x3ff] : 0xff; // TODO
*colour_data = _colorMemory[address & 0x03ff]; *colour_data = colour_memory[address & 0x03ff];
} }
uint8_t *_videoMemoryMap[16]; uint8_t *video_memory_map[16];
uint8_t *_colorMemory; uint8_t *colour_memory;
}; };
class Machine: class Machine:
@ -153,34 +153,30 @@ class Machine:
void set_rom(ROMSlot slot, size_t length, const uint8_t *data); void set_rom(ROMSlot slot, size_t length, const uint8_t *data);
void configure_as_target(const StaticAnalyser::Target &target); void configure_as_target(const StaticAnalyser::Target &target);
// void set_prg(const char *file_name, size_t length, const uint8_t *data);
// void set_tape(std::shared_ptr<Storage::Tape::Tape> tape);
// void set_disk(std::shared_ptr<Storage::Disk::Disk> disk);
void set_key_state(uint16_t key, bool isPressed) { _keyboardVIA->set_key_state(key, isPressed); } void set_key_state(uint16_t key, bool isPressed) { keyboard_via_->set_key_state(key, isPressed); }
void clear_all_keys() { _keyboardVIA->clear_all_keys(); } void clear_all_keys() { keyboard_via_->clear_all_keys(); }
void set_joystick_state(JoystickInput input, bool isPressed) { void set_joystick_state(JoystickInput input, bool isPressed) {
_userPortVIA->set_joystick_state(input, isPressed); user_port_via_->set_joystick_state(input, isPressed);
_keyboardVIA->set_joystick_state(input, isPressed); keyboard_via_->set_joystick_state(input, isPressed);
} }
void set_memory_size(MemorySize size); void set_memory_size(MemorySize size);
void set_region(Region region); void set_region(Region region);
inline void set_use_fast_tape_hack(bool activate) { _use_fast_tape_hack = activate; } inline void set_use_fast_tape_hack(bool activate) { use_fast_tape_hack_ = activate; }
inline void set_should_automatically_load_media(bool activate) { _should_automatically_load_media = activate; } inline void set_should_automatically_load_media(bool activate) { should_automatically_load_media_ = activate; }
// to satisfy CPU6502::Processor // to satisfy CPU6502::Processor
unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value); unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value);
void synchronise() { _mos6560->synchronise(); } void synchronise() { mos6560_->synchronise(); }
// to satisfy CRTMachine::Machine // to satisfy CRTMachine::Machine
virtual void setup_output(float aspect_ratio); virtual void setup_output(float aspect_ratio);
virtual void close_output(); virtual void close_output();
virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() { return _mos6560->get_crt(); } virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() { return mos6560_->get_crt(); }
virtual std::shared_ptr<Outputs::Speaker> get_speaker() { return _mos6560->get_speaker(); } virtual std::shared_ptr<Outputs::Speaker> get_speaker() { return mos6560_->get_speaker(); }
virtual void run_for_cycles(int number_of_cycles) { CPU6502::Processor<Machine>::run_for_cycles(number_of_cycles); } virtual void run_for_cycles(int number_of_cycles) { CPU6502::Processor<Machine>::run_for_cycles(number_of_cycles); }
// TODO: or 1108405 for PAL; see http://www.antimon.org/dl/c64/code/stable.txt
// to satisfy MOS::MOS6522::Delegate // to satisfy MOS::MOS6522::Delegate
virtual void mos6522_did_change_interrupt_status(void *mos6522); virtual void mos6522_did_change_interrupt_status(void *mos6522);
@ -192,40 +188,38 @@ class Machine:
virtual void tape_did_change_input(Storage::Tape::BinaryTapePlayer *tape); virtual void tape_did_change_input(Storage::Tape::BinaryTapePlayer *tape);
private: private:
uint8_t _characterROM[0x1000]; uint8_t character_rom_[0x1000];
uint8_t _basicROM[0x2000]; uint8_t basic_rom_[0x2000];
uint8_t _kernelROM[0x2000]; uint8_t kernel_rom_[0x2000];
uint8_t _expansionRAM[0x8000]; uint8_t expansion_ram_[0x8000];
uint8_t *_rom; uint8_t *rom_;
uint16_t _rom_address, _rom_length; uint16_t rom_address_, rom_length_;
uint8_t _userBASICMemory[0x0400]; uint8_t user_basic_memory_[0x0400];
uint8_t _screenMemory[0x1000]; uint8_t screen_memory_[0x1000];
uint8_t _colorMemory[0x0400]; uint8_t colour_memory_[0x0400];
uint8_t _junkMemory[0x0400]; std::unique_ptr<uint8_t> drive_rom_;
std::unique_ptr<uint8_t> _driveROM;
uint8_t *_processorReadMemoryMap[64]; uint8_t *processor_read_memory_map_[64];
uint8_t *_processorWriteMemoryMap[64]; uint8_t *processor_write_memory_map_[64];
void write_to_map(uint8_t **map, uint8_t *area, uint16_t address, uint16_t length); void write_to_map(uint8_t **map, uint8_t *area, uint16_t address, uint16_t length);
Region _region; Region region_;
std::unique_ptr<Vic6560> _mos6560; std::unique_ptr<Vic6560> mos6560_;
std::shared_ptr<UserPortVIA> _userPortVIA; std::shared_ptr<UserPortVIA> user_port_via_;
std::shared_ptr<KeyboardVIA> _keyboardVIA; std::shared_ptr<KeyboardVIA> keyboard_via_;
std::shared_ptr<SerialPort> _serialPort; std::shared_ptr<SerialPort> serial_port_;
std::shared_ptr<::Commodore::Serial::Bus> _serialBus; std::shared_ptr<::Commodore::Serial::Bus> serial_bus_;
// std::shared_ptr<::Commodore::Serial::DebugPort> _debugPort;
// Tape // Tape
Storage::Tape::BinaryTapePlayer _tape; Storage::Tape::BinaryTapePlayer tape_;
bool _use_fast_tape_hack, _should_automatically_load_media; bool use_fast_tape_hack_, should_automatically_load_media_;
bool _is_running_at_zero_cost; bool is_running_at_zero_cost_;
// Disk // Disk
std::shared_ptr<::Commodore::C1540::Machine> _c1540; std::shared_ptr<::Commodore::C1540::Machine> c1540_;
void install_disk_rom(); void install_disk_rom();
// Autoload string // Autoload string