Changeset 20041 in vbox

Timestamp:

May 26, 2009 2:43:49 PM (16 years ago)

Author:

vboxsync

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

47775

Message:

Support 32 bits cr8 accesses (lock mov cr0, eax = mov cr8, eax)

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (1 diff)
• DisasmTestA.asm (modified) (2 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -717 +717 @@
             {
             case OP_PARM_C: //control register
-                disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "CR%d", reg);
                 pParam->flags |= USE_REG_CR;
-                pParam->base.reg_ctrl = reg;
+
+                if (    pCpu->pCurInstr->opcode == OP_MOV_CR
+                    &&  pCpu->opmode == CPUMODE_32BIT
+                    &&  (pCpu->prefix & PREFIX_LOCK))
+                {
+                    pCpu->prefix &= ~PREFIX_LOCK;
+                    pParam->base.reg_ctrl = USE_REG_CR8;
+                }
+                else
+                    pParam->base.reg_ctrl = reg;
+
+                disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "CR%d", pParam->base.reg_ctrl);
                 return 0;
 

trunk/src/VBox/Disassembler/DisasmTestA.asm

@@ -34 +34 @@
 align 16
 BEGINPROC   TestProc
+    DB 0xF0, 0x0F, 0x22, 0xC0
+    DB 0xF0, 0x0F, 0x20, 0xC0
     smsw  word [edx+16]
 ;    invept      eax, qword [ecx]
@@ -77 +79 @@
 align 16
 BEGINPROC TestProc64
+    mov cr8, rax
+    mov cr8, rbx
+    mov [0xfffe0080], rax
+    mov [0xfffe0080], rbx
+    mov rax, cr8
+    mov rbx, cr8
+    mov rax, [0xfffe0080]
+    mov rbx, [0xfffe0080]
     divsd xmm1, xmm0
  ;    invept      rdi, qword [rsi]