Changeset 15420 in vbox for trunk/src/VBox

Timestamp:

Dec 13, 2008 7:21:55 AM (16 years ago)

Author:

vboxsync

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

40869

Message:

EMAll: ADD, ADC and SUB - the first is used a bit by windows.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (1 diff)
• EMAllA.asm (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -2939 +2939 @@
         &&  CPUMIsGuestIn64BitCode(pVM, pRegFrame))
     {
-        if (    pCpu->pCurInstr->opcode != OP_STOSWD
-            &&  pCpu->pCurInstr->opcode != OP_MOV
-            &&  pCpu->pCurInstr->opcode != OP_CMPXCHG8B
-            &&  pCpu->pCurInstr->opcode != OP_XCHG
+        uint32_t uOpCode = pCpu->pCurInstr->opcode;
+        if (    uOpCode != OP_STOSWD
+            &&  uOpCode != OP_MOV
+            &&  uOpCode != OP_CMPXCHG8B
+            &&  uOpCode != OP_XCHG
 # ifdef VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
-            &&  pCpu->pCurInstr->opcode != OP_CMPXCHG /* solaris */
-            &&  pCpu->pCurInstr->opcode != OP_AND     /* windows */
-            &&  pCpu->pCurInstr->opcode != OP_OR      /* windows */
-            &&  pCpu->pCurInstr->opcode != OP_XOR
+            &&  uOpCode != OP_CMPXCHG /* solaris */
+            &&  uOpCode != OP_AND     /* windows */
+            &&  uOpCode != OP_OR      /* windows */
+            &&  uOpCode != OP_XOR     /* because we can */
+            &&  uOpCode != OP_ADD     /* windows (dripple) */
+            &&  uOpCode != OP_ADC     /* because we can */
+            &&  uOpCode != OP_SUB     /* because we can */
+            /** @todo OP_BTS or is that a different kind of failure? */
 # endif
             )

trunk/src/VBox/VMM/VMMAll/EMAllA.asm

@@ -627 +627 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -662 +662 @@
     pop     MY_RET_REG
     retn
+
+%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
+.do_qword:
+    db      0xea                        ; jmp far .sixtyfourbit_mode
+    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
+BITS 64
+.sixtyfourbit_mode:
+    and     esp, 0ffffffffh
+    and     MY_PTR_REG, 0ffffffffh
+    mov     rdx, qword [rsp + 08h]      ; rdx = second parameter
+    add     [MY_PTR_REG64], rdx         ; do 8 bytes ADD
+    jmp far [.fpret wrt rip]
+.fpret:                                 ; 16:32 Pointer to .done.
+    dd      .done, NAME(SUPR0AbsKernelCS)
+BITS 32
+%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
 ENDPROC     EMEmulateAdd
 
@@ -692 +708 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -731 +747 @@
     pop     MY_RET_REG
     retn
+
+%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
+.do_qword:
+    db      0xea                        ; jmp far .sixtyfourbit_mode
+    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
+BITS 64
+.sixtyfourbit_mode:
+    and     esp, 0ffffffffh
+    and     MY_PTR_REG, 0ffffffffh
+    mov     rdx, qword [rsp + 08h]      ; rdx = second parameter
+    stc     ; set carry flag
+    adc     [MY_PTR_REG64], rdx         ; do 8 bytes ADC
+    jmp far [.fpret wrt rip]
+.fpret:                                 ; 16:32 Pointer to .done.
+    dd      .done, NAME(SUPR0AbsKernelCS)
+BITS 32
+%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
 ENDPROC     EMEmulateAdcWithCarrySet
 
@@ -761 +794 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -796 +829 @@
     pop     MY_RET_REG
     retn
+
+%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
+.do_qword:
+    db      0xea                        ; jmp far .sixtyfourbit_mode
+    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
+BITS 64
+.sixtyfourbit_mode:
+    and     esp, 0ffffffffh
+    and     MY_PTR_REG, 0ffffffffh
+    mov     rdx, qword [rsp + 08h]      ; rdx = second parameter
+    sub     [MY_PTR_REG64], rdx         ; do 8 bytes SUB
+    jmp far [.fpret wrt rip]
+.fpret:                                 ; 16:32 Pointer to .done.
+    dd      .done, NAME(SUPR0AbsKernelCS)
+BITS 32
+%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
 ENDPROC     EMEmulateSub