Changeset 36262 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 11, 2011 2:50:45 PM (14 years ago)

Author:

vboxsync

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

70526

Message:

SUPDrv,IPRT,++: Enabled the code for supporting up to 256 host CPUs/cores/threads.

Location:

trunk/src/VBox/Runtime

Files:

• common/time/timesupA.mac (modified) (2 diffs)
• common/time/timesupref.h (modified) (1 diff)
• r0drv/nt/initterm-r0drv-nt.cpp (modified) (1 diff)
• r3/win/mp-win.cpp (modified) (1 diff)

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

@@ -97 +97 @@
     ; 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
@@ -523 +519 @@
     ; 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
-    and     eax, SUPGLOBALINFOPAGE_CPUS - 1
- %endif
     imul    eax, SUPGIPCPU_size
     lea     pGipCPU, [pGip + rax + SUPGLOBALINFOPAGE.aCPUs]

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

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

trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

@@ -83 +83 @@
 #endif
     RTCpuSetEmpty(&g_rtMpNtCpuSet);
-#ifdef RT_WITH_LOTS_OF_CPUS
-# error "port me"
-#endif
     RTCpuSetFromU64(&g_rtMpNtCpuSet, ActiveProcessors);
+/** @todo Port to W2K8 with > 64 cpus/threads. */
 
 #ifdef IPRT_TARGET_NT4

trunk/src/VBox/Runtime/r3/win/mp-win.cpp

@@ -96 +96 @@
     SYSTEM_INFO SysInfo;
     GetSystemInfo(&SysInfo);
-#ifdef RT_WITH_LOTS_OF_CPUS
-# error "port me"
-#endif
+/** @todo port to W2K8 / W7 w/ > 64 CPUs & grouping. */
     return RTCpuSetFromU64(pSet, SysInfo.dwActiveProcessorMask);
 }