6502
/
emu6502
mirror of https://github.com/jborza/emu6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

correct way to clear the B flag in PLP

This commit is contained in:
jborza 2019-05-01 22:15:03 +02:00
parent adb70b62c3
commit 5ae9274ab9
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu.c
View File

@ -343,7 +343,7 @@ void PLA_(State6502* state) {
void PLP_(State6502* state) {
byte value = pop_byte_from_stack(state);
//we don't read the BRK flag
value ^= 1 << 4;
value &= ~(1 << 4);
memset(&state->flags, value, sizeof(Flags));
}

28
test6502.c
View File

@ -1967,6 +1967,32 @@ void test_PLP() {
test_cleanup(&state);
}
void test_PLP2() {
State6502 state = create_blank_state();
state.sp = 0xfe;
//arrange
char program[] = { PLP };
memcpy(state.memory, program, sizeof(program));
state.memory[0x1FF] = 0x04; //all flags should be on
//act
test_step(&state);
//assert
assert_sp(&state, 0xFF);
assert_flag_c(&state, 0);
assert_flag_d(&state, 0);
assert_flag_b(&state, 0);
assert_flag_z(&state, 0);
assert_flag_v(&state, 0);
assert_flag_n(&state, 0);
assert_flag_i(&state, 0);
//cleanup
test_cleanup(&state);
}
//// JMP
void test_JMP() {
@ -2365,7 +2391,7 @@ fp* tests_eor[] = { test_EOR_IMM, test_EOR_ZP, test_EOR_ZPX, test_EOR_ABS, test_
fp* tests_sta[] = { test_STA_ZP, test_STA_ZPX, test_STA_ABS, test_STA_ABSX, test_STA_ABSY, test_STA_INDX, test_STA_INDY };
fp* tests_pha_pla[] = { test_PHA, test_PLA, test_PLA_N, test_PLA_Z, test_PHA_PLA };
fp* tests_txs_tsx[] = { test_TXS, test_TSX };
fp* tests_php_plp[] = { test_PHP, test_PLP };
fp* tests_php_plp[] = { test_PHP, test_PLP, test_PLP2 };
fp* tests_jmp[] = { test_JMP, test_JMP_IND, test_JMP_IND_wrap };
fp* tests_cmp[] = { test_CMP_ABS_equal, test_CMP_ABS_greater, test_CMP_ABS_greater_2, test_CMP_ABS_less_than, test_CPX_ABS, test_CPY_ABS };
fp* tests_sbc[] = { test_SBC_IMM_multiple };