Changeset 15418 in vbox

Timestamp:

Dec 13, 2008 6:39:03 AM (16 years ago)

Author:

vboxsync

Message:

EMAll: AND, OR and XOR on darwin/R0 - the first two are for vista64.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

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

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

@@ -2942 +2942 @@
             &&  pCpu->pCurInstr->opcode != OP_XCHG
 # ifdef VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
-            &&  pCpu->pCurInstr->opcode != OP_CMPXCHG
+            &&  pCpu->pCurInstr->opcode != OP_CMPXCHG /* solaris */
+            &&  pCpu->pCurInstr->opcode != OP_AND     /* windows */
+            &&  pCpu->pCurInstr->opcode != OP_OR      /* windows */
+            &&  pCpu->pCurInstr->opcode != OP_XOR
 # endif
             )

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

@@ -50 +50 @@
 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
  %define CAN_DO_8_BYTE_OP  1
+ %define MY_PTR_REG64   rcx
 %endif
 
@@ -156 +157 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -191 +192 @@
     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
+    and     [MY_PTR_REG64], rdx         ; do 8 bytes AND
+    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     EMEmulateAnd
 
@@ -221 +238 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -256 +273 @@
     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
+    or      [MY_PTR_REG64], rdx         ; do 8 bytes OR
+    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     EMEmulateOr
 
@@ -286 +319 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -333 +366 @@
     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
+    lock or [MY_PTR_REG64], rdx         ; do 8 bytes OR
+    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
+
+
 %ifdef IN_RC
 ; #PF resume point.
@@ -370 +420 @@
 
     ; switch on size
-%ifdef RT_ARCH_AMD64
+%ifdef CAN_DO_8_BYTE_OP
     cmp     al, 8
     je short .do_qword                  ; 8 bytes variant
@@ -405 +455 @@
     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
+    xor     [MY_PTR_REG64], rdx         ; do 8 bytes XOR
+    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     EMEmulateXor