Changeset 8377 in vbox for trunk/src/VBox/Disassembler

Timestamp:

Apr 25, 2008 8:23:14 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30173

Message:

Disassembler fixes + testcase for 64 bits

Location:

trunk/src/VBox/Disassembler

Files:

• Disasm.cpp (modified) (2 diffs)
• DisasmCore.cpp (modified) (3 diffs)
• DisasmReg.cpp (modified) (6 diffs)
• DisasmTest.cpp (modified) (2 diffs)
• DisasmTestA.asm (modified) (1 diff)

trunk/src/VBox/Disassembler/Disasm.cpp

@@ -173 +173 @@
 
             /* Hardcoded assumption about OP_* values!! */
-            if (opcode <= OP_LOCK)
+            if (opcode <= OP_LAST_PREFIX)
             {
                 pCpu->lastprefix = opcode;
@@ -253 +253 @@
                     /* REX prefix byte */
                     pCpu->prefix    |= PREFIX_REX;
-                    pCpu->prefix_rex = PREFIX_REX_OP_2_FLAGS(opcode);
+                    pCpu->prefix_rex = PREFIX_REX_OP_2_FLAGS(paOneByteMap[codebyte].param1);
+                    i += sizeof(uint8_t);
+                    prefixbytes += sizeof(uint8_t);
 
                     if (pCpu->prefix_rex & PREFIX_REX_FLAGS_W)
                         pCpu->opmode = CPUMODE_64BIT;  /* overrides size prefix byte */
-                    break;
+                    continue;   //fetch the next byte
                 }
             }

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -278 +278 @@
 
         /* Hardcoded assumption about OP_* values!! */
-        if (opcode <= OP_LOCK)
+        if (opcode <= OP_LAST_PREFIX)
         {
             pCpu->lastprefix = opcode;
@@ -350 +350 @@
                 /* REX prefix byte */
                 pCpu->prefix    |= PREFIX_REX;
-                pCpu->prefix_rex = PREFIX_REX_OP_2_FLAGS(opcode);
+                pCpu->prefix_rex = PREFIX_REX_OP_2_FLAGS(paOneByteMap[codebyte].param1);
+                iByte           += sizeof(uint8_t);
 
                 if (pCpu->prefix_rex & PREFIX_REX_FLAGS_W)
                     pCpu->opmode = CPUMODE_64BIT;  /* overrides size prefix byte */
-                break;
+                continue;   //fetch the next byte
             }
         }
@@ -2027 +2028 @@
     subtype = OP_PARM_VSUBTYPE(pParam->param);
     if (fRegAddr)
-        subtype = OP_PARM_d;
+        subtype = (pCpu->opmode == CPUMODE_64BIT) ? OP_PARM_q : OP_PARM_d;
     else
     if (subtype == OP_PARM_v || subtype == OP_PARM_NONE)

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -188 +188 @@
 
     if (subtype == OP_PARM_v)
-    {
         subtype = (pCpu->opmode == CPUMODE_32BIT) ? OP_PARM_d : OP_PARM_w;
-    }
 
     switch(subtype)
@@ -476 +474 @@
     memset(pParamVal, 0, sizeof(*pParamVal));
 
-    if (pParam->flags & (USE_BASE|USE_INDEX|USE_DISPLACEMENT32|USE_DISPLACEMENT16|USE_DISPLACEMENT8))
+    if (pParam->flags & (USE_BASE|USE_INDEX|USE_DISPLACEMENT32|USE_DISPLACEMENT16|USE_DISPLACEMENT8|USE_RIPDISPLACEMENT32))
     {
         // Effective address
@@ -528 +526 @@
         if (pParam->flags & USE_DISPLACEMENT8)
         {
-            if (pCpu->mode & CPUMODE_32BIT)
+            if (pCpu->mode == CPUMODE_32BIT)
                 pParamVal->val.val32 += (int32_t)pParam->disp8;
             else
@@ -536 +534 @@
         if (pParam->flags & USE_DISPLACEMENT16)
         {
-            if (pCpu->mode & CPUMODE_32BIT)
+            if (pCpu->mode == CPUMODE_32BIT)
                 pParamVal->val.val32 += (int32_t)pParam->disp16;
             else
@@ -544 +542 @@
         if (pParam->flags & USE_DISPLACEMENT32)
         {
-            if (pCpu->mode & CPUMODE_32BIT)
+            if (pCpu->mode == CPUMODE_32BIT)
                 pParamVal->val.val32 += pParam->disp32;
+            else
+                AssertFailed();
+        }
+        else
+        if (pParam->flags & USE_RIPDISPLACEMENT32)
+        {
+            if (pCpu->mode == CPUMODE_64BIT)
+                pParamVal->val.val64 += pParam->disp32 + pCtx->rip;
             else
                 AssertFailed();
@@ -597 +603 @@
             pParamVal->type = PARMTYPE_REGISTER;
         }
+        Assert(!(pParam->flags & USE_IMMEDIATE));
+        return VINF_SUCCESS;
     }
 

trunk/src/VBox/Disassembler/DisasmTest.cpp

@@ -30 +30 @@
 
 DECLASM(int) TestProc();
+DECLASM(int) TestProc64();
 //uint8_t aCode16[] = { 0x66, 0x67, 0x89, 0x07 };
 
@@ -61 +62 @@
             pInstr += cb;
         }
+
+        printf("\n64 bits disassembly\n");
+        pInstr = (RTUINTPTR)TestProc64;
+
+        for (int i=0;i<50;i++)
+        {
+            unsigned    cb;
+            DISCPUSTATE cpu;
+            char         szOutput[256];
+
+            memset(&cpu, 0, sizeof(cpu));
+            cpu.mode = CPUMODE_64BIT;
+//__debugbreak();
+            if (VBOX_SUCCESS(DISInstr(&cpu, pInstr, 0, &cb, szOutput)))
+                printf(szOutput);
+            else
+            {
+                printf("DISOne failed!\n");
+                return 1;
+            }
+            pInstr += cb;
+        }
     }
     return 0;

trunk/src/VBox/Disassembler/DisasmTestA.asm

@@ -66 +66 @@
 ENDPROC   TestProc
 
+
+BITS 64
+align 16
+BEGINPROC TestProc64
+      movzx rax,byte  [edx]
+      movzx rax,word  [edx]
+      lock cmpxchg [rcx], rax
+      lock cmpxchg [rcx], ax
+      lock cmpxchg [r15], dl
+      movzx RSI, word [R8]
+      in al, dx
+      in ax, dx
+      in eax, dx
+      mov rbx, [rcx + rax*4 + 17]
+      mov rbx, [rbp + rax*4 + 4]
+      mov rbx, [rbp + rax*4]
+      int 80h
+      in  al, 60h
+      in  ax, dx
+      out 64h, eax
+
+      movss xmm0, xmm14
+      movsd xmm6, xmm1
+      ret
+ENDPROC   TestProc64