6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 01:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Pays a little attention to runtime storage; completes the first page of bus patterns.

Browse Source
This commit is contained in:
Thomas Harte 2020-09-25 18:00:02 -04:00
parent 636e929607
commit 125ddfa513
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Processors/65816/65816.hpp
View File

@ -12,6 +12,8 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "../RegisterSizes.hpp"
namespace CPU { namespace CPU {
namespace WDC65816 { namespace WDC65816 {

32
Processors/65816/Implementation/65816Storage.cpp
View File

@ -28,7 +28,8 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
case LDA: case LDX: case LDY: case LDA: case LDX: case LDY:
case JMP: case JSR: // The access type for these is arbitrary, though consistency is beneficial.
case JMP: case JSR: case JML:
return AccessType::Read; return AccessType::Read;
case STA: case STX: case STY: case STZ: case STA: case STX: case STY: case STZ:
@ -200,6 +201,31 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
target(CycleFetchData); // New PCH. target(CycleFetchData); // New PCH.
target(OperationPerform); // [JSR] target(OperationPerform); // [JSR]
} }
// 3a. Absolute Indirect (a), JML.
static void absolute_indirect_jml(AccessType, bool, const std::function<void(MicroOp)> &target) {
target(CycleFetchIncrementPC); // New AAL.
target(CycleFetchPC); // New AAH.
target(OperationConstructAbsolute); // Calculate data address.
target(CycleFetchIncrementData); // New PCL
target(CycleFetchIncrementData); // New PCH
target(CycleFetchData); // New PBR
target(OperationPerform); // [JML]
};
// 3b. Absolute Indirect (a), JMP.
static void absolute_indirect_jmp(AccessType, bool, const std::function<void(MicroOp)> &target) {
target(CycleFetchIncrementPC); // New AAL.
target(CycleFetchPC); // New AAH.
target(OperationConstructAbsolute); // Calculate data address.
target(CycleFetchIncrementData); // New PCL
target(CycleFetchData); // New PCH
target(OperationPerform); // [JMP]
};
}; };
ProcessorStorage TEMPORARY_test_instance; ProcessorStorage TEMPORARY_test_instance;
@ -324,7 +350,7 @@ ProcessorStorage::ProcessorStorage() {
/* 0x69 ADC # */ /* 0x69 ADC # */
/* 0x6a ROR A */ /* 0x6a ROR A */
/* 0x6b RTL s */ /* 0x6b RTL s */
/* 0x6c JMP (a) */ /* 0x6c JMP (a) */ op(absolute_indirect_jmp, JMP);
/* 0x6d ADC a */ op(absolute, ADC); /* 0x6d ADC a */ op(absolute, ADC);
/* 0x6e ROR a */ /* 0x6e ROR a */
/* 0x6f ADC al */ /* 0x6f ADC al */
@ -443,7 +469,7 @@ ProcessorStorage::ProcessorStorage() {
/* 0xd9 CMP a, y */ /* 0xd9 CMP a, y */
/* 0xda PHX s */ /* 0xda PHX s */
/* 0xdb STP i */ /* 0xdb STP i */
/* 0xdc JMP (a) */ /* 0xdc JML (a) */ op(absolute_indirect_jml, JML);
/* 0xdd CMP a, x */ /* 0xdd CMP a, x */
/* 0xde DEC a, x */ /* 0xde DEC a, x */
/* 0xdf CMP al, x */ /* 0xdf CMP al, x */

17
Processors/65816/Implementation/65816Storage.hpp
View File

@ -61,6 +61,9 @@ enum Operation: uint8_t {
/// Loads the PC with the operand from the data buffer. /// Loads the PC with the operand from the data buffer.
JMP, JMP,
/// Loads the PC and PBR with the operand from the data buffer.
JML,
/// Loads the PC with the operand from the daa buffer, replacing /// Loads the PC with the operand from the daa buffer, replacing
/// it with the old PC. /// it with the old PC.
JSR, JSR,
@ -86,6 +89,20 @@ class ProcessorStorage {
private: private:
friend ProcessorStorageConstructor; friend ProcessorStorageConstructor;
// Registers.
RegisterPair16 a_;
RegisterPair16 x_, y_;
uint16_t pc_, s_;
// Not
uint16_t direct_;
// Banking registers are all stored with the relevant byte
// shifted up bits 16–23.
uint32_t data_bank_; // i.e. DBR.
uint32_t program_bank_; // i.e. PBR.
std::vector<MicroOp> micro_ops_; std::vector<MicroOp> micro_ops_;
}; };