6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-05 05:34:20 +00:00
Code Issues Projects Releases Wiki Activity

Decided to turn the 6522 into a template, since it's a per-cycle thing with variable behaviour. Added appropriate memory map callouts to hit the two in the Vic. Though they don't yet do anything.

Browse Source
This commit is contained in:
Thomas Harte 2016-06-07 19:15:18 -04:00
parent 6522530e1c
commit 26ab96868a
5 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Components/6522/6522.cpp
View File

@ -10,15 +10,3 @@
using namespace MOS; using namespace MOS;
MOS6522::MOS6522()
{
}
void MOS6522::set_register(int address, uint8_t value)
{
}
uint8_t MOS6522::get_register(int address)
{
return 0xff;
}

14
Components/6522/6522.hpp
View File

@ -13,12 +13,18 @@
namespace MOS { namespace MOS {
class MOS6522 { template <class T> class MOS6522 {
public: public:
MOS6522(); MOS6522() : _data_direction{0, 0} {}
void set_register(int address, uint8_t value); void set_register(int address, uint8_t value) {}
uint8_t get_register(int address); uint8_t get_register(int address) {return 0xff;}
private:
uint16_t _interval_timers[2];
uint8_t _shift_register;
uint8_t _input_latches[2];
uint8_t _data_direction[2];
}; };
} }

2
Components/6560/6560.cpp
View File

@ -43,7 +43,7 @@ using namespace MOS;
*/ */
MOS6560::MOS6560() : MOS6560::MOS6560() :
_crt(new Outputs::CRT::CRT(65*4, 4, 261, Outputs::CRT::ColourSpace::YIQ, 65*4, 1, 1)), // TODO: turn 261 back into 263 once vertical sync exists _crt(new Outputs::CRT::CRT(65*4, 4, 261, Outputs::CRT::ColourSpace::YIQ, 228, 1, 1)), // TODO: turn 261 back into 263 once vertical sync exists
_horizontal_counter(0), _horizontal_counter(0),
_vertical_counter(0) _vertical_counter(0)
{ {

17
Machines/Vic-20/Vic20.cpp
View File

@ -33,6 +33,14 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
{ {
*value = _mos6560->get_register(address - 0x9000); *value = _mos6560->get_register(address - 0x9000);
} }
else if((address&0xfff0) == 0x9110)
{
*value = _userPortVIA->get_register(address - 0x9110);
}
else if((address&0xfff0) == 0x9120)
{
*value = _keyboardVIA->get_register(address - 0x9120);
}
} }
else else
{ {
@ -42,6 +50,15 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
{ {
_mos6560->set_register(address - 0x9000, *value); _mos6560->set_register(address - 0x9000, *value);
} }
else if((address&0xfff0) == 0x9110)
{
_userPortVIA->set_register(address - 0x9110, *value);
}
else if((address&0xfff0) == 0x9120)
{
_keyboardVIA->set_register(address - 0x9120, *value);
}
// TODO: the 6522 // TODO: the 6522
} }

9
Machines/Vic-20/Vic20.hpp
View File

@ -11,6 +11,7 @@
#include "../../Processors/6502/CPU6502.hpp" #include "../../Processors/6502/CPU6502.hpp"
#include "../../Components/6560/6560.hpp" #include "../../Components/6560/6560.hpp"
#include "../../Components/6522/6522.hpp"
#include "../CRTMachine.hpp" #include "../CRTMachine.hpp"
namespace Vic20 { namespace Vic20 {
@ -21,6 +22,12 @@ enum ROMSlot {
ROMSlotCharacters, ROMSlotCharacters,
}; };
class UserPortVIA: public MOS::MOS6522<UserPortVIA> {
};
class KeyboardVIA: public MOS::MOS6522<KeyboardVIA> {
};
class Machine: public CPU6502::Processor<Machine>, public CRTMachine::Machine { class Machine: public CPU6502::Processor<Machine>, public CRTMachine::Machine {
public: public:
Machine(); Machine();
@ -65,6 +72,8 @@ class Machine: public CPU6502::Processor<Machine>, public CRTMachine::Machine {
} }
std::unique_ptr<MOS::MOS6560> _mos6560; std::unique_ptr<MOS::MOS6560> _mos6560;
std::unique_ptr<UserPortVIA> _userPortVIA;
std::unique_ptr<KeyboardVIA> _keyboardVIA;
}; };
} }