Changeset 36220 in vbox

Timestamp:

Mar 9, 2011 10:57:45 AM (14 years ago)

Author:

vboxsync

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

70434

Message:

GIP: Force a couple of aCPUs accesses within bounds.

Location:

trunk

Files:

trunk/include/VBox/sup.h

-              r35855
+              r36220
 typedef SUPGIPCPU *PSUPGIPCPU;
+/** The number of CPUs covered by the GIP.
+ * @remarks Must be a power of two! */
+#define SUPGLOBALINFOPAGE_CPUS      32
 /**
  * Global Information Page.
 …
      * If u32Mode == SUPGIPMODE_ASYNC_TSC then the CPU ACPI ID is used as an
      * index into the array. */
     SUPGIPCPU           aCPUs[32];
+    SUPGIPCPU           aCPUs[SUPGLOBALINFOPAGE_CPUS];
 } SUPGLOBALINFOPAGE;
 AssertCompile(sizeof(SUPGLOBALINFOPAGE) <= 0x1000);

-              r28800
+              r36220
 %define ___VBox_sup_mac
+%define SUPGLOBALINFOPAGE_CPUS  32
 struc SUPGIPCPU
 …
     .u64NanoTSLastUpdateHz      resq 1
     .au32Padding1               resd 56
     .aCPUs                      resb (SUPGIPCPU_size*32)
+    .aCPUs                      resb (SUPGIPCPU_size*SUPGLOBALINFOPAGE_CPUS)
 endstruc

-              r33540
+              r36220
     ; pGipCpu = &pGip->aCPU[u8ApicId];
     shr     ebx, 24
+    mov     eax, SUPGIPCPU_size
+    mul     ebx
+    mov     eax, ebx
+ %if SUPGLOBALINFOPAGE_CPUS < 256
+    and     eax, SUPGLOBALINFOPAGE_CPUS - 1
+ %endif
+    imul    eax, SUPGIPCPU_size
     lea     pGipCPU, [pGip + rax + SUPGLOBALINFOPAGE.aCPUs]
 %else

-              r33540
+              r36220
 #ifdef ASYNC_GIP
         uint8_t u8ApicId = ASMGetApicId();
+# if SUPGLOBALINFOPAGE_CPUS < 256
+        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId & SUPGLOBALINFOPAGE_CPUS];
+# else
         PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId];
+# endif
 #else
         PSUPGIPCPU pGipCpu = &pGip->aCPUs[0];

Note: See TracChangeset for help on using the changeset viewer.