Changeset 66335 in vbox for trunk/src/VBox

Timestamp:

Mar 29, 2017 2:32:37 PM (8 years ago)

Author:

vboxsync

Message:

IEM: Fixed UD1 / grp 10 decoding (intel eats modr/m after it).

File:

• trunk/src/VBox/Runtime/common/asm/ASMCpuId.asm (copied) (copied from trunk/src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm ) (2 diffs)

trunk/src/VBox/Runtime/common/asm/ASMCpuId.asm

@@ -33 +33 @@
 
 ;;
-; CPUID with EAX and ECX inputs, returning ALL output registers.
+; CPUID with EAX input, returning ALL output registers (no NULL checking).
 ;
-; @param    uOperator   x86:ebp+8   gcc:rdi      msc:rcx
-; @param    uInitEBX    x86:ebp+c   gcc:rsi      msc:rdx
-; @param    uInitECX    x86:ebp+10  gcc:rdx      msc:r8
-; @param    uInitEDX    x86:ebp+14  gcc:rcx      msc:r9
-; @param    pvEAX       x86:ebp+18  gcc:r8       msc:rbp+30h
-; @param    pvEBX       x86:ebp+1c  gcc:r9       msc:rbp+38h
-; @param    pvECX       x86:ebp+20  gcc:rbp+10h  msc:rbp+40h
-; @param    pvEDX       x86:ebp+24  gcc:rbp+18h  msc:rbp+48h
+; @param    uOperator   8086:bp+4   x86:ebp+8   gcc:rdi  msc:rcx
+; @param    pvEAX       8086:bp+8   x86:ebp+0c  gcc:rsi  msc:rdx
+; @param    pvEBX       8086:bp+0c  x86:ebp+10  gcc:rdx  msc:r8
+; @param    pvECX       8086:bp+10  x86:ebp+14  gcc:rcx  msc:r9
+; @param    pvEDX       8086:bp+14  x86:ebp+18  gcc:r8   msc:rbp+30h
 ;
-; @returns  EAX
+; DECLASM(void) ASMCpuId(uint32_t uOperator, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX);
 ;
-BEGINPROC_EXPORTED ASMCpuIdExSlow
+BEGINPROC_EXPORTED ASMCpuId
         push    xBP
         mov     xBP, xSP
         push    xBX
-%if ARCH_BITS == 32
-        push    edi
-%elif ARCH_BITS == 16
-        push    di
-        push    es
-%endif
 
 %ifdef ASM_CALL64_MSC
@@ -62 +53 @@
  %endif
         mov     eax, ecx
-        mov     ebx, edx
-        mov     ecx, r8d
-        mov     edx, r9d
-        mov     r8,  [rbp + 30h]
-        mov     r9,  [rbp + 38h]
-        mov     r10, [rbp + 40h]
-        mov     r11, [rbp + 48h]
+        mov     r10, rdx
+        cpuid
+        mov     [r10], eax
+        mov     [r8], ebx
+        mov     [r9], ecx
+        mov     r10, [rbp+30h]
+        mov     [r10], edx
+
 %elifdef ASM_CALL64_GCC
         mov     eax, edi
-        mov     ebx, esi
-        xchg    ecx, edx
-        mov     r10, [rbp + 10h]
-        mov     r11, [rbp + 18h]
+        mov     r10, rdx
+        mov     r11, rcx
+        cpuid
+        mov     [rsi], eax
+        mov     [r10], ebx
+        mov     [r11], ecx
+        mov     [r8], edx
+
 %elif ARCH_BITS == 32
         mov     eax, [xBP + 08h]
-        mov     ebx, [xBP + 0ch]
-        mov     ecx, [xBP + 10h]
+        cpuid
+        push    edx
+        mov     edx, [xBP + 0ch]
+        mov     [edx], eax
+        mov     edx, [xBP + 10h]
+        mov     [edx], ebx
         mov     edx, [xBP + 14h]
-        mov     edi, [xBP + 18h]
+        mov     [edx], ecx
+        mov     edx, [xBP + 18h]
+        pop     dword [edx]
+
 %elif ARCH_BITS == 16
-        mov     eax, [xBP + 08h - 4]
-        mov     ebx, [xBP + 0ch - 4]
-        mov     ecx, [xBP + 10h - 4]
-        mov     edx, [xBP + 14h - 4]
+        push    es
+        push    di
+
+        mov     eax, [xBP + 04h]
+        cpuid
+        les     di, [xBP + 08h]
+        mov     [di], eax
+        les     di, [xBP + 0ch]
+        mov     [di], ebx
+        les     di, [xBP + 10h]
+        mov     [di], ecx
+        les     di, [xBP + 14h]
+        mov     [di], edx
+
+        pop     di
+        pop     es
 %else
  %error unsupported arch
 %endif
 
-        cpuid
-
-%ifdef RT_ARCH_AMD64
-        test    r8, r8
-        jz      .store_ebx
-        mov     [r8], eax
-%elif ARCH_BITS == 32
-        test    edi, edi
-        jz      .store_ebx
-        mov     [edi], eax
-%else
-        cmp     dword [bp + 18h - 4], 0
-        je      .store_ebx
-        les     di, [bp + 18h - 4]
-        mov     [es:di], eax
-%endif
-.store_ebx:
-
-%ifdef RT_ARCH_AMD64
-        test    r9, r9
-        jz      .store_ecx
-        mov     [r9], ebx
-%elif ARCH_BITS == 32
-        mov     edi, [ebp + 1ch]
-        test    edi, edi
-        jz      .store_ecx
-        mov     [edi], ebx
-%else
-        cmp     dword [bp + 1ch - 4], 0
-        je      .store_ecx
-        les     di, [bp + 1ch - 4]
-        mov     [es:di], ebx
-%endif
-.store_ecx:
-
-%ifdef RT_ARCH_AMD64
-        test    r10, r10
-        jz      .store_edx
-        mov     [r10], ecx
-%elif ARCH_BITS == 32
-        mov     edi, [ebp + 20h]
-        test    edi, edi
-        jz      .store_edx
-        mov     [edi], ecx
-%else
-        cmp     dword [bp + 20h - 4], 0
-        je      .store_edx
-        les     di, [bp + 20h - 4]
-        mov     [es:di], ecx
-%endif
-.store_edx:
-
-%ifdef RT_ARCH_AMD64
-        test    r11, r11
-        jz      .done
-        mov     [r11], edx
-%elif ARCH_BITS == 32
-        mov     edi, [ebp + 24h]
-        test    edi, edi
-        jz      .done
-        mov     [edi], edx
-%else
-        cmp     dword [bp + 24h - 4], 0
-        je      .done
-        les     di, [bp + 24h - 4]
-        mov     [es:di], edx
-%endif
-.done:
-
-%if ARCH_BITS == 32
-        pop     edi
-%elif ARCH_BITS == 16
-        pop     es
-        pop     di
-%endif
         pop     xBX
         leave
         ret
-ENDPROC ASMCpuIdExSlow
+ENDPROC ASMCpuId