6502/emu6502
1
0
Fork 0
mirror of https://github.com/jborza/emu6502.git synced 2024-11-25 03:34:40 +00:00
Code Issues Projects Releases Wiki Activity

fixed page wraparound for indirect y addressing + wraparound test for LDA_INDY

Browse Source
This commit is contained in:
jborza 2019-05-07 21:44:37 +02:00
parent 1b2074d493
commit 3ecf732beb
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memory.c
View File

@ -109,7 +109,7 @@ word get_address_indirect_y(State6502 * state) {
//zero-page address as an argument //zero-page address as an argument
byte indirect_address = fetch_byte(state); byte indirect_address = fetch_byte(state);
//the address and the following byte is read as a word, adding Y register //the address and the following byte is read as a word, adding Y register
word address = read_word(state, indirect_address) + state->y; word address = read_word_wrap(state, indirect_address) + state->y;
return address; return address;
} }

27
test6502.c
View File

@ -238,6 +238,31 @@ void test_LDA_INDY() {
test_cleanup(&state); test_cleanup(&state);
} }
void test_LDA_INDY_wraparound() {
//initialize
State6502 state = create_blank_state();
//arrange
char program[] = { LDA_INDY, 0xFF }; //LDA ($FF), y
memcpy(state.memory + 0x200, program, sizeof(program));
//$FF+0 -> $FF
//value at $FF is $00, continuing at $00 with 04 -> $0400
state.memory[0x00FF] = 0x00;
state.memory[0x0000] = 0x04;
state.memory[0x0100] = 0x33; //fake unwanted value
state.memory[0x0400] = 0xEE; //correct final value
state.pc = 0x200;
//act
test_step(&state);
//assert
assertA(&state, 0xEE);
//cleanup
test_cleanup(&state);
}
//// ORA //// ORA
void test_ORA_IMM() { void test_ORA_IMM() {
@ -2494,7 +2519,7 @@ void test_ror_multiple() {
///////////////////// /////////////////////
typedef void fp(); typedef void fp();
fp* tests_lda[] = { test_LDA_IMM, test_LDA_IMM_zero, test_LDA_ZP, test_LDA_ZPX, test_LDA_ZPX_wraparound, test_LDA_ABS, test_LDA_ABSX, test_LDA_ABSY, test_LDA_INDX, test_LDA_INDY, test_LDA_INDX_wraparound }; fp* tests_lda[] = { test_LDA_IMM, test_LDA_IMM_zero, test_LDA_ZP, test_LDA_ZPX, test_LDA_ZPX_wraparound, test_LDA_ABS, test_LDA_ABSX, test_LDA_ABSY, test_LDA_INDX, test_LDA_INDY, test_LDA_INDX_wraparound, test_LDA_INDY_wraparound };
fp* tests_ora[] = { test_ORA_IMM, test_ORA_ZP, test_ORA_ZPX, test_ORA_ABS, test_ORA_ABSX, test_ORA_ABSY, test_ORA_INDX, test_ORA_INDY, test_ORA_IMM_Z }; fp* tests_ora[] = { test_ORA_IMM, test_ORA_ZP, test_ORA_ZPX, test_ORA_ABS, test_ORA_ABSX, test_ORA_ABSY, test_ORA_INDX, test_ORA_INDY, test_ORA_IMM_Z };
fp* tests_and[] = { test_AND_IMM, test_AND_ZP, test_AND_ZPX, test_AND_ABS, test_AND_ABSX, test_AND_ABSY, test_AND_INDX, test_AND_INDY, test_AND_IMM_Z }; fp* tests_and[] = { test_AND_IMM, test_AND_ZP, test_AND_ZPX, test_AND_ABS, test_AND_ABSX, test_AND_ABSY, test_AND_INDX, test_AND_INDY, test_AND_IMM_Z };
fp* tests_ldx[] = { test_LDX_IMM, test_LDX_IMM_zero, test_LDX_ZP, test_LDX_ZPY, test_LDX_ABS, test_LDX_ABSY }; fp* tests_ldx[] = { test_LDX_IMM, test_LDX_IMM_zero, test_LDX_ZP, test_LDX_ZPY, test_LDX_ABS, test_LDX_ABSY };