Changeset 5489 in vbox

Timestamp:

Oct 25, 2007 1:43:43 AM (17 years ago)

Author:

vboxsync

Message:

Some hacks from yesterday.

Location:

trunk

Files:

• include/iprt/asmdefs.mac (modified) (2 diffs)
• src/VBox/Runtime/common/time/timesupA.asm (modified) (1 diff)
• src/VBox/Runtime/common/time/timesupA.mac (modified) (3 diffs)

trunk/include/iprt/asmdefs.mac

@@ -5 +5 @@
 ;
 ;  Copyright (C) 2006-2007 innotek GmbH
-; 
+;
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -70 +70 @@
 ; Gets the pointer to an imported object.
 %ifdef ASM_FORMAT_PE
-%define IMP(name)       dword [IMPNAME(name)]
-%else
-%define IMP(name)       IMPNAME(name)
+ %ifdef RT_ARCH_AMD64
+  %define IMP(name)       qword [IMPNAME(name) wrt rip]
+ %else
+  %define IMP(name)       dword [IMPNAME(name)]
+ %endif
+%else
+ %define IMP(name)       IMPNAME(name)
 %endif
 

trunk/src/VBox/Runtime/common/time/timesupA.asm

@@ -37 +37 @@
 
 BEGINDATA
-extern NAME(g_pSUPGlobalInfoPage)
+%undef IN_SUPLIB
+%undef IMPORTED_SUPLIB
+%ifdef IN_SUP_R0
+ %define IN_SUPLIB
+%endif
+%ifdef IN_SUP_R3
+ %define IN_SUPLIB
+%endif
+%ifdef IN_SUP_GC
+ %define IN_SUPLIB
+%endif
+%ifdef IN_SUPLIB
+ extern NAME(g_pSUPGlobalInfoPage)
+%elifdef IN_RING0
+ %ifdef RT_OS_WINDOWS
+  %define IMPORTED_SUPLIB
+  extern IMPNAME(g_SUPGlobalInfoPage)
+ %else
+  extern NAME(g_SUPGlobalInfoPage)
+ %endif
+%else
+ %ifdef RT_OS_WINDOWS
+  %define IMPORTED_SUPLIB
+  extern IMPNAME(g_pSUPGlobalInfoPage)
+ %else
+  extern NAME(g_pSUPGlobalInfoPage)
+ %endif
+%endif
+
 
 BEGINCODE

trunk/src/VBox/Runtime/common/time/timesupA.mac

@@ -66 +66 @@
     ; Load pGip and calc pGipCPU, setting u32ApicIdPlus if necessary.
     ;
+%ifdef IMPORTED_SUPLIB
+    mov     esi, IMP(g_pSUPGlobalInfoPage)
+    mov     esi, [esi]
+%else
     mov     esi, [NAME(g_pSUPGlobalInfoPage)]
+%endif
     or      esi, esi
     jz      .Rediscover
@@ -464 +469 @@
     ;
     ; Load pGip and calc pGipCPU, setting u32ApicIdPlus if necessary.
-    ;
+    ; Finding the GIP is fun...
+    ;
+%ifdef RT_OS_WINDOWS
+ %ifdef IMPORTED_SUPLIB
+  %ifdef IN_RING0
+    mov     rax, qword IMP(g_SUPGlobalInfoPage)
+    mov     pGip, rax
+  %else
+    mov     pGip, [IMP(g_pSUPGlobalInfoPage) wrt rip]
+    mov     pGip, [pGip]
+  %endif
+ %else
+    mov     pGip, [NAME(g_pSUPGlobalInfoPage) wrt rip]
+ %endif
+%else
+ %ifdef IN_RING0
+    mov     rax, qword NAME(g_SUPGlobalInfoPage)
+    mov     pGip, rax
+ %else
+    mov     pGip, [rel NAME(g_pSUPGlobalInfoPage) wrt ..gotpcrel]
+    mov     pGip, [pGip]
+ %endif
+%endif
+    or      pGip, pGip
+    jz      .Rediscover
+    cmp     dword [pGip + SUPGLOBALINFOPAGE.u32Magic], SUPGLOBALINFOPAGE_MAGIC
+    jne     .Rediscover
+
 %ifdef ASYNC_GIP
     ; u8ApicId = ASMGetApicId();
@@ -476 +508 @@
     mov     eax, SUPGIPCPU_size
     mul     ebx
- %ifdef RT_OS_WINDOWS
-    mov     pGip, [NAME(g_pSUPGlobalInfoPage) wrt rip]
- %else
-    mov     pGip, [rel NAME(g_pSUPGlobalInfoPage) wrt ..gotpcrel]
-    mov     pGip, [pGip]
- %endif
     lea     pGipCPU, [pGip + rax + SUPGLOBALINFOPAGE.aCPUs]
-;    lea     pGipCPU, [pGip + SUPGLOBALINFOPAGE.aCPUs]
-;    lea     pGipCPU, [pGipCPU + rax]
 %else
- %ifdef RT_OS_WINDOWS
-    mov     pGip, [NAME(g_pSUPGlobalInfoPage) wrt rip]
- %else
-    mov     pGip, [rel NAME(g_pSUPGlobalInfoPage) wrt ..gotpcrel]
-    mov     pGip, [pGip]
- %endif
     lea     pGipCPU, [pGip + SUPGLOBALINFOPAGE.aCPUs]
 %endif
-    or      pGip, pGip
-    jz      .Rediscover
-    cmp     dword [pGip + SUPGLOBALINFOPAGE.u32Magic], SUPGLOBALINFOPAGE_MAGIC
-    jne     .Rediscover
 
 %ifdef NEED_TRANSACTION_ID