Merge pull request #1754 from jranieri-grammatech/jranieri/moffset_disp

Fix the displacement offset for moffset-encoded operands
capstone-engine · Nov 10, 2021 · c7538d4 · c7538d4
2 parents 7ae0770 + cd66cb2
commit c7538d4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/arch/X86/X86DisassemblerDecoder.c b/arch/X86/X86DisassemblerDecoder.c
@@ -1999,6 +1999,15 @@ static int readOperands(struct InternalInstruction* insn)
 			case ENCODING_Ia:
 				if (readImmediate(insn, insn->addressSize))
 					return -1;
+				/* Direct memory-offset (moffset) immediate will get mapped
+				   to memory operand later. We want the encoding info to
+				   reflect that as well. */
+				insn->displacementOffset = insn->immediateOffset;
+				insn->consumedDisplacement = true;
+				insn->displacementSize = insn->immediateSize;
+				insn->displacement = insn->immediates[insn->numImmediatesConsumed - 1];
+				insn->immediateOffset = 0;
+				insn->immediateSize = 0;
 				break;
 
 			case ENCODING_IRC: