Changeset 96817 in vbox

Timestamp:

Sep 21, 2022 9:40:06 PM (2 years ago)

Author:

vboxsync

Message:

IPRT,VBoxGuest,SUPDrv: RTLogWriteVmm build fixes and optimizations of inline assembly for non-PIC/PIE i386.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/linux/combined-agnostic.c (modified) (1 diff)
• HostDrivers/Support/linux/combined-agnostic2.c (modified) (1 diff)
• Runtime/VBox/RTLogWriteVmm-amd64-x86.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/linux/combined-agnostic.c

@@ -171 +171 @@
 #undef LOG_GROUP
 #include "VBox/logbackdoor.c"
+#undef LOG_GROUP
+#include "VBox/RTLogWriteVmm-amd64-x86.c"
 
 #ifdef RT_ARCH_AMD64

trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c

@@ -107 +107 @@
 #undef LOG_GROUP
 #include "VBox/log-vbox.c"
+#undef LOG_GROUP
+#include "VBox/RTLogWriteVmm-amd64-x86.c"
 
 #ifdef RT_ARCH_AMD64

trunk/src/VBox/Runtime/VBox/RTLogWriteVmm-amd64-x86.cpp

@@ -47 +47 @@
 RTDECL(void) RTLogWriteVmm(const char *pach, size_t cb, bool fRelease)
 {
-#  ifdef RT_ARCH_AMD64
-    RTCCUINTREG uRAX, uRBX, uRCX, uRDX, uRSI;
-    __asm__ __volatile__ ("cpuid\n\t"
-                          : "=a" (uRAX)
-                          , "=b" (uRBX)
-                          , "=c" (uRCX)
-                          , "=d" (uRDX)
-                          , "=S" (uRSI)
-                          : "0" (VBOX_CPUID_REQ_EAX_FIXED)
-                          , "1" ((uint32_t)fRelease)
-                          , "2" (VBOX_CPUID_REQ_ECX_FIXED | VBOX_CPUID_FN_LOG)
-                          , "3" (cb)
-                          , "4" (pach));
-#  else
     RTCCUINTREG uEAX, uEBX, uECX, uEDX, uESI;
+#if (defined(PIC) || defined(__PIC__)) && defined(__i386__)
     __asm__ __volatile__ ("xchgl %%ebx, %1\n\t"
                           "cpuid\n\t"
@@ -75 +62 @@
                          , "3" (cb)
                          , "4" (pach));
-#  endif
+#else
+    __asm__ __volatile__ ("cpuid\n\t"
+                          : "=a" (uEAX)
+                          , "=b" (uEBX)
+                          , "=c" (uECX)
+                          , "=d" (uEDX)
+                          , "=S" (uESI)
+                          : "0" (VBOX_CPUID_REQ_EAX_FIXED)
+                          , "1" ((uint32_t)fRelease)
+                          , "2" (VBOX_CPUID_REQ_ECX_FIXED | VBOX_CPUID_FN_LOG)
+                          , "3" (cb)
+                          , "4" (pach));
+#endif
 }
 RT_EXPORT_SYMBOL(RTLogWriteVmm);