diff --git a/InstructionSets/x86/Instruction.cpp b/InstructionSets/x86/Instruction.cpp index da4a40107..4536089b9 100644 --- a/InstructionSets/x86/Instruction.cpp +++ b/InstructionSets/x86/Instruction.cpp @@ -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(); 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; diff --git a/OSBindings/Mac/Clock SignalTests/8088Tests.mm b/OSBindings/Mac/Clock SignalTests/8088Tests.mm index 28bee7fb8..e13fd750e 100644 --- a/OSBindings/Mac/Clock SignalTests/8088Tests.mm +++ b/OSBindings/Mac/Clock SignalTests/8088Tests.mm @@ -317,48 +317,6 @@ struct FailedExecution { - (NSArray *)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