6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 03:32:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1124 from TomHarte/65816Branches

Browse Source 
65816: Fix test (and commentary) for shortened emulated branches.
This commit is contained in:
Thomas Harte 2023-04-15 23:39:12 -04:00 committed by GitHub
commit d641a9c2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -856,7 +856,7 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
\ \
if( \ if( \
!registers_.emulation_flag || \ !registers_.emulation_flag || \
(registers_.pc & 0xff00) == (instruction_buffer_.value & 0xff00) \ (registers_.pc & 0xff00) == (data_buffer_.value & 0xff00) \
) { \ ) { \
++next_op_; \ ++next_op_; \
} \ } \

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

@ -600,9 +600,9 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
static void relative(AccessType, bool, const std::function<void(MicroOp)> &target) { static void relative(AccessType, bool, const std::function<void(MicroOp)> &target) {
target(CycleFetchIncrementPC); // Offset. target(CycleFetchIncrementPC); // Offset.
target(OperationPerform); // The branch instructions will all skip one or three target(OperationPerform); // The branch instructions will skip zero, one or three
// of the next cycles, depending on the effect of // of the next cycles, depending on the effect of
// the jump. It'll also calculate the correct target // the jump. They'll also calculate the correct target
// address, placing it into the data buffer. // address, placing it into the data buffer.
target(CycleFetchPreviousPCThrowaway); // IO. target(CycleFetchPreviousPCThrowaway); // IO.