Changeset 92806 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 10:29:21 AM (3 years ago)

Author:

vboxsync

Message:

Disasm: Fixed wrong type for enum OPCODES in disInstrWorker, uint8_t is too small.

File:

• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (4 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -2733 +2733 @@
     for (;;)
     {
-        uint8_t codebyte = disReadByte(pDis, offInstr++);
-        uint8_t opcode   = paOneByteMap[codebyte].uOpcode;
+        uint8_t  const bCode  = disReadByte(pDis, offInstr++);
+        uint16_t const opcode = paOneByteMap[bCode].uOpcode;
 
         /* Hardcoded assumption about OP_* values!! */
@@ -2756 +2756 @@
             // segment override prefix byte
             case OP_SEG:
-                pDis->idxSegPrefix = (DISSELREG)(paOneByteMap[codebyte].fParam1 - OP_PARM_REG_SEG_START);
+                pDis->idxSegPrefix = (DISSELREG)(paOneByteMap[bCode].fParam1 - OP_PARM_REG_SEG_START);
 #if 0  /* Try be accurate in our reporting, shouldn't break anything... :-) */
                 /* Segment prefixes for CS, DS, ES and SS are ignored in long mode. */
@@ -2806 +2806 @@
                 /* REX prefix byte */
                 pDis->fPrefix   |= DISPREFIX_REX;
-                pDis->fRexPrefix = DISPREFIX_REX_OP_2_FLAGS(paOneByteMap[codebyte].fParam1);
+                pDis->fRexPrefix = DISPREFIX_REX_OP_2_FLAGS(paOneByteMap[bCode].fParam1);
                 if (pDis->fRexPrefix & DISPREFIX_REX_FLAGS_W)
                     pDis->uOpMode = DISCPUMODE_64BIT;  /* overrides size prefix byte */
@@ -2824 +2824 @@
 
         /* first opcode byte. */
-        pDis->bOpCode  = codebyte;
+        pDis->bOpCode  = bCode;
         pDis->cbPrefix = (uint8_t)offInstr - 1;
 
-        offInstr = disParseInstruction(offInstr, &paOneByteMap[pDis->bOpCode], pDis);
+        offInstr = disParseInstruction(offInstr, &paOneByteMap[bCode], pDis);
         break;
     }