6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 08:31:11 +00:00
Code Issues Projects Releases Wiki Activity

Takes a run at JSL al.

Browse Source
This commit is contained in:
Thomas Harte 2020-09-25 18:35:00 -04:00
parent 7980a9033e
commit 2b7ffcd48f
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
Read, Write
};
constexpr AccessType access_type_for_operation(Operation operation) {
constexpr static AccessType access_type_for_operation(Operation operation) {
switch(operation) {
case ADC: case AND: case BIT: case CMP:
case CPX: case CPY: case EOR: case ORA:
@ -29,7 +29,7 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
case LDA: case LDX: case LDY:
// The access type for these is arbitrary, though consistency is beneficial.
case JMP: case JSR: case JML:
case JMP: case JSR: case JML: case JSL:
return AccessType::Read;
case STA: case STX: case STY: case STZ:
@ -199,7 +199,7 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
target(OperationConstructAbsoluteIndexedIndirect); // Calculate data address.
target(CycleFetchIncrementData); // New PCL
target(CycleFetchData); // New PCH.
target(OperationPerform); // [JSR]
target(OperationPerform); // ['JSR' (actually: JMP will do)]
}
// 3a. Absolute Indirect (a), JML.
@ -246,8 +246,8 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
}
};
// 4a. Absolute long al, JMP.
static void absolute_long_jmp(AccessType type, bool is8bit, const std::function<void(MicroOp)> &target) {
// 4b. Absolute long al, JMP.
static void absolute_long_jmp(AccessType, bool, const std::function<void(MicroOp)> &target) {
target(CycleFetchIncrementPC); // New PCL.
target(CycleFetchIncrementPC); // New PCH.
target(CycleFetchPC); // New PBR.
@ -255,6 +255,24 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
target(OperationConstructAbsolute); // Calculate data address.
target(OperationPerform); // ['JMP' (though it's JML in internal terms)]
};
// 4c. Absolute long al, JSL.
static void absolute_long_jsl(AccessType, bool, const std::function<void(MicroOp)> &target) {
target(CycleFetchIncrementPC); // New PCL.
target(CycleFetchIncrementPC); // New PCH.
target(OperationCopyPBRToData); // Copy PBR to the data register.
target(CyclePush); // PBR.
target(CycleAccessStack); // IO.
target(CycleFetchIncrementPC); // New PBR.
target(OperationConstructAbsolute); // Calculate data address.
target(OperationPerform); // [JSL]
target(CyclePush); // PCH
target(CyclePush); // PCL
};
};
ProcessorStorage TEMPORARY_test_instance;
@ -302,7 +320,7 @@ ProcessorStorage::ProcessorStorage() {
/* 0x20 JSR a */ op(absolute_jsr, JSR);
/* 0x21 ORA (d), y */
/* 0x22 AND (d, x) */
/* 0x23 JSL al */
/* 0x23 JSL al */ op(absolute_long_jsl, JSL);
/* 0x24 BIT d */
/* 0x25 AND d */
/* 0x26 ROL d */
@ -532,7 +550,7 @@ ProcessorStorage::ProcessorStorage() {
/* 0xf9 SBC a, y */
/* 0xfa PLX s */
/* 0xfb XCE i */
/* 0xfc JSR (a, x) */ op(absolute_indexed_indirect_jsr, JSR);
/* 0xfc JSR (a, x) */ op(absolute_indexed_indirect_jsr, JMP); // [sic]
/* 0xfd SBC a, x */
/* 0xfe INC a, x */
/* 0xff SBC al, x */

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

@ -29,10 +29,13 @@ enum MicroOp: uint8_t {
/// Pushes a single byte from the data buffer to the stack.
CyclePush,
/// Fetches from the current stack location and throws the result away.
CycleAccessStack,
/// Sets the data address by copying the final two bytes of the instruction buffer.
OperationConstructAbsolute,
/// Sets the data address
/// Sets the data address to the result of (a, x).
/// TODO: explain better once implemented.
OperationConstructAbsoluteIndexedIndirect,
/// Performs whatever operation goes with this program.
@ -41,6 +44,9 @@ enum MicroOp: uint8_t {
/// Copies the current program counter to the data buffer.
OperationCopyPCToData,
/// Copies the current PBR to the data buffer.
OperationCopyPBRToData,
/// Complete this set of micr-ops.
OperationMoveToNextProgram
};
@ -64,9 +70,13 @@ enum Operation: uint8_t {
/// 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 data buffer, replacing
/// it with the old PC.
JSR,
/// Loads the PC and the PBR with the operand from the data buffer,
/// replacing it with the old PC (and only the PC; PBR not included).
JSL,
};
class ProcessorStorageConstructor;