6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-11 08:30:55 +00:00
Code Issues Projects Releases Wiki Activity

One failure was just PUSH AF due to throwing away the 5 & 3 flags at the start. Switched to throwing them away at comparison.

Browse Source
This commit is contained in:
Thomas Harte 2017-05-29 11:06:23 -04:00
parent a329d85697
commit 9ade0dcae3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OSBindings/Mac/Clock SignalTests/FUSETests.swift
View File

@ -59,12 +59,12 @@ fileprivate struct RegisterState {
init(dictionary: [String: Any]) { init(dictionary: [String: Any]) {
// don't test bits 3 and 5 for now // don't test bits 3 and 5 for now
af = UInt16(dictionary["af"] as! NSNumber) & ~0x0028 af = UInt16(dictionary["af"] as! NSNumber)
bc = UInt16(dictionary["bc"] as! NSNumber) bc = UInt16(dictionary["bc"] as! NSNumber)
de = UInt16(dictionary["de"] as! NSNumber) de = UInt16(dictionary["de"] as! NSNumber)
hl = UInt16(dictionary["hl"] as! NSNumber) hl = UInt16(dictionary["hl"] as! NSNumber)
afDash = UInt16(dictionary["afDash"] as! NSNumber) & ~0x0028 afDash = UInt16(dictionary["afDash"] as! NSNumber)
bcDash = UInt16(dictionary["bcDash"] as! NSNumber) bcDash = UInt16(dictionary["bcDash"] as! NSNumber)
deDash = UInt16(dictionary["deDash"] as! NSNumber) deDash = UInt16(dictionary["deDash"] as! NSNumber)
hlDash = UInt16(dictionary["hlDash"] as! NSNumber) hlDash = UInt16(dictionary["hlDash"] as! NSNumber)
@ -89,12 +89,12 @@ fileprivate struct RegisterState {
init(machine: CSTestMachineZ80) { init(machine: CSTestMachineZ80) {
// don't test bits 3 and 5 for now // don't test bits 3 and 5 for now
af = machine.value(for: .AF) & ~0x0028 af = machine.value(for: .AF)
bc = machine.value(for: .BC) bc = machine.value(for: .BC)
de = machine.value(for: .DE) de = machine.value(for: .DE)
hl = machine.value(for: .HL) hl = machine.value(for: .HL)
afDash = machine.value(for: .afDash) & ~0x0028 afDash = machine.value(for: .afDash)
bcDash = machine.value(for: .bcDash) bcDash = machine.value(for: .bcDash)
deDash = machine.value(for: .deDash) deDash = machine.value(for: .deDash)
hlDash = machine.value(for: .hlDash) hlDash = machine.value(for: .hlDash)
@ -121,11 +121,11 @@ fileprivate struct RegisterState {
extension RegisterState: Equatable {} extension RegisterState: Equatable {}
fileprivate func ==(lhs: RegisterState, rhs: RegisterState) -> Bool { fileprivate func ==(lhs: RegisterState, rhs: RegisterState) -> Bool {
return lhs.af == rhs.af && return (lhs.af & ~0x0028) == (rhs.af & ~0x0028) &&
lhs.bc == rhs.bc && lhs.bc == rhs.bc &&
lhs.de == rhs.de && lhs.de == rhs.de &&
lhs.hl == rhs.hl && lhs.hl == rhs.hl &&
lhs.afDash == rhs.afDash && (lhs.afDash & ~0x0028) == (rhs.afDash & ~0x0028) &&
lhs.bcDash == rhs.bcDash && lhs.bcDash == rhs.bcDash &&
lhs.deDash == rhs.deDash && lhs.deDash == rhs.deDash &&
lhs.hlDash == rhs.hlDash && lhs.hlDash == rhs.hlDash &&