1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00

Fix TEST.

28 failures.
This commit is contained in:
Thomas Harte 2023-09-27 22:30:40 -04:00
parent 11c747e3c4
commit c20e7ed9b6
2 changed files with 15 additions and 8 deletions

View File

@ -700,12 +700,17 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
} break; } break;
case ModRegRMFormat::MemRegTEST_to_IDIV: case ModRegRMFormat::MemRegTEST_to_IDIV:
source_ = destination_ = memreg; source_ = memreg;
switch(reg) { switch(reg) {
default: undefined(); default: undefined();
case 0: SetOperation(Operation::TEST); break; case 0:
destination_ = memreg;
source_ = Source::Immediate;
operand_size_ = data_size_;
SetOperation(Operation::TEST);
break;
case 2: SetOperation(Operation::NOT); break; case 2: SetOperation(Operation::NOT); break;
case 3: SetOperation(Operation::NEG); break; case 3: SetOperation(Operation::NEG); break;
case 4: SetOperation(Operation::MUL); break; case 4: SetOperation(Operation::MUL); break;

View File

@ -137,14 +137,14 @@ std::string to_string(InstructionSet::x86::DataPointer pointer, const Instructio
- (NSArray<NSString *> *)testFiles { - (NSArray<NSString *> *)testFiles {
NSString *path = [NSString stringWithUTF8String:TestSuiteHome]; NSString *path = [NSString stringWithUTF8String:TestSuiteHome];
NSSet *allowList = nil; NSSet *allowList = nil; /*
// [[NSSet alloc] initWithArray:@[ [[NSSet alloc] initWithArray:@[
// @"83.0.json.gz", @"F7.0.json.gz",
// ]]; ]];*/
// Unofficial opcodes; ignored for now. // Unofficial opcodes; ignored for now.
NSSet *ignoreList = NSSet *ignoreList =
[[NSSet alloc] initWithArray:@[ [NSSet setWithObjects:
@"60.json.gz", @"61.json.gz", @"62.json.gz", @"63.json.gz", @"60.json.gz", @"61.json.gz", @"62.json.gz", @"63.json.gz",
@"64.json.gz", @"65.json.gz", @"66.json.gz", @"67.json.gz", @"64.json.gz", @"65.json.gz", @"66.json.gz", @"67.json.gz",
@"68.json.gz", @"69.json.gz", @"6A.json.gz", @"6B.json.gz", @"68.json.gz", @"69.json.gz", @"6A.json.gz", @"6B.json.gz",
@ -160,7 +160,9 @@ std::string to_string(InstructionSet::x86::DataPointer pointer, const Instructio
@"F6.1.json.gz", @"F7.1.json.gz", @"F6.1.json.gz", @"F7.1.json.gz",
@"FF.7.json.gz", @"FF.7.json.gz",
]];
nil
];
NSArray<NSString *> *files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil]; NSArray<NSString *> *files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
files = [files filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSString* evaluatedObject, NSDictionary<NSString *,id> *) { files = [files filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSString* evaluatedObject, NSDictionary<NSString *,id> *) {