From 6f5fcf23dcb881dc5a0c2b163627e73f47b048d4 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 19 Sep 2023 14:00:27 -0400 Subject: [PATCH] Add missing substitutions. --- InstructionSets/x86/Decoder.cpp | 2 +- OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/InstructionSets/x86/Decoder.cpp b/InstructionSets/x86/Decoder.cpp index b8c8af864..be10988c5 100644 --- a/InstructionSets/x86/Decoder.cpp +++ b/InstructionSets/x86/Decoder.cpp @@ -406,7 +406,7 @@ std::pair::InstructionT> Decoder::decode(con case 0xe0: Displacement(LOOPNE, DataSize::Byte); break; case 0xe1: Displacement(LOOPE, DataSize::Byte); break; case 0xe2: Displacement(LOOP, DataSize::Byte); break; - case 0xe3: Displacement(JPCX, DataSize::Byte); break; + case 0xe3: Displacement(JCXZ, DataSize::Byte); break; case 0xe4: RegAddr(IN, eAX, DataSize::Byte, DataSize::Byte); break; case 0xe5: RegAddr(IN, eAX, data_size_, DataSize::Byte); break; diff --git a/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm b/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm index 7fc314c36..7544cf22a 100644 --- a/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm +++ b/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm @@ -535,7 +535,7 @@ decode(const std::initializer_list &stream, bool set_32_bit = false) { // sahf // jz 0x000000f3 (from 0x85) test(instructions[52], DataSize::DWord, Operation::CMP, ScaleIndexBase(Source::eBP), Source::eCX, 0, 0x2c87445f); - test(instructions[53], Operation::JPCX, 0, 0x02); + test(instructions[53], Operation::JCXZ, 0, 0x02); test(instructions[54], Operation::SAHF); test(instructions[55], Operation::JZ, 0, 0x6e); @@ -555,7 +555,7 @@ decode(const std::initializer_list &stream, bool set_32_bit = false) { test_far(instructions[60], Operation::CALLfar, 0xe21b, 0x97d0f58a); test(instructions[61], Operation::PUSHA); test(instructions[62], DataSize::Byte, Operation::MOV, Source::Immediate, Source::eAX, 0xcf); - test(instructions[63], Operation::JPCX, 0, 0xd4 - 0x9d); + test(instructions[63], Operation::JCXZ, 0, 0xd4 - 0x9d); } - (void)testSourceModRegRM1 {