1
0
mirror of https://github.com/jborza/emu6502.git synced 2024-06-07 16:16:37 +00:00

re-enabled tests

This commit is contained in:
jborza 2019-04-14 11:55:35 +02:00
parent d4bbfaba95
commit 8f218de40d
2 changed files with 11 additions and 11 deletions

10
cpu.c
View File

@ -74,7 +74,7 @@ word pop_word(State6502 * state) {
return result;
}
word get_word(State6502 * state, word address) {
word read_word(State6502 * state, word address) {
return state->memory[address] | state->memory[address + 1] << 8;
}
@ -91,7 +91,7 @@ int emulate_6502_op(State6502 * state) {
//For example if X contains $92 then an STA $2000,X instruction will store the accumulator at $2092 (e.g. $2000 + $92). (STA)
{
word address_indirect = pop_word(state) + state->x;
word address = get_word(state, address_indirect);
word address = read_word(state, address_indirect);
ORA(state, state->memory[address]);
break;
}
@ -104,7 +104,7 @@ int emulate_6502_op(State6502 * state) {
case ORA_INDY: //ORA, indirect, y (post_indexed)
{
word address_indirect = pop_word(state);
word address = get_word(state, address_indirect) + state->y;
word address = read_word(state, address_indirect) + state->y;
ORA(state, state->memory[address]);
unimplemented_instruction(state);
break;
@ -177,7 +177,7 @@ int emulate_6502_op(State6502 * state) {
//zero-page address is added to x register
byte indirect_address = pop_byte(state) + state->x;
//pointing to address of a word holding the address of the operand
word address = get_word(state, indirect_address);
word address = read_word(state, indirect_address);
LDA(state, state->memory[address]);
break;
}
@ -185,7 +185,7 @@ int emulate_6502_op(State6502 * state) {
{
//post-indexed indirect
byte indirect_address = pop_byte(state);
word address = get_word(state, indirect_address) + state->y;
word address = read_word(state, indirect_address) + state->y;
LDA(state, state->memory[address]);
break;
}

View File

@ -211,12 +211,12 @@ void test_LDA_INDY() {
int main()
{
//test_LDA_IMM();
//test_LDA_ZP();
//test_LDA_ZPX();
//test_LDA_ABS();
//test_LDA_ABSX();
//test_LDA_ABSY();
test_LDA_IMM();
test_LDA_ZP();
test_LDA_ZPX();
test_LDA_ABS();
test_LDA_ABSX();
test_LDA_ABSY();
test_LDA_INDX();
test_LDA_INDY();
}