6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-05 10:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Implements RTI, corrects TAY.

Browse Source
This commit is contained in:
Thomas Harte 2020-10-08 18:06:11 -04:00
parent 0418f51ef2
commit f8004d7096
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Processors/65816/Implementation/65816Implementation.hpp
View File

@ -467,7 +467,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
break; break;
case TAY: case TAY:
LD(x_, a_.full, x_masks_); LD(y_, a_.full, x_masks_);
flags_.set_nz(y_.full, x_shift_); flags_.set_nz(y_.full, x_shift_);
break; break;
@ -483,7 +483,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
// //
// Jumps. // Jumps and returns.
// //
case JML: case JML:
@ -513,6 +513,16 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
pc_ = instruction_buffer_.value; pc_ = instruction_buffer_.value;
break; break;
case RTI:
pc_ = uint16_t(data_buffer_.value >> 8);
flags_.set(uint8_t(data_buffer_.value));
if(!emulation_flag_) {
program_bank_ = (data_buffer_.value & 0xff000000) >> 8;
assert(false); // Extra flags to unpack!
}
break;
// //
// Block moves. // Block moves.
// //
@ -729,7 +739,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
// REP, SEP, // REP, SEP,
// XCE, XBA, // XCE, XBA,
// STP, WAI, // STP, WAI,
// RTI, RTL, // RTL,
// TCD, TCS, TDC, TSC // TCD, TCS, TDC, TSC
default: default:

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

@ -649,6 +649,8 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
target(CyclePull); // New PCL target(CyclePull); // New PCL
target(CyclePull); // New PCH target(CyclePull); // New PCH
if(!is8bit) target(CyclePull); // PBR if(!is8bit) target(CyclePull); // PBR
// TODO: 8bit check here doesn't actually work, it needs to be an is-emulation-mode check.
// New operation needed, I think.
target(OperationPerform); // [RTI] — to unpack the fields above. target(OperationPerform); // [RTI] — to unpack the fields above.
} }