mirror of
https://github.com/TomHarte/CLK.git
synced 2025-01-12 15:31:09 +00:00
Implemented an additional constructor for RegisterStates, pulling it out into file-level scope and implementing Equatable.
This commit is contained in:
Thomas Harte
parent
a23a6db4d6
commit
454c8628c3
@ -9,84 +9,135 @@
|
||||
import XCTest
|
||||
import Foundation
|
||||
|
||||
class FUSETests: XCTestCase {
|
||||
fileprivate struct RegisterState {
|
||||
var af: UInt16 = 0, bc: UInt16 = 0, de: UInt16 = 0, hl: UInt16 = 0
|
||||
var afDash: UInt16 = 0, bcDash: UInt16 = 0, deDash: UInt16 = 0, hlDash: UInt16 = 0
|
||||
var ix: UInt16 = 0, iy: UInt16 = 0, sp: UInt16 = 0, pc: UInt16 = 0
|
||||
var i: UInt8 = 0, r: UInt8 = 0
|
||||
var iff1: Bool = false, iff2: Bool = false, interruptMode: Int = 0
|
||||
var isHalted: Bool = false
|
||||
var tStates: Int = 0
|
||||
|
||||
struct RegisterState {
|
||||
var af: UInt16 = 0, bc: UInt16 = 0, de: UInt16 = 0, hl: UInt16 = 0
|
||||
var afDash: UInt16 = 0, bcDash: UInt16 = 0, deDash: UInt16 = 0, hlDash: UInt16 = 0
|
||||
var ix: UInt16 = 0, iy: UInt16 = 0, sp: UInt16 = 0, pc: UInt16 = 0
|
||||
var i: UInt8 = 0, r: UInt8 = 0
|
||||
var iff1: Bool = false, iff2: Bool = false, interruptMode: Int = 0
|
||||
var isHalted: Bool = false
|
||||
var tStates: Int = 0
|
||||
|
||||
func set(onMachine machine: CSTestMachineZ80) {
|
||||
machine.setValue(af, for: .AF)
|
||||
machine.setValue(bc, for: .BC)
|
||||
machine.setValue(de, for: .DE)
|
||||
machine.setValue(hl, for: .HL)
|
||||
machine.setValue(afDash, for: .afDash)
|
||||
machine.setValue(bcDash, for: .bcDash)
|
||||
machine.setValue(deDash, for: .deDash)
|
||||
machine.setValue(hlDash, for: .hlDash)
|
||||
machine.setValue(ix, for: .IX)
|
||||
machine.setValue(iy, for: .IY)
|
||||
machine.setValue(sp, for: .stackPointer)
|
||||
machine.setValue(pc, for: .programCounter)
|
||||
machine.setValue(UInt16(i), for: .I)
|
||||
machine.setValue(UInt16(r), for: .R)
|
||||
machine.setValue(iff1 ? 1 : 0, for: .IFF1)
|
||||
machine.setValue(iff2 ? 1 : 0, for: .IFF2)
|
||||
machine.setValue(UInt16(interruptMode), for: .IM)
|
||||
// TODO: isHalted
|
||||
}
|
||||
|
||||
fileprivate func readHexInt16(from scanner: Scanner) -> UInt16 {
|
||||
var temporary: UInt32 = 0
|
||||
scanner.scanHexInt32(&temporary)
|
||||
return UInt16(temporary)
|
||||
}
|
||||
|
||||
fileprivate func readHexInt8(from scanner: Scanner) -> UInt8 {
|
||||
var temporary: UInt32 = 0
|
||||
scanner.scanHexInt32(&temporary)
|
||||
return UInt8(temporary)
|
||||
}
|
||||
|
||||
init(scanner: Scanner) {
|
||||
af = readHexInt16(from: scanner)
|
||||
bc = readHexInt16(from: scanner)
|
||||
de = readHexInt16(from: scanner)
|
||||
hl = readHexInt16(from: scanner)
|
||||
|
||||
afDash = readHexInt16(from: scanner)
|
||||
bcDash = readHexInt16(from: scanner)
|
||||
deDash = readHexInt16(from: scanner)
|
||||
hlDash = readHexInt16(from: scanner)
|
||||
|
||||
ix = readHexInt16(from: scanner)
|
||||
iy = readHexInt16(from: scanner)
|
||||
|
||||
sp = readHexInt16(from: scanner)
|
||||
pc = readHexInt16(from: scanner)
|
||||
|
||||
i = readHexInt8(from: scanner)
|
||||
r = readHexInt8(from: scanner)
|
||||
|
||||
iff1 = readHexInt8(from: scanner) == 1
|
||||
iff2 = readHexInt8(from: scanner) == 1
|
||||
|
||||
var temporary: UInt32 = 0
|
||||
scanner.scanHexInt32(&temporary)
|
||||
interruptMode = Int(temporary)
|
||||
|
||||
isHalted = readHexInt8(from: scanner) == 1
|
||||
|
||||
scanner.scanHexInt32(&temporary)
|
||||
tStates = Int(temporary)
|
||||
}
|
||||
func set(onMachine machine: CSTestMachineZ80) {
|
||||
machine.setValue(af, for: .AF)
|
||||
machine.setValue(bc, for: .BC)
|
||||
machine.setValue(de, for: .DE)
|
||||
machine.setValue(hl, for: .HL)
|
||||
machine.setValue(afDash, for: .afDash)
|
||||
machine.setValue(bcDash, for: .bcDash)
|
||||
machine.setValue(deDash, for: .deDash)
|
||||
machine.setValue(hlDash, for: .hlDash)
|
||||
machine.setValue(ix, for: .IX)
|
||||
machine.setValue(iy, for: .IY)
|
||||
machine.setValue(sp, for: .stackPointer)
|
||||
machine.setValue(pc, for: .programCounter)
|
||||
machine.setValue(UInt16(i), for: .I)
|
||||
machine.setValue(UInt16(r), for: .R)
|
||||
machine.setValue(iff1 ? 1 : 0, for: .IFF1)
|
||||
machine.setValue(iff2 ? 1 : 0, for: .IFF2)
|
||||
machine.setValue(UInt16(interruptMode), for: .IM)
|
||||
// TODO: isHalted
|
||||
}
|
||||
|
||||
fileprivate func readHexInt16(from scanner: Scanner) -> UInt16 {
|
||||
var temporary: UInt32 = 0
|
||||
scanner.scanHexInt32(&temporary)
|
||||
return UInt16(temporary)
|
||||
}
|
||||
|
||||
fileprivate func readHexInt8(from scanner: Scanner) -> UInt8 {
|
||||
var temporary: UInt32 = 0
|
||||
scanner.scanHexInt32(&temporary)
|
||||
return UInt8(temporary)
|
||||
}
|
||||
|
||||
init(scanner: Scanner) {
|
||||
af = readHexInt16(from: scanner)
|
||||
bc = readHexInt16(from: scanner)
|
||||
de = readHexInt16(from: scanner)
|
||||
hl = readHexInt16(from: scanner)
|
||||
|
||||
afDash = readHexInt16(from: scanner)
|
||||
bcDash = readHexInt16(from: scanner)
|
||||
deDash = readHexInt16(from: scanner)
|
||||
hlDash = readHexInt16(from: scanner)
|
||||
|
||||
ix = readHexInt16(from: scanner)
|
||||
iy = readHexInt16(from: scanner)
|
||||
|
||||
sp = readHexInt16(from: scanner)
|
||||
pc = readHexInt16(from: scanner)
|
||||
|
||||
i = readHexInt8(from: scanner)
|
||||
r = readHexInt8(from: scanner)
|
||||
|
||||
iff1 = readHexInt8(from: scanner) != 0
|
||||
iff2 = readHexInt8(from: scanner) != 0
|
||||
|
||||
var temporary: UInt32 = 0
|
||||
scanner.scanHexInt32(&temporary)
|
||||
interruptMode = Int(temporary)
|
||||
|
||||
isHalted = readHexInt8(from: scanner) == 1
|
||||
|
||||
scanner.scanHexInt32(&temporary)
|
||||
tStates = Int(temporary)
|
||||
}
|
||||
|
||||
init(machine: CSTestMachineZ80) {
|
||||
af = machine.value(for: .AF)
|
||||
bc = machine.value(for: .BC)
|
||||
de = machine.value(for: .DE)
|
||||
hl = machine.value(for: .HL)
|
||||
|
||||
afDash = machine.value(for: .afDash)
|
||||
bcDash = machine.value(for: .bcDash)
|
||||
deDash = machine.value(for: .deDash)
|
||||
hlDash = machine.value(for: .hlDash)
|
||||
|
||||
ix = machine.value(for: .IX)
|
||||
iy = machine.value(for: .IY)
|
||||
|
||||
sp = machine.value(for: .stackPointer)
|
||||
pc = machine.value(for: .programCounter)
|
||||
|
||||
i = UInt8(machine.value(for: .I))
|
||||
r = UInt8(machine.value(for: .R))
|
||||
|
||||
iff1 = machine.value(for: .IFF1) != 0
|
||||
iff2 = machine.value(for: .IFF2) != 0
|
||||
|
||||
interruptMode = Int(machine.value(for: .IM))
|
||||
|
||||
isHalted = false // TODO
|
||||
tStates = 0 // TODO
|
||||
}
|
||||
}
|
||||
|
||||
extension RegisterState: Equatable {}
|
||||
|
||||
fileprivate func ==(lhs: RegisterState, rhs: RegisterState) -> Bool {
|
||||
return lhs.af == rhs.af &&
|
||||
lhs.bc == rhs.bc &&
|
||||
lhs.de == rhs.de &&
|
||||
lhs.hl == rhs.hl &&
|
||||
lhs.afDash == rhs.afDash &&
|
||||
lhs.bcDash == rhs.bcDash &&
|
||||
lhs.deDash == rhs.deDash &&
|
||||
lhs.hlDash == rhs.hlDash &&
|
||||
lhs.ix == rhs.ix &&
|
||||
lhs.iy == rhs.iy &&
|
||||
lhs.sp == rhs.sp &&
|
||||
lhs.pc == rhs.pc &&
|
||||
lhs.i == rhs.i &&
|
||||
lhs.r == rhs.r &&
|
||||
lhs.iff1 == rhs.iff1 &&
|
||||
lhs.iff2 == rhs.iff2 &&
|
||||
lhs.interruptMode == rhs.interruptMode
|
||||
}
|
||||
|
||||
class FUSETests: XCTestCase {
|
||||
|
||||
func testFUSE() {
|
||||
if let inputFilename = Bundle(for: type(of: self)).path(forResource: "tests", ofType: "in"),
|
||||
let outputFilename = Bundle(for: type(of: self)).path(forResource: "tests", ofType: "expected") {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user