Changeset 46941 in vbox

Timestamp:

Jul 3, 2013 2:48:42 PM (12 years ago)

Author:

vboxsync

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

86946

Message:

Moved some related files from win/amd64 to common/asm while at it (LDTR).

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/asm/ASMGetGDTR.asm (moved) (moved from trunk/src/VBox/Runtime/win/amd64/ASMGetGDTR.asm ) (3 diffs, 1 prop)
• common/asm/ASMGetIDTR.asm (moved) (moved from trunk/src/VBox/Runtime/win/amd64/ASMGetIDTR.asm ) (3 diffs, 1 prop)
• common/asm/ASMGetLDTR.asm (modified) (1 diff, 1 prop)
• common/asm/ASMGetTR.asm (moved) (moved from trunk/src/VBox/Runtime/win/amd64/ASMGetTR.asm ) (2 diffs, 1 prop)
• common/asm/ASMMultU64ByU32DivByU32.asm (modified) (1 prop)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -179 +179 @@
         win/amd64/ASMGetFS.asm \
         win/amd64/ASMGetGS.asm \
-        win/amd64/ASMGetIDTR.asm \
-        win/amd64/ASMGetGDTR.asm \
-        win/amd64/ASMGetTR.asm \
         win/amd64/ASMGetSS.asm \
         win/amd64/ASMProbeReadByte.asm \
@@ -195 +192 @@
         common/asm/ASMCpuId_Idx_ECX.asm \
         common/asm/ASMNopPause.asm \
-        common/asm/ASMGetLDTR.asm
+        common/asm/ASMGetIDTR.asm \
+        common/asm/ASMGetGDTR.asm \
+        common/asm/ASMGetLDTR.asm \
+        common/asm/ASMGetTR.asm
 
 #

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

@@ +1 @@
+; $Id$
 ;; @file
 ; IPRT - ASMGetGDTR().
@@ -4 +5 @@
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +34 @@
 ;;
 ; Gets the content of the GDTR CPU register.
-; @param   rcx  pGdtr   Where to store the GDTR contents.
+; @param   pGdtr    Where to store the GDTR contents.
+;                   msc=rcx, gcc=rdi, x86=[esp+4]
 ;
 BEGINPROC_EXPORTED ASMGetGDTR
-        sgdt    [rcx]
+%ifdef ASM_CALL64_MSC
+        mov     rax, rcx
+%elifdef ASM_CALL64_GCC
+        mov     rax, rdi
+%elifdef RT_ARCH_X86
+        mov     eax, [esp + 4]
+%else
+ %error "Undefined arch?"
+%endif
+        sgdt    [xAX]
         ret
 ENDPROC ASMGetGDTR

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

@@ +1 @@
+; $Id$
 ;; @file
 ; IPRT - ASMGetIDTR().
@@ -4 +5 @@
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +34 @@
 ;;
 ; Gets the content of the IDTR CPU register.
-; @param   rcx  pIdtr   Where to store the IDTR contents.
+; @param    pIdtr   Where to store the IDTR contents.
+;                   msc=rcx, gcc=rdi, x86=[esp+4]
 ;
 BEGINPROC_EXPORTED ASMGetIDTR
-        sidt    [rcx]
+%ifdef ASM_CALL64_MSC
+        mov     rax, rcx
+%elifdef ASM_CALL64_GCC
+        mov     rax, rdi
+%elifdef RT_ARCH_X86
+        mov     eax, [esp + 4]
+%else
+ %error "Undefined arch?"
+%endif
+        sidt    [xAX]
         ret
 ENDPROC ASMGetIDTR
 
-

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

@@ -1 @@
-; $Id: $
+; $Id$
 ;; @file
 ; IPRT - ASMGetLDTR().

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

@@ +1 @@
+; $Id$
 ;; @file
 ; IPRT - ASMGetTR().
@@ -4 +5 @@
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as