Changeset 92807 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 10:31:13 AM (3 years ago)

Author:

vboxsync

Message:

Disasm: Better just use the OPCODES enum type.

File:

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

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -2733 +2733 @@
     for (;;)
     {
-        uint8_t  const bCode  = disReadByte(pDis, offInstr++);
-        uint16_t const opcode = paOneByteMap[bCode].uOpcode;
+        uint8_t  const     bCode     = disReadByte(pDis, offInstr++);
+        enum OPCODES const enmOpcode = (enum OPCODES)paOneByteMap[bCode].uOpcode;
 
         /* Hardcoded assumption about OP_* values!! */
-        if (opcode <= OP_LAST_PREFIX)
+        if (enmOpcode <= OP_LAST_PREFIX)
         {
             /* The REX prefix must precede the opcode byte(s). Any other placement is ignored. */
-            if (opcode != OP_REX)
+            if (enmOpcode != OP_REX)
             {
                 /* Last prefix byte (for SSE2 extension tables); don't include the REX prefix */
-                pDis->bLastPrefix = opcode;
-                pDis->fPrefix &= ~DISPREFIX_REX;
+                pDis->bLastPrefix = (uint8_t)enmOpcode;
+                pDis->fPrefix    &= ~DISPREFIX_REX;
             }
 
-            switch (opcode)
+            switch (enmOpcode)
             {
             case OP_INVALID:
@@ -2817 +2817 @@
         /* Check if this is a VEX prefix. Not for 32-bit mode. */
         if (pDis->uCpuMode != DISCPUMODE_64BIT
-            && (opcode == OP_LES || opcode == OP_LDS)
+            && (enmOpcode == OP_LES || enmOpcode == OP_LDS)
             && (disReadByte(pDis, offInstr) & 0xc0) == 0xc0)
         {