6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-13 22:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Don't offer repne for reps; print far CALLs and JMPs as h-suffix rather than 0x prefix.

Browse Source
This commit is contained in:
Thomas Harte 2023-10-24 11:01:38 -04:00
parent 20d7079006
commit 0e027445d4
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
InstructionSets/x86/Instruction.cpp
View File

@ -437,19 +437,27 @@ std::string InstructionSet::x86::to_string(
case Repetition::None: break;
case Repetition::RepE:
switch(instruction.operation) {
default:
case Operation::CMPS:
case Operation::SCAS:
operation += "repe ";
break;
case Operation::MOVS:
case Operation::STOS:
case Operation::LODS:
default:
operation += "rep ";
break;
}
break;
case Repetition::RepNE:
operation += "repne ";
switch(instruction.operation) {
case Operation::CMPS:
case Operation::SCAS:
operation += "repne ";
break;
default:
operation += "rep ";
break;
}
break;
}
@ -479,10 +487,10 @@ std::string InstructionSet::x86::to_string(
case Operation::JMPfar: {
switch(instruction.destination().source()) {
case Source::Immediate:
operation += "far 0x";
operation += to_hex(instruction.segment(), 4, false);
operation += ":0x";
operation += "h:";
operation += to_hex(instruction.offset(), 4, false);
operation += "h";
break;
default:
operation += to_string(instruction.destination(), instruction, offset_length, immediate_length);

7
OSBindings/Mac/Clock SignalTests/8088Tests.mm
View File

@ -350,7 +350,6 @@ struct FailedExecution {
@"7D.json.gz",
@"7E.json.gz",
@"7F.json.gz",
@"9A.json.gz",
@"A4.json.gz",
@"A5.json.gz",
@"A6.json.gz",
@ -372,7 +371,6 @@ struct FailedExecution {
@"E7.json.gz",
@"E8.json.gz",
@"E9.json.gz",
@"EA.json.gz",
@"EB.json.gz",
@ -500,11 +498,10 @@ struct FailedExecution {
if(assert) {
XCTAssert(
isEqual,
"%@ doesn't match %@ or similar, was %@ within %@",
"%@ doesn't match %@ or similar, was %@",
test[@"name"],
[decodings anyObject],
hex_instruction(),
file
hex_instruction()
);
}