6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Adds test for [d], y; fixes implementation.

Browse Source
This commit is contained in:
Thomas Harte 2020-10-14 21:42:41 -04:00
parent c35969d677
commit e511d33a7c
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OSBindings/Mac/Clock SignalTests/65816AddressingTests.swift
View File

@ -428,9 +428,7 @@ class WDC65816AddressingTests: XCTestCase {
XCTAssertEqual(machine.value(for: .A), 0xcdab)
}
// TODO: all tests from this point downward.
func testIndirectDirectYLong() {
func testIndirectYLong() {
// "If the D register is $FF00 and the m flag is 0, then for LDA [$FE],Y, the address
// of the low byte of the pointer is $00FFFE, the address of the middle byte is $00FFFF,
// and the address of the high byte is $000000. Furthermore, if the Y register is $000A, and
@ -439,8 +437,30 @@ class WDC65816AddressingTests: XCTestCase {
// * $00FFFF contains $FF
// then LDA [$FE],Y loads the low byte of the data from address $130006, and the high byte
// from $130007."
let machine = machine16()
machine.setValue(0xff00, for: .direct)
machine.setValue(0x000a, for: .Y)
machine.setValue(0x12, for: .dataBank)
machine.setValue(0x12, forAddress: 0x0000)
machine.setValue(0xfc, forAddress: 0xfffe)
machine.setValue(0xff, forAddress: 0xffff)
machine.setValue(0xab, forAddress: 0x130006)
machine.setValue(0xcd, forAddress: 0x130007)
// LDA [$fe], y; NOP
machine.setData(Data([0xb7, 0xfe, 0xea]), atAddress: 0x0200)
machine.setValue(0x200, for: .programCounter)
machine.runForNumber(ofCycles: 8)
XCTAssertEqual(machine.value(for: .A), 0xcdab)
}
// TODO: all tests from this point downward.
func testLong() {
// "If the m flag is 0, then LDA $12FFFF loads the low byte of the data from address $12FFFF,
// and the high byte from address $130000."

3
Processors/65816/Implementation/65816Implementation.hpp
View File

@ -315,8 +315,9 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
continue;
case OperationConstructDirectIndirectIndexedLong:
data_address_ = y() + instruction_buffer_.value;
data_address_ = y() + data_buffer_.value;
data_address_increment_mask_ = 0xff'ff'ff;
data_buffer_.clear();
continue;
case OperationConstructDirectIndirectLong: