Changeset 87235 in vbox for trunk/src

Timestamp:

Jan 13, 2021 12:41:05 PM (4 years ago)

Author:

vboxsync

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

142191

Message:

SUP,IPRT: Adjustments for bugref:9898.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPLibAll.cpp (modified) (7 diffs)
• HostDrivers/Support/testcase/tstInt.cpp (modified) (1 diff)
• Runtime/Makefile.kmk (modified) (1 diff)
• Runtime/VBox/VBoxRTDeps.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibAll.cpp

@@ -44 +44 @@
 
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-
 /**
  * The slow case for SUPReadTsc where we need to apply deltas.
@@ -218 +217 @@
     return uTsc;
 }
+#endif /* RT_ARCH_AMD64 || RT_ARCH_X86 */
 
 
@@ -230 +230 @@
     uint16_t iGipCpu;
 #ifdef IN_RING3
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     if (pGip->fGetGipCpu & SUPGIPGETCPU_IDTR_LIMIT_MASK_MAX_SET_CPUS)
     {
@@ -264 +265 @@
         iGipCpu = pGip->aiCpuFromApicId[idApic];
     }
+
+# else
+    int iCpuSet = RTMpCpuIdToSetIndex(RTMpCpuId());
+    if (RT_LIKELY((unsigned)iCpuSet < RT_ELEMENTS(pGip->aiCpuFromCpuSetIdx)))
+        iGipCpu = pGip->aiCpuFromCpuSetIdx[iCpuSet];
+    else
+        iGipCpu = UINT16_MAX;
+# endif
+
 #elif defined(IN_RING0)
     /* Ring-0: Use use RTMpCpuId() (disables cli to avoid host OS assertions about unsafe CPU number usage). */
@@ -281 +291 @@
     else
         iGipCpu = UINT16_MAX;
+
 #else
 # error "IN_RING3, IN_RC or IN_RING0 must be defined!"
@@ -324 +335 @@
     return pGip->u64CpuHz;
 }
+
 
 
@@ -383 +395 @@
 }
 
-#endif /* RT_ARCH_AMD64 || RT_ARCH_X86 */
-

trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp

@@ -35 +35 @@
 #include <iprt/errcore.h>
 #include <VBox/param.h>
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#else
+# define ASMReadTSC RTTimeSystemNanoTS
+#endif
 #include <iprt/initterm.h>
 #include <iprt/stream.h>

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2303 +2303 @@
 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
 VBoxRT_LIBS                    = \
-        $(SDK_VBOX_LZF_LIBS)
-if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-VBoxRT_LIBS                   += \
+        $(SDK_VBOX_LZF_LIBS) \
         $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
-endif
 ifndef SDK_VBOX_LIBXML2_LIBS
  VBoxRT_LIBS                  += \

trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifndef RT_NO_GIP
-# include <VBox/sup.h>
-#endif
+#include <VBox/sup.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -59 +57 @@
 struct CLANG11NONSENSE { PFNRT pfn; } g_VBoxRTDeps[] =
 {
-#ifndef RT_NO_GIP
     { (PFNRT)SUPR3Init },
     { (PFNRT)SUPR3PageAllocEx },
     { (PFNRT)SUPR3LoadVMM },
     { (PFNRT)SUPSemEventCreate },
-    { (PFNRT)SUPTracerFireProbe },
+    { (PFNRT)SUPIsTscFreqCompatibleEx },
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+    { (PFNRT)SUPTracerFireProbe }, /** @todo port me @bugref{9898} ? */
     { (PFNRT)SUPGetTscDeltaSlow },
 #endif