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

Corrects 16-bit read-modify-write.

Browse Source 
Subject to the TODO proviso on 'correct'; has my 6502 prejudice pushed me into unrealistic bus signalling?
This commit is contained in:
Thomas Harte 2020-10-12 18:36:09 -04:00
parent 5dc3cd3a2f
commit f529eadbec
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,10 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
read(data_address_, data_buffer_.next_input()); read(data_address_, data_buffer_.next_input());
break; break;
case CycleFetchDataThrowaway:
read(data_address_, &throwaway);
break;
case CycleFetchIncorrectDataAddress: case CycleFetchIncorrectDataAddress:
read(incorrect_data_address_, &throwaway); read(incorrect_data_address_, &throwaway);
break; break;
@ -120,7 +124,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
break; break;
case CycleStoreDecrementData: case CycleStoreDecrementData:
write(data_address_, data_buffer_.next_output()); write(data_address_, data_buffer_.next_output_descending());
decrement_data_address(); decrement_data_address();
break; break;
@ -149,7 +153,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
bus_operation = operation; bus_operation = operation;
case CyclePush: case CyclePush:
stack_access(data_buffer_.next_stack(), MOS6502Esque::Write); stack_access(data_buffer_.next_output_descending(), MOS6502Esque::Write);
--s_.full; --s_.full;
break; break;

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

@ -159,7 +159,8 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
if(!is8bit) target(CycleFetchIncrementData); // Data low. if(!is8bit) target(CycleFetchIncrementData); // Data low.
target(CycleFetchData); // Data [high]. target(CycleFetchData); // Data [high].
if(!is8bit) target(CycleFetchData); // 16-bit: reread final byte of data. // TODO: does this look like another read? Or if VDA and VPA are both low, does the 65816 actually do no access?
if(!is8bit) target(CycleFetchDataThrowaway); // 16-bit: reread final byte of data.
else target(CycleStoreDataThrowaway); // 8-bit rewrite final byte of data. else target(CycleStoreDataThrowaway); // 8-bit rewrite final byte of data.
target(OperationPerform); // Perform operation within the data buffer. target(OperationPerform); // Perform operation within the data buffer.
@ -720,7 +721,7 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
target(OperationConstructStackRelative); target(OperationConstructStackRelative);
target(CycleFetchIncrementData); // AAL target(CycleFetchIncrementData); // AAL
target(CycleFetchData); // AAH target(CycleFetchData); // AAH
target(CycleFetchData); // IO. target(CycleFetchDataThrowaway); // IO.
target(OperationConstructStackRelativeIndexedIndirect); target(OperationConstructStackRelativeIndexedIndirect);
read_write(type, is8bit, target); read_write(type, is8bit, target);
@ -1052,6 +1053,7 @@ void ProcessorStorage::set_emulation_mode(bool enabled) {
} }
void ProcessorStorage::set_m_x_flags(bool m, bool x) { void ProcessorStorage::set_m_x_flags(bool m, bool x) {
// true/1 => 8bit for both flags.
mx_flags_[0] = m; mx_flags_[0] = m;
mx_flags_[1] = x; mx_flags_[1] = x;

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

@ -23,6 +23,8 @@ enum MicroOp: uint8_t {
/// Fetches from the address formed by the low byte of the data address and the high byte /// Fetches from the address formed by the low byte of the data address and the high byte
/// of the instruction buffer, throwing the result away. /// of the instruction buffer, throwing the result away.
CycleFetchIncorrectDataAddress, CycleFetchIncorrectDataAddress,
/// Fetches a byte from the data address and throws it away.
CycleFetchDataThrowaway,
// Dedicated block-move cycles; these use the data buffer as an intermediary. // Dedicated block-move cycles; these use the data buffer as an intermediary.
CycleFetchBlockX, CycleFetchBlockX,
@ -306,7 +308,7 @@ struct ProcessorStorage {
return byte(read); return byte(read);
} }
uint8_t *next_stack() { uint8_t *next_output_descending() {
--size; --size;
return byte(size); return byte(size);
} }