6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-24 12:30:17 +00:00
Code Issues Projects Releases Wiki Activity

Made an attempt at getting some interrupts all up inside this thing.

Browse Source
This commit is contained in:
Thomas Harte 2016-01-10 19:06:46 -05:00
parent cc5ba8243e
commit ccf20299a3
3 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Machines/Electron/Electron.cpp
View File

@ -160,6 +160,11 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
}
}
// if(operation == CPU6502::BusOperation::ReadOpcode)
// {
// printf("%04x: %02x (%d)\n", address, *value, _frameCycles);
// }
_frameCycles += cycles;
if(_frameCycles == cycles_per_frame)
{
@ -197,6 +202,10 @@ inline void Machine::evaluate_interrupts()
{
_interruptStatus |= 1;
}
else
{
_interruptStatus &= ~1;
}
set_irq_line(_interruptStatus & 1);
}
@ -232,7 +241,10 @@ inline void Machine::update_display()
{
// on lines prior to 28 or after or equal to 284, or on a line that is equal to 8 or 9 modulo 10 in a line-spaced mode,
// the line is then definitely blank.
if(current_line < 28 || current_line >= 284)
if(
(current_line < 28 || current_line >= 284)
// || (((current_line - 28)%10) > 7)
)
{
if(line_position == 9)
{
@ -278,7 +290,8 @@ inline void Machine::update_display()
if(line_position == 104)
{
if(!((current_line - 27)&7))
if(!((current_line - 27)%8))
// if(!((current_line - 27)&7))
{
_startLineAddress += 40*8 - 7;
}

4
Machines/Electron/Electron.hpp
View File

@ -30,8 +30,8 @@ enum ROMSlot: uint8_t {
};
enum Interrupt: uint8_t {
InterruptRealTimeClock = 0x04,
InterruptDisplayEnd = 0x08,
InterruptDisplayEnd = 0x04,
InterruptRealTimeClock = 0x08,
InterruptTransmitDataEmpty = 0x10,
InterruptReceiveDataFull = 0x20,
InterruptHighToneDetect = 0x40

33
Processors/6502/CPU6502.hpp
View File

@ -58,7 +58,8 @@ template <class T> class Processor {
enum MicroOp {
CycleFetchOperation, CycleFetchOperand, OperationDecodeOperation, CycleIncPCPushPCH,
CyclePushPCH, CyclePushPCL, CyclePushA, CyclePushOperand,
CycleSetIReadBRKLow, CycleReadBRKHigh, CycleReadFromS, CycleReadFromPC,
CycleSetIReadBRKLow, CycleReadBRKHigh,
CycleReadFromS, CycleReadFromPC,
CyclePullOperand, CyclePullPCL, CyclePullPCH, CyclePullA,
CycleReadAndIncrementPC, CycleIncrementPCAndReadStack, CycleIncrementPCReadPCHLoadPCL, CycleReadPCHLoadPCL,
CycleReadAddressHLoadAddressL, CycleReadPCLFromAddress, CycleReadPCHFromAddress, CycleLoadAddressAbsolute,
@ -84,6 +85,7 @@ template <class T> class Processor {
OperationTAY, OperationTAX, OperationTSX, OperationARR,
OperationSBX, OperationLXA, OperationANE, OperationANC,
OperationLAS, CycleAddSignedOperandToPC, OperationSetFlagsFromOperand, OperationSetOperandFromFlagsWithBRKSet,
OperationSetOperandFromFlags,
OperationSetFlagsFromA, CycleReadRSTLow, CycleReadRSTHigh, CycleScheduleJam
};
@ -378,6 +380,8 @@ template <class T> class Processor {
bool _ready_line_is_enabled;
bool _reset_line_is_enabled;
bool _irq_line_is_enabled, _irq_line_history[2];
bool _nmi_line_is_enabled;
bool _ready_is_active;
public:
@ -406,6 +410,19 @@ template <class T> class Processor {
return reset;
}
const MicroOp *get_irq_program() {
static const MicroOp reset[] = {
CyclePushPCH,
CyclePushPCL,
OperationSetOperandFromFlags,
CyclePushOperand,
CycleSetIReadBRKLow,
CycleReadBRKHigh,
OperationMoveToNextProgram
};
return reset;
}
void run_for_cycles(int number_of_cycles)
{
static const MicroOp doBranch[] = {
@ -428,7 +445,12 @@ template <class T> class Processor {
if(_reset_line_is_enabled)\
schedule_program(get_reset_program());\
else\
schedule_program(fetch_decode_execute);\
{\
if(_irq_line_history[1] && !_interruptFlag)\
schedule_program(get_irq_program());\
else\
schedule_program(fetch_decode_execute);\
}\
op;\
}
@ -444,6 +466,8 @@ template <class T> class Processor {
while (!_ready_is_active && _cycles_left_to_run > 0) {
if (_nextBusOperation != BusOperation::None) {
_irq_line_history[0] = _irq_line_history[1];
_irq_line_history[1] = _irq_line_is_enabled;
_cycles_left_to_run -= static_cast<T *>(this)->perform_bus_operation(_nextBusOperation, _busAddress, _busValue);
_nextBusOperation = BusOperation::None;
}
@ -520,6 +544,7 @@ template <class T> class Processor {
case CyclePullOperand: _s++; read_mem(_operand, _s | 0x100); break;
case OperationSetFlagsFromOperand: set_flags(_operand); break;
case OperationSetOperandFromFlagsWithBRKSet: _operand = get_flags() | Flag::Break; break;
case OperationSetOperandFromFlags: _operand = get_flags(); break;
case OperationSetFlagsFromA: _zeroResult = _negativeResult = _a; break;
case CycleIncrementPCAndReadStack: _pc.full++; throwaway_read(_s | 0x100); break;
@ -983,12 +1008,12 @@ template <class T> class Processor {
void set_irq_line(bool active)
{
// TODO
_irq_line_is_enabled = active;
}
void set_nmi_line(bool active)
{
// TODO
_nmi_line_is_enabled = active;
}
bool is_jammed()