Apple-2-Tools
/
izapple2
mirror of https://github.com/ivanizag/izapple2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support for AND, EOR and ORA

This commit is contained in:
Ivan Izaguirre 2019-01-30 23:44:34 +01:00
parent 1379fda5b5
commit d56bea182f
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
debug.test
View File

Binary file not shown.

40
execute.go
View File

@ -200,6 +200,19 @@ func buildOpCompare(addressMode int, reg int) opFunc {
}
}
func operationAnd(a uint8, b uint8) uint8 { return a & b }
func operationOr(a uint8, b uint8) uint8 { return a | b }
func operationXor(a uint8, b uint8) uint8 { return a ^ b }
func buildOpLogic(addressMode int, operation func(uint8, uint8) uint8) opFunc {
return func(s *state, line []uint8, opcode opcode) {
value, _ := resolveWithAddressMode(s, line, addressMode)
result := operation(value, s.registers.getA())
s.registers.setA(result)
s.registers.updateFlagZN(result)
}
}
/*
TODO:
@ -225,6 +238,33 @@ PLP
*/
var opcodes = [256]opcode{
0x29: opcode{"AND", 2, 2, buildOpLogic(modeImmediate, operationAnd)},
0x25: opcode{"AND", 2, 3, buildOpLogic(modeZeroPage, operationAnd)},
0x35: opcode{"AND", 2, 4, buildOpLogic(modeZeroPageX, operationAnd)},
0x2D: opcode{"AND", 3, 4, buildOpLogic(modeAbsolute, operationAnd)},
0x3D: opcode{"AND", 3, 4, buildOpLogic(modeAbsoluteX, operationAnd)}, // Extra cycles
0x39: opcode{"AND", 3, 4, buildOpLogic(modeAbsoluteY, operationAnd)}, // Extra cycles
0x21: opcode{"AND", 2, 6, buildOpLogic(modeIndexedIndirectX, operationAnd)},
0x31: opcode{"AND", 2, 5, buildOpLogic(modeIndirectIndexedY, operationAnd)}, // Extra cycles
0x49: opcode{"EOR", 2, 2, buildOpLogic(modeImmediate, operationXor)},
0x45: opcode{"EOR", 2, 3, buildOpLogic(modeZeroPage, operationXor)},
0x55: opcode{"EOR", 2, 4, buildOpLogic(modeZeroPageX, operationXor)},
0x4D: opcode{"EOR", 3, 4, buildOpLogic(modeAbsolute, operationXor)},
0x5D: opcode{"EOR", 3, 4, buildOpLogic(modeAbsoluteX, operationXor)}, // Extra cycles
0x59: opcode{"EOR", 3, 4, buildOpLogic(modeAbsoluteY, operationXor)}, // Extra cycles
0x41: opcode{"EOR", 2, 6, buildOpLogic(modeIndexedIndirectX, operationXor)},
0x51: opcode{"EOR", 2, 5, buildOpLogic(modeIndirectIndexedY, operationXor)}, // Extra cycles
0x09: opcode{"ORA", 2, 2, buildOpLogic(modeImmediate, operationOr)},
0x05: opcode{"ORA", 2, 3, buildOpLogic(modeZeroPage, operationOr)},
0x15: opcode{"ORA", 2, 4, buildOpLogic(modeZeroPageX, operationOr)},
0x0D: opcode{"ORA", 3, 4, buildOpLogic(modeAbsolute, operationOr)},
0x1D: opcode{"ORA", 3, 4, buildOpLogic(modeAbsoluteX, operationOr)}, // Extra cycles
0x19: opcode{"ORA", 3, 4, buildOpLogic(modeAbsoluteY, operationOr)}, // Extra cycles
0x01: opcode{"ORA", 2, 6, buildOpLogic(modeIndexedIndirectX, operationOr)},
0x11: opcode{"ORA", 2, 5, buildOpLogic(modeIndirectIndexedY, operationOr)}, // Extra cycles
0x24: opcode{"BIT", 2, 3, buildOpBit(modeZeroPage)},
0x2C: opcode{"BIT", 2, 3, buildOpBit(modeAbsolute)},

22
execute_test.go
View File

@ -239,6 +239,28 @@ func TestClearSetFlag(t *testing.T) {
}
func testLogic(t *testing.T) {
var s state
s.registers.setA(0xF0)
executeLine(&s, []uint8{0x29, 0x1C})
if s.registers.getA() != 0x10 {
t.Errorf("Error in AND <. %v", s.registers)
}
s.registers.setA(0xF0)
executeLine(&s, []uint8{0x49, 0x1C})
if s.registers.getA() != 0xEC {
t.Errorf("Error in EOR <. %v", s.registers)
}
s.registers.setA(0xF0)
executeLine(&s, []uint8{0x09, 0x0C})
if s.registers.getA() != 0xFC {
t.Errorf("Error in ORA <. %v", s.registers)
}
}
func TestCompare(t *testing.T) {
var s state