6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Makes corrections to ix addressing mode and shift/roll flags.

Browse Source
This commit is contained in:
Thomas Harte
2020-10-09 23:12:20 -04:00
parent 776f014dbe
commit 92e72959c3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,6 +182,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
case OperationCopyDataToInstruction: case OperationCopyDataToInstruction:
instruction_buffer_ = data_buffer_; instruction_buffer_ = data_buffer_;
data_buffer_.clear();
continue; continue;
case OperationCopyAToData: case OperationCopyAToData:
@@ -672,26 +673,26 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
case ASL: case ASL:
flags_.carry = data_buffer_.value >> (7 + m_shift_); flags_.carry = data_buffer_.value >> (7 + m_shift_);
data_buffer_.value <<= 1; data_buffer_.value <<= 1;
flags_.set_nz(instruction_buffer_.value, m_shift_); flags_.set_nz(data_buffer_.value, m_shift_);
break; break;
case LSR: case LSR:
flags_.carry = data_buffer_.value & 1; flags_.carry = data_buffer_.value & 1;
data_buffer_.value >>= 1; data_buffer_.value >>= 1;
flags_.set_nz(instruction_buffer_.value, m_shift_); flags_.set_nz(data_buffer_.value, m_shift_);
break; break;
case ROL: case ROL:
data_buffer_.value = (data_buffer_.value << 1) | flags_.carry; data_buffer_.value = (data_buffer_.value << 1) | flags_.carry;
flags_.carry = data_buffer_.value >> (7 + m_shift_); flags_.carry = data_buffer_.value >> (7 + m_shift_);
flags_.set_nz(instruction_buffer_.value, m_shift_); flags_.set_nz(data_buffer_.value, m_shift_);
break; break;
case ROR: { case ROR: {
const uint8_t next_carry = data_buffer_.value & 1; const uint8_t next_carry = data_buffer_.value & 1;
data_buffer_.value = (data_buffer_.value >> 1) | (flags_.carry << (7 + m_shift_)); data_buffer_.value = (data_buffer_.value >> 1) | (flags_.carry << (7 + m_shift_));
flags_.carry = next_carry; flags_.carry = next_carry;
flags_.set_nz(instruction_buffer_.value, m_shift_); flags_.set_nz(data_buffer_.value, m_shift_);
} break; } break;
// //

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

@@ -405,6 +405,12 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
target(CycleFetchPCThrowaway); // IO. target(CycleFetchPCThrowaway); // IO.
target(CycleFetchIncrementData); // AAL
target(CycleFetchData); // AAH
target(OperationCopyDataToInstruction);
target(OperationConstructAbsolute);
read_write(type, is8bit, target); read_write(type, is8bit, target);
} }