Changeset 8364 in vbox for trunk/src

Timestamp:

Apr 24, 2008 2:20:23 PM (17 years ago)

Author:

vboxsync

Message:

Use the right tables

Location:

trunk/src/VBox/Disassembler

Files:

• Disasm.cpp (modified) (5 diffs)
• DisasmCore.cpp (modified) (5 diffs)
• DisasmReg.cpp (modified) (4 diffs)

trunk/src/VBox/Disassembler/Disasm.cpp

@@ -117 +117 @@
     unsigned i = 0, prefixbytes;
     unsigned idx, inc;
+    const OPCODE *paOneByteMap;
 #ifdef __L4ENV__
     jmp_buf jumpbuffer;
@@ -147 +148 @@
     if (pCpu->mode == CPUMODE_64BIT)
     {
+        paOneByteMap     = g_aOneByteMapX64;
         pCpu->addrmode   = CPUMODE_64BIT;
         pCpu->opmode     = CPUMODE_32BIT;
@@ -152 +154 @@
     else
     {
+        paOneByteMap     = g_aOneByteMapX86;
         pCpu->addrmode   = pCpu->mode;
         pCpu->opmode     = pCpu->mode;
@@ -167 +170 @@
         {
             uint8_t codebyte = DISReadByte(pCpu, pu8Instruction+i);
-            uint8_t opcode   = g_aOneByteMapX86[codebyte].opcode;
+            uint8_t opcode   = paOneByteMap[codebyte].opcode;
 
             /* Hardcoded assumption about OP_* values!! */
@@ -265 +268 @@
             pCpu->opaddr = pu8Instruction + idx + u32EipOffset - prefixbytes;
 
-            if (pCpu->mode == CPUMODE_64BIT)
-                inc = ParseInstruction(pu8Instruction + i, &g_aOneByteMapX64[pCpu->opcode], pCpu);
-            else
-                inc = ParseInstruction(pu8Instruction + i, &g_aOneByteMapX86[pCpu->opcode], pCpu);
+            inc = ParseInstruction(pu8Instruction + i, &paOneByteMap[pCpu->opcode], pCpu);
 
             pCpu->opsize = prefixbytes + inc + sizeof(uint8_t);

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -251 +251 @@
 static int disCoreOne(PDISCPUSTATE pCpu, RTUINTPTR InstructionAddr, unsigned *pcbInstruction)
 {
+    const OPCODE *paOneByteMap;
+
     /*
      * Parse byte by byte.
@@ -259 +261 @@
     if (pCpu->mode == CPUMODE_64BIT)
     {
+        paOneByteMap     = g_aOneByteMapX64;
         pCpu->addrmode   = CPUMODE_64BIT;
         pCpu->opmode     = CPUMODE_32BIT;
@@ -264 +267 @@
     else
     {
+        paOneByteMap     = g_aOneByteMapX86;
         pCpu->addrmode   = pCpu->mode;
         pCpu->opmode     = pCpu->mode;
@@ -270 +274 @@
     while(1)
     {
-        uint8_t codebyte   = DISReadByte(pCpu, InstructionAddr+iByte);
-        uint8_t opcode     = g_aOneByteMapX86[codebyte].opcode;
+        uint8_t codebyte = DISReadByte(pCpu, InstructionAddr+iByte);
+        uint8_t opcode   = paOneByteMap[codebyte].opcode;
 
         /* Hardcoded assumption about OP_* values!! */
@@ -360 +364 @@
         pCpu->opcode = codebyte;
 
-        if (pCpu->mode == CPUMODE_64BIT)
-            cbInc = ParseInstruction(InstructionAddr + iByte, &g_aOneByteMapX64[pCpu->opcode], pCpu);
-        else
-            cbInc = ParseInstruction(InstructionAddr + iByte, &g_aOneByteMapX86[pCpu->opcode], pCpu);
-
+        cbInc = ParseInstruction(InstructionAddr + iByte, &paOneByteMap[pCpu->opcode], pCpu);
         iByte += cbInc;
         break;

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -521 +521 @@
 
             if (pParam->flags & USE_SCALE)
-            {
                 val32 *= pParam->scale;
-            }
+
             pParamVal->val.val32 += val32;
         }
@@ -530 +529 @@
         {
             if (pCpu->mode & CPUMODE_32BIT)
-            {
                 pParamVal->val.val32 += (int32_t)pParam->disp8;
-            }
             else
-            {
                 pParamVal->val.val16 += (int16_t)pParam->disp8;
-            }
         }
         else
@@ -542 +537 @@
         {
             if (pCpu->mode & CPUMODE_32BIT)
-            {
                 pParamVal->val.val32 += (int32_t)pParam->disp16;
-            }
             else
-            {
                 pParamVal->val.val16 += pParam->disp16;
-            }
         }
         else
@@ -554 +545 @@
         {
             if (pCpu->mode & CPUMODE_32BIT)
-            {
                 pParamVal->val.val32 += pParam->disp32;
-            }
             else
-            {
-                Assert(0);
-            }
+                AssertFailed();
         }
         return VINF_SUCCESS;