Changeset 9097 in vbox for trunk/src/VBox

Timestamp:

May 25, 2008 10:11:11 PM (17 years ago)

Author:

vboxsync

Message:

ParseEscFP: Why copy fpop->param[12] to pCpu->param[12].parval? Copying it to pCpu->param[12].param as well for now.
ParseImmByteSX: Added a todo for AMD64 because I'm seeing words instead of dwords/qwords there in the output.
UseModRM: Set USE_EFFICIENT_ADDRESS in OP_PARAMETER::flags if it's an efficient address in order to assist instruction formatting.

File:

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

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -468 +468 @@
         pCpu->param1.parval = fpop->param1;
         pCpu->param2.parval = fpop->param2;
+#if 1 /** @todo bird: why parval above? fmul and similar needs dword/qword data in param. */
+        pCpu->param1.param = fpop->param1;
+        pCpu->param2.param = fpop->param2;
+#endif
     }
     else
@@ -743 +747 @@
             {   /* SIB byte follows ModRM */
                 UseSIB(lpszCodeBlock, pOp, pParam, pCpu);
+                pParam->flags |= USE_EFFICIENT_ADDRESS;
             }
             else
@@ -750 +755 @@
                 if (pCpu->mode == CPUMODE_32BIT)
                 {
-                    pParam->flags |= USE_DISPLACEMENT32;
+                    pParam->flags |= USE_DISPLACEMENT32 | USE_EFFICIENT_ADDRESS;
                     pParam->disp32 = pCpu->disp;
                     disasmPrintDisp32(pParam);
@@ -756 +761 @@
                 else
                 {
-                    pParam->flags |= USE_RIPDISPLACEMENT32;
+                    pParam->flags |= USE_RIPDISPLACEMENT32 | USE_EFFICIENT_ADDRESS;
                     pParam->disp32 = pCpu->disp;
                     disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "RIP+");
@@ -763 +768 @@
             }
             else {//register address
-                pParam->flags |= USE_BASE;
+                pParam->flags |= USE_BASE | USE_EFFICIENT_ADDRESS;
                 disasmModRMReg(pCpu, pOp, rm, pParam, 1);
             }
@@ -781 +786 @@
             }
             pParam->disp8 = pCpu->disp;
-            pParam->flags |= USE_DISPLACEMENT8;
+            pParam->flags |= USE_DISPLACEMENT8 | USE_EFFICIENT_ADDRESS;
 
             if (pParam->disp8 != 0)
@@ -804 +809 @@
             }
             pParam->disp32 = pCpu->disp;
-            pParam->flags |= USE_DISPLACEMENT32;
+            pParam->flags |= USE_DISPLACEMENT32 | USE_EFFICIENT_ADDRESS;
 
             if (pParam->disp32 != 0)
@@ -829 +834 @@
             {//16 bits displacement
                 pParam->disp16 = pCpu->disp;
-                pParam->flags |= USE_DISPLACEMENT16;
+                pParam->flags |= USE_DISPLACEMENT16 | USE_EFFICIENT_ADDRESS;
                 disasmPrintDisp16(pParam);
             }
             else
             {
-                pParam->flags |= USE_BASE;
+                pParam->flags |= USE_BASE | USE_EFFICIENT_ADDRESS;
                 disasmModRMReg16(pCpu, pOp, rm, pParam);
             }
@@ -845 +850 @@
             disasmModRMReg16(pCpu, pOp, rm, pParam);
             pParam->disp8 = pCpu->disp;
-            pParam->flags |= USE_BASE | USE_DISPLACEMENT8;
+            pParam->flags |= USE_BASE | USE_DISPLACEMENT8 | USE_EFFICIENT_ADDRESS;
 
             if (pParam->disp8 != 0)
@@ -861 +866 @@
             disasmModRMReg16(pCpu, pOp, rm, pParam);
             pParam->disp16 = pCpu->disp;
-            pParam->flags |= USE_BASE | USE_DISPLACEMENT16;
+            pParam->flags |= USE_BASE | USE_DISPLACEMENT16 | USE_EFFICIENT_ADDRESS;
 
             if (pParam->disp16 != 0)
@@ -1148 +1153 @@
 unsigned ParseImmByteSX(RTUINTPTR lpszCodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu)
 {
-    if (pCpu->opmode == CPUMODE_32BIT)
+    if (pCpu->opmode == CPUMODE_32BIT) /** @todo In AMD64 mode we're ending up with 16-bit parvals now, see the disassembler _output_ for tstAsmSignExtend-1.asm. */
     {
         pParam->parval = (uint32_t)(int8_t)DISReadByte(pCpu, lpszCodeBlock);