1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-25 18:30:07 +00:00

Incorporate instruction length into offsets.

This commit is contained in:
Thomas Harte 2023-10-25 13:02:43 -04:00
parent 6dd5628dd6
commit 0c09c14baa
2 changed files with 2 additions and 43 deletions

View File

@ -370,6 +370,7 @@ std::string InstructionSet::x86::to_string(
stream << (is_negative ? '-' : '+') << std::uppercase << std::hex << abs_value << 'h';
};
using Source = InstructionSet::x86::Source;
const Source source = pointer.source<false>();
switch(source) {
@ -507,7 +508,7 @@ std::string InstructionSet::x86::to_string(
operation += to_string(instruction.second.source(), instruction.second, offset_length, immediate_length);
}
if(displacement) {
operation += to_hex(instruction.second.displacement(), offset_length);
operation += to_hex(instruction.second.displacement() + instruction.first, offset_length);
}
} break;

View File

@ -317,48 +317,6 @@ struct FailedExecution {
- (NSArray<NSString *> *)testFiles {
NSString *path = [NSString stringWithUTF8String:TestSuiteHome];
NSSet *allowList = [NSSet setWithArray:@[
// Current decoding failures:
@"60.json.gz",
@"61.json.gz",
@"62.json.gz",
@"63.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",
@"6C.json.gz",
@"6D.json.gz",
@"6E.json.gz",
@"6F.json.gz",
@"70.json.gz",
@"71.json.gz",
@"72.json.gz",
@"73.json.gz",
@"74.json.gz",
@"75.json.gz",
@"76.json.gz",
@"77.json.gz",
@"78.json.gz",
@"79.json.gz",
@"7A.json.gz",
@"7B.json.gz",
@"7C.json.gz",
@"7D.json.gz",
@"7E.json.gz",
@"7F.json.gz",
@"E0.json.gz",
@"E1.json.gz",
@"E2.json.gz",
@"E3.json.gz",
@"E8.json.gz",
@"E9.json.gz",
@"EB.json.gz",
// Current execution failures:
// @"27.json.gz", // DAA
// @"2F.json.gz", // DAS