Changeset 36254 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Mar 10, 2011 5:22:08 PM (14 years ago)

Author:

vboxsync

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

70492

Message:

GIP,++: Lots of CPUs (disabled).

Location:

trunk/src/VBox/Runtime/common/time

Files:

• timesupA.mac (modified) (2 diffs)
• timesupref.h (modified) (1 diff)

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

@@ -95 +95 @@
     mov     u32ApicIdPlus, ebx
  %endif
-    ; pGipCpu = &pGip->aCPU[u8ApicId];
+    ; pGipCpu = &pGip->aCPU[pGip->aiCpuFromApicId[u8ApicId]];
     shr     ebx, 24
+ %ifdef SUP_WITH_LOTS_OF_CPUS
+    movzx   ebx, word [esi + ebx * 2 + SUPGLOBALINFOPAGE.aiCpuFromApicId]
+ %else
+    and     ebx, SUPGLOBALINFOPAGE_CPUS - 1
+ %endif
     mov     eax, SUPGIPCPU_size
     mul     ebx
@@ -516 +521 @@
     mov     u32ApicIdPlus, ebx
  %endif
-    ; pGipCpu = &pGip->aCPU[u8ApicId];
+    ; pGipCpu = &pGip->aCPU[pGip->aiCpuFromApicId[u8ApicId]];
     shr     ebx, 24
+ %ifdef SUP_WITH_LOTS_OF_CPUS
+    movzx   eax, word [pGip + rbx * 2 + SUPGLOBALINFOPAGE.aiCpuFromApicId]
+ %else
     mov     eax, ebx
- %if SUPGLOBALINFOPAGE_CPUS < 256
     and     eax, SUPGLOBALINFOPAGE_CPUS - 1
  %endif

trunk/src/VBox/Runtime/common/time/timesupref.h

@@ -63 +63 @@
 
 #ifdef ASYNC_GIP
-        uint8_t u8ApicId = ASMGetApicId();
-# if SUPGLOBALINFOPAGE_CPUS < 256
-        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId & SUPGLOBALINFOPAGE_CPUS];
+        uint8_t    u8ApicId = ASMGetApicId();
+# ifdef SUP_WITH_LOTS_OF_CPUS
+        PSUPGIPCPU pGipCpu = &pGip->aCPUs[pGip->aiCpuFromApicId[u8ApicId]];
 # else
-        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId];
+        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId & (SUPGLOBALINFOPAGE_CPUS - 1)];
 # endif
 #else