Changeset 37970 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jul 14, 2011 2:37:23 PM (13 years ago)

Author:

vboxsync

Message:

SUPDrv: Use RTStrPrintfV instead of host snprintf in SUPR0Printf. (darwin+linux, todo: windows)

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• darwin/SUPDrv-darwin.cpp (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -815 +815 @@
 
 
-/** @todo move this to assembly where a simple "jmp printf" will to the trick. */
 RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
 {
-    va_list     args;
+    va_list     va;
     char        szMsg[512];
 
-    va_start(args, pszFormat);
-    vsnprintf(szMsg, sizeof(szMsg) - 1, pszFormat, args);
-    va_end(args);
-
+    va_start(va, pszFormat);
+    RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);
+    va_end(va);
     szMsg[sizeof(szMsg) - 1] = '\0';
+
     printf("%s", szMsg);
     return 0;

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -782 +782 @@
 RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
 {
-#if 1
-    va_list args;
+    va_list va;
     char    szMsg[512];
 
-    va_start(args, pszFormat);
-    vsnprintf(szMsg, sizeof(szMsg) - 1, pszFormat, args);
+    va_start(va, pszFormat);
+    SUPR0Printf(szMsg, sizeof(szMsg) - 1, pszFormat, va);
+    va_end(va);
     szMsg[sizeof(szMsg) - 1] = '\0';
+
     printk("%s", szMsg);
-    va_end(args);
-#else
-    /* forward to printf - needs some more GCC hacking to fix ebp... */
-    __asm__ __volatile__ ("mov %0, %esp\n\t"
-                          "jmp %1\n\t",
-                          :: "r" ((uintptr_t)&pszFormat - 4),
-                             "m" (printk));
-#endif
     return 0;
 }