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

Improves semantic communications and temporarily omits A- and F-line instructions.

Browse Source 
So it looks like 2773 instructions left to go.
This commit is contained in:
Thomas Harte
2019-04-27 15:15:03 -04:00
parent e75b386f7d
commit cf547ef569
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
OSBindings/Mac/Clock SignalTests/68000Tests.mm
View File

@@ -10,7 +10,6 @@
#include <array> #include <array>
#include <cassert> #include <cassert>
#include <set>
#include "68000.hpp" #include "68000.hpp"
@@ -85,6 +84,9 @@ class RAM68000: public CPU::MC68000::BusHandler {
class CPU::MC68000::ProcessorStorageTests { class CPU::MC68000::ProcessorStorageTests {
public: public:
ProcessorStorageTests(const CPU::MC68000::ProcessorStorage &storage, const char *coverage_file_name) { ProcessorStorageTests(const CPU::MC68000::ProcessorStorage &storage, const char *coverage_file_name) {
false_valids_ = [NSMutableSet set];
false_invalids_ = [NSMutableSet set];
FILE *source = fopen(coverage_file_name, "rb"); FILE *source = fopen(coverage_file_name, "rb");
// The file format here is [2 bytes opcode][2 ASCII characters:VA for valid, IN for invalid]... // The file format here is [2 bytes opcode][2 ASCII characters:VA for valid, IN for invalid]...
@@ -109,10 +111,14 @@ class CPU::MC68000::ProcessorStorageTests {
type[1] = fgetc(source); type[1] = fgetc(source);
type[2] = '\0'; type[2] = '\0';
// TEMPORARY: factor out A- and F-line exceptions.
if((next_opcode&0xf000) == 0xa000) continue;
if((next_opcode&0xf000) == 0xf000) continue;
if(!strcmp(type, "VA")) { if(!strcmp(type, "VA")) {
// Test for validity. // Test for validity.
if(!storage.instructions[next_opcode].micro_operations) { if(!storage.instructions[next_opcode].micro_operations) {
false_invalids_.insert(next_opcode); [false_invalids_ addObject:@(next_opcode)];
} }
continue; continue;
} }
@@ -120,7 +126,7 @@ class CPU::MC68000::ProcessorStorageTests {
if(!strcmp(type, "IN")) { if(!strcmp(type, "IN")) {
// Test for invalidity. // Test for invalidity.
if(storage.instructions[next_opcode].micro_operations) { if(storage.instructions[next_opcode].micro_operations) {
false_valids_.insert(next_opcode); [false_valids_ addObject:@(next_opcode)];
} }
continue; continue;
} }
@@ -131,29 +137,39 @@ class CPU::MC68000::ProcessorStorageTests {
fclose(source); fclose(source);
} }
NSString *false_valids() const { NSSet<NSNumber *> *false_valids() const {
return contents_of(false_valids_); return false_valids_;
} }
NSString *false_invalids() const { NSSet<NSNumber *> *false_invalids() const {
return contents_of(false_invalids_); return false_invalids_;
} }
private: private:
std::set<uint16_t> false_invalids_; NSMutableSet<NSNumber *> *false_invalids_;
std::set<uint16_t> false_valids_; NSMutableSet<NSNumber *> *false_valids_;
static NSString *contents_of(const std::set<uint16_t> &set) {
NSMutableString *result = [[NSMutableString alloc] init];
for(auto value: set) {
[result appendFormat:@"%04x ", value];
}
return result;
}
}; };
@interface NSSet (CSHexDump)
- (NSString *)hexDump;
@end
@implementation NSSet (CSHexDump)
- (NSString *)hexDump {
NSMutableArray<NSString *> *components = [NSMutableArray array];
for(NSNumber *number in [[self allObjects] sortedArrayUsingSelector:@selector(compare:)]) {
[components addObject:[NSString stringWithFormat:@"%04x", number.intValue]];
}
return [components componentsJoinedByString:@" "];
}
@end
@interface M68000Tests : XCTestCase @interface M68000Tests : XCTestCase
@end @end
@@ -249,10 +265,10 @@ class CPU::MC68000::ProcessorStorageTests {
[[NSBundle bundleForClass:[self class]] pathForResource:@"OPCLOGR2" ofType:@"BIN"].UTF8String [[NSBundle bundleForClass:[self class]] pathForResource:@"OPCLOGR2" ofType:@"BIN"].UTF8String
); );
NSString *const falseValids = storage_tests.false_valids(); NSSet<NSNumber *> *const falseValids = storage_tests.false_valids();
NSString *const falseInvalids = storage_tests.false_invalids(); NSSet<NSNumber *> *const falseInvalids = storage_tests.false_invalids();
XCTAssert(!falseValids.length, "%@ opcodes should be invalid but aren't: %@", @([falseValids componentsSeparatedByString:@" "].count - 1), falseValids); XCTAssert(!falseValids.count, "%@ opcodes should be invalid but aren't: %@", @(falseValids.count), falseValids.hexDump);
XCTAssert(!falseInvalids.length, "%@ opcodes should be valid but aren't: %@", @([falseInvalids componentsSeparatedByString:@" "].count - 1), falseInvalids); XCTAssert(!falseInvalids.count, "%@ opcodes should be valid but aren't: %@", @(falseInvalids.count), falseInvalids.hexDump);
} }
@end @end