diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 9dd259d2f..0a212894a 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 4B049CDD1DA3C82F00322067 /* BCDTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B049CDC1DA3C82F00322067 /* BCDTest.swift */; }; - 4B049CDF1DA3C85B00322067 /* BCDTEST_beeb in Resources */ = {isa = PBXBuildFile; fileRef = 4B049CDE1DA3C85B00322067 /* BCDTEST_beeb */; }; 4B0BE4281D3481E700D5256B /* DigitalPhaseLockedLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B0BE4261D3481E700D5256B /* DigitalPhaseLockedLoop.cpp */; }; 4B0CCC451C62D0B3001CAC5F /* CRT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B0CCC421C62D0B3001CAC5F /* CRT.cpp */; }; 4B14145B1B58879D00E04248 /* CPU6502.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414571B58879D00E04248 /* CPU6502.cpp */; }; @@ -40,6 +39,9 @@ 4B3BA0CF1D318B44005DD7A7 /* MOS6522Bridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3BA0C91D318B44005DD7A7 /* MOS6522Bridge.mm */; }; 4B3BA0D01D318B44005DD7A7 /* MOS6532Bridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3BA0CB1D318B44005DD7A7 /* MOS6532Bridge.mm */; }; 4B3BA0D11D318B44005DD7A7 /* TestMachine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3BA0CD1D318B44005DD7A7 /* TestMachine.mm */; }; + 4B44EBF51DC987AF00A7820C /* AllSuiteA.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4B44EBF41DC987AE00A7820C /* AllSuiteA.bin */; }; + 4B44EBF71DC9883B00A7820C /* 6502_functional_test.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4B44EBF61DC9883B00A7820C /* 6502_functional_test.bin */; }; + 4B44EBF91DC9898E00A7820C /* BCDTEST_beeb in Resources */ = {isa = PBXBuildFile; fileRef = 4B44EBF81DC9898E00A7820C /* BCDTEST_beeb */; }; 4B4A76301DB1A3FA007AAE2E /* AY38910.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B4A762E1DB1A3FA007AAE2E /* AY38910.cpp */; }; 4B4C83701D4F623200CD541F /* D64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B4C836E1D4F623200CD541F /* D64.cpp */; }; 4B4DC8211D2C2425003C5BF8 /* Vic20.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B4DC81F1D2C2425003C5BF8 /* Vic20.cpp */; }; @@ -71,8 +73,6 @@ 4BAB62AD1D3272D200DF5BA0 /* Disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB62AB1D3272D200DF5BA0 /* Disk.cpp */; }; 4BAB62B51D327F7E00DF5BA0 /* G64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB62B31D327F7E00DF5BA0 /* G64.cpp */; }; 4BAB62B81D3302CA00DF5BA0 /* PCMTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB62B61D3302CA00DF5BA0 /* PCMTrack.cpp */; }; - 4BB298EE1B587D8400A49093 /* 6502_functional_test.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E01B587D8300A49093 /* 6502_functional_test.bin */; }; - 4BB298EF1B587D8400A49093 /* AllSuiteA.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E11B587D8300A49093 /* AllSuiteA.bin */; }; 4BB298F11B587D8400A49093 /* start in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E51B587D8300A49093 /* start */; }; 4BB298F21B587D8400A49093 /* adca in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E61B587D8300A49093 /* adca */; }; 4BB298F31B587D8400A49093 /* adcax in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E71B587D8300A49093 /* adcax */; }; @@ -402,7 +402,6 @@ /* Begin PBXFileReference section */ 4B046DC31CFE651500E9E45E /* CRTMachine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CRTMachine.hpp; sourceTree = ""; }; 4B049CDC1DA3C82F00322067 /* BCDTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BCDTest.swift; sourceTree = ""; }; - 4B049CDE1DA3C85B00322067 /* BCDTEST_beeb */ = {isa = PBXFileReference; lastKnownFileType = file; path = BCDTEST_beeb; sourceTree = ""; }; 4B0B6E121C9DBD5D00FFB60D /* CRTConstants.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CRTConstants.hpp; sourceTree = ""; }; 4B0BE4261D3481E700D5256B /* DigitalPhaseLockedLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DigitalPhaseLockedLoop.cpp; sourceTree = ""; }; 4B0BE4271D3481E700D5256B /* DigitalPhaseLockedLoop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = DigitalPhaseLockedLoop.hpp; sourceTree = ""; }; @@ -466,6 +465,9 @@ 4B3BA0CB1D318B44005DD7A7 /* MOS6532Bridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MOS6532Bridge.mm; sourceTree = ""; }; 4B3BA0CC1D318B44005DD7A7 /* TestMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestMachine.h; sourceTree = ""; }; 4B3BA0CD1D318B44005DD7A7 /* TestMachine.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestMachine.mm; sourceTree = ""; }; + 4B44EBF41DC987AE00A7820C /* AllSuiteA.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = AllSuiteA.bin; path = AllSuiteA/AllSuiteA.bin; sourceTree = ""; }; + 4B44EBF61DC9883B00A7820C /* 6502_functional_test.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = 6502_functional_test.bin; path = "Klaus Dormann/6502_functional_test.bin"; sourceTree = ""; }; + 4B44EBF81DC9898E00A7820C /* BCDTEST_beeb */ = {isa = PBXFileReference; lastKnownFileType = file; name = BCDTEST_beeb; path = BCDTest/BCDTEST_beeb; sourceTree = ""; }; 4B4A762E1DB1A3FA007AAE2E /* AY38910.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AY38910.cpp; path = AY38910/AY38910.cpp; sourceTree = ""; }; 4B4A762F1DB1A3FA007AAE2E /* AY38910.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AY38910.hpp; path = AY38910/AY38910.hpp; sourceTree = ""; }; 4B4C836E1D4F623200CD541F /* D64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = D64.cpp; sourceTree = ""; }; @@ -520,8 +522,6 @@ 4BAB62B41D327F7E00DF5BA0 /* G64.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = G64.hpp; sourceTree = ""; }; 4BAB62B61D3302CA00DF5BA0 /* PCMTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCMTrack.cpp; sourceTree = ""; }; 4BAB62B71D3302CA00DF5BA0 /* PCMTrack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = PCMTrack.hpp; sourceTree = ""; }; - 4BB297E01B587D8300A49093 /* 6502_functional_test.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = 6502_functional_test.bin; sourceTree = ""; }; - 4BB297E11B587D8300A49093 /* AllSuiteA.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = AllSuiteA.bin; sourceTree = ""; }; 4BB297E51B587D8300A49093 /* start */ = {isa = PBXFileReference; lastKnownFileType = file; path = " start"; sourceTree = ""; }; 4BB297E61B587D8300A49093 /* adca */ = {isa = PBXFileReference; lastKnownFileType = file; path = adca; sourceTree = ""; }; 4BB297E71B587D8300A49093 /* adcax */ = {isa = PBXFileReference; lastKnownFileType = file; path = adcax; sourceTree = ""; }; @@ -930,9 +930,9 @@ 4B1414631B588A1100E04248 /* Test Binaries */ = { isa = PBXGroup; children = ( - 4B049CDE1DA3C85B00322067 /* BCDTEST_beeb */, - 4BB297E01B587D8300A49093 /* 6502_functional_test.bin */, - 4BB297E11B587D8300A49093 /* AllSuiteA.bin */, + 4B44EBF61DC9883B00A7820C /* 6502_functional_test.bin */, + 4B44EBF41DC987AE00A7820C /* AllSuiteA.bin */, + 4B44EBF81DC9898E00A7820C /* BCDTEST_beeb */, 4BB297E41B587D8300A49093 /* Wolfgang Lorenz 6502 test suite */, ); name = "Test Binaries"; @@ -2015,7 +2015,7 @@ 4BB299641B587D8400A49093 /* insiy in Resources */, 4BB299E61B587D8400A49093 /* trap10 in Resources */, 4BB299651B587D8400A49093 /* insz in Resources */, - 4B049CDF1DA3C85B00322067 /* BCDTEST_beeb in Resources */, + 4B44EBF91DC9898E00A7820C /* BCDTEST_beeb in Resources */, 4BB299161B587D8400A49093 /* bccr in Resources */, 4BB299211B587D8400A49093 /* bvsr in Resources */, 4BB2991F1B587D8400A49093 /* brkn in Resources */, @@ -2077,6 +2077,7 @@ 4BB299DC1B587D8400A49093 /* stazx in Resources */, 4BB299C41B587D8400A49093 /* sbca in Resources */, 4BB298F41B587D8400A49093 /* adcay in Resources */, + 4B44EBF51DC987AF00A7820C /* AllSuiteA.bin in Resources */, 4BB299C61B587D8400A49093 /* sbcay in Resources */, 4BB299601B587D8400A49093 /* insa in Resources */, 4BB299951B587D8400A49093 /* mmufetch in Resources */, @@ -2101,7 +2102,6 @@ 4BB299281B587D8400A49093 /* cia2pb6 in Resources */, 4BB2991E1B587D8400A49093 /* branchwrap in Resources */, 4BB299121B587D8400A49093 /* axsa in Resources */, - 4BB298EF1B587D8400A49093 /* AllSuiteA.bin in Resources */, 4BB299561B587D8400A49093 /* eorz in Resources */, 4BB299941B587D8400A49093 /* mmu in Resources */, 4BB299E11B587D8400A49093 /* styz in Resources */, @@ -2110,6 +2110,7 @@ 4BB299AC1B587D8400A49093 /* rlaay in Resources */, 4BB299131B587D8400A49093 /* axsix in Resources */, 4BB299781B587D8400A49093 /* ldaix in Resources */, + 4B44EBF71DC9883B00A7820C /* 6502_functional_test.bin in Resources */, 4BB299291B587D8400A49093 /* cia2pb7 in Resources */, 4BB2994A1B587D8400A49093 /* deca in Resources */, 4BB299CA1B587D8400A49093 /* sbciy in Resources */, @@ -2182,7 +2183,6 @@ 4BB299ED1B587D8400A49093 /* trap17 in Resources */, 4BB299731B587D8400A49093 /* laxzy in Resources */, 4BB299F91B587D8400A49093 /* tyan in Resources */, - 4BB298EE1B587D8400A49093 /* 6502_functional_test.bin in Resources */, 4BB299DF1B587D8400A49093 /* stxzy in Resources */, 4BB299231B587D8400A49093 /* cia1pb7 in Resources */, 4BB2998D1B587D8400A49093 /* lsezx in Resources */, diff --git a/OSBindings/Mac/Clock SignalTests/AllSuiteA.bin b/OSBindings/Mac/Clock SignalTests/AllSuiteA/AllSuiteA.bin similarity index 100% rename from OSBindings/Mac/Clock SignalTests/AllSuiteA.bin rename to OSBindings/Mac/Clock SignalTests/AllSuiteA/AllSuiteA.bin diff --git a/OSBindings/Mac/Clock SignalTests/AllSuiteA/readme.md b/OSBindings/Mac/Clock SignalTests/AllSuiteA/readme.md new file mode 100644 index 000000000..959121be8 --- /dev/null +++ b/OSBindings/Mac/Clock SignalTests/AllSuiteA/readme.md @@ -0,0 +1,2 @@ +# AllSuiteA Test Suite +This file was sourced from hmc-6502 — https://github.com/cminter/hmc-6502 — and was obtained with an unknown licence, believed to be BSD Simplified. \ No newline at end of file diff --git a/OSBindings/Mac/Clock SignalTests/BCDTEST_beeb b/OSBindings/Mac/Clock SignalTests/BCDTest/BCDTEST_beeb similarity index 100% rename from OSBindings/Mac/Clock SignalTests/BCDTEST_beeb rename to OSBindings/Mac/Clock SignalTests/BCDTest/BCDTEST_beeb diff --git a/OSBindings/Mac/Clock SignalTests/BCDTest/readme.md b/OSBindings/Mac/Clock SignalTests/BCDTest/readme.md new file mode 100644 index 000000000..881548c66 --- /dev/null +++ b/OSBindings/Mac/Clock SignalTests/BCDTest/readme.md @@ -0,0 +1,2 @@ +# BCDTest +This test was obtained from http://stardot.org.uk/forums/viewtopic.php?t=8793#p97168 and is the work of David Banks, https://github.com/hoglet67 . It is believed to be public domain. \ No newline at end of file diff --git a/OSBindings/Mac/Clock SignalTests/6502_functional_test.bin b/OSBindings/Mac/Clock SignalTests/Klaus Dormann/6502_functional_test.bin similarity index 100% rename from OSBindings/Mac/Clock SignalTests/6502_functional_test.bin rename to OSBindings/Mac/Clock SignalTests/Klaus Dormann/6502_functional_test.bin diff --git a/OSBindings/Mac/Clock SignalTests/Klaus Dormann/readme.txt b/OSBindings/Mac/Clock SignalTests/Klaus Dormann/readme.txt new file mode 100644 index 000000000..16fba3043 --- /dev/null +++ b/OSBindings/Mac/Clock SignalTests/Klaus Dormann/readme.txt @@ -0,0 +1,17 @@ +; +; 6 5 0 2 F U N C T I O N A L T E S T +; +; Copyright (C) 2012-2015 Klaus Dormann +; +; This program is free software: you can redistribute it and/or modify +; it under the terms of the GNU General Public License as published by +; the Free Software Foundation, either version 3 of the License, or +; (at your option) any later version. +; +; This program is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; GNU General Public License for more details. +; +; You should have received a copy of the GNU General Public License +; along with this program. If not, see . \ No newline at end of file diff --git a/OSBindings/Mac/Clock SignalTests/Wolfgang Lorenz 6502 test suite/readme.md b/OSBindings/Mac/Clock SignalTests/Wolfgang Lorenz 6502 test suite/readme.md new file mode 100644 index 000000000..d1e697f5c --- /dev/null +++ b/OSBindings/Mac/Clock SignalTests/Wolfgang Lorenz 6502 test suite/readme.md @@ -0,0 +1,2 @@ +# Wolfgang Lorenz’s Test Suite +The files in this folder were authored by Wolfgang Lorenz and were sourced as per http://www.softwolves.com/arkiv/cbm-hackers/7/7114.html ; they are believed to be public domain software. \ No newline at end of file diff --git a/Processors/6502/CPU6502.hpp b/Processors/6502/CPU6502.hpp index 960921064..3d6903f24 100644 --- a/Processors/6502/CPU6502.hpp +++ b/Processors/6502/CPU6502.hpp @@ -1109,7 +1109,7 @@ template class Processor { continue; } - if(isReadOperation(nextBusOperation) && _ready_line_is_enabled) { + if(_ready_line_is_enabled && isReadOperation(nextBusOperation)) { _ready_is_active = true; break; }