6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-09-29 16:55:59 +00:00
Code Issues Projects Releases Wiki Activity

Corrects index-mode CMP, LDA.

Browse Source
This commit is contained in:
Thomas Harte 2021-01-20 21:32:46 -05:00
parent ebdb58d790
commit 8564e7406b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
InstructionSets/M50740/Executor.cpp
View File

@ -271,7 +271,14 @@ template <Operation operation> void Executor::perform(uint8_t *operand [[maybe_u
#define set_nz(a) negative_result_ = zero_result_ = (a) #define set_nz(a) negative_result_ = zero_result_ = (a)
switch(operation) { switch(operation) {
case Operation::LDA: set_nz(a_ = *operand); break; case Operation::LDA:
if(index_mode_) {
write(x_, *operand);
set_nz(*operand);
} else {
set_nz(a_ = *operand);
}
break;
case Operation::LDX: set_nz(x_ = *operand); break; case Operation::LDX: set_nz(x_ = *operand); break;
case Operation::LDY: set_nz(y_ = *operand); break; case Operation::LDY: set_nz(y_ = *operand); break;
@ -373,7 +380,13 @@ template <Operation operation> void Executor::perform(uint8_t *operand [[maybe_u
set_nz(uint8_t(temp16)); \ set_nz(uint8_t(temp16)); \
carry_flag_ = (~temp16 >> 8)&1; \ carry_flag_ = (~temp16 >> 8)&1; \
} }
case Operation::CMP: index(op_cmp); break; case Operation::CMP:
if(index_mode_) {
op_cmp(read(x_));
} else {
op_cmp(a_);
}
break;
case Operation::CPX: op_cmp(x_); break; case Operation::CPX: op_cmp(x_); break;
case Operation::CPY: op_cmp(y_); break; case Operation::CPY: op_cmp(y_); break;
#undef op_cmp #undef op_cmp