Changeset 40798 in vbox

Timestamp:

Apr 6, 2012 4:44:13 PM (13 years ago)

Author:

vboxsync

Message:

SUPDrv: More exports.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (2 diffs)
• HostDrivers/Support/SUPDrvTracer.cpp (modified) (3 diffs)
• HostDrivers/Support/linux/Makefile (modified) (1 diff)
• HostDrivers/Support/linux/files_vboxdrv (modified) (3 diffs)
• Runtime/common/rand/rand.cpp (modified) (2 diffs)
• Runtime/common/string/stringalloc.cpp (modified) (10 diffs)

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

@@ -386 +386 @@
     { "RTCrc32Process",                         (void *)RTCrc32Process },
     { "RTCrc32Start",                           (void *)RTCrc32Start },
+    { "RTUuidCompare",                          (void *)RTUuidCompare },
+    { "RTUuidCompareStr",                       (void *)RTUuidCompareStr },
+    { "RTUuidFromStr",                          (void *)RTUuidFromStr },
+    { "RTStrDupTag",                            (void *)RTStrDupTag },
+    { "RTStrFree",                              (void *)RTStrFree },
+    { "RTStrCopy",                              (void *)RTStrCopy },
+    { "RTStrNCmp",                              (void *)RTStrNCmp },
+
 /* SED: END */
 };
@@ -398 +406 @@
     /* VBoxNetFlt */
     (PFNRT)RTErrConvertFromErrno,
-    (PFNRT)RTUuidCompare,
-    (PFNRT)RTUuidCompareStr,
-    (PFNRT)RTUuidFromStr,
-    (PFNRT)RTStrDupTag,
-    (PFNRT)RTStrFree,
-    (PFNRT)RTStrCopy,
-    (PFNRT)RTStrNCmp,
     /* VBoxNetAdp */
     (PFNRT)RTRandBytes,

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

@@ -872 +872 @@
  */
 #if defined(__GNUC__) && (defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX))
-__asm__ __volatile__("\
+__asm__("\
         .section .text                                                  \n\
                                                                         \n\
@@ -880 +880 @@
 ");
 # if   defined(RT_ARCH_AMD64)
-__asm__ __volatile__(" \
+__asm__(" \
             movq    g_pfnSupdrvProbeFireKernel(%rip), %rax                  \n\
             jmp     *%rax \n\
 ");
 # elif defined(RT_ARCH_X86)
-__asm__ __volatile__("\
+__asm__("\
             movl    g_pfnSupdrvProbeFireKernel, %eax                        \n\
             jmp     *%eax \n\
@@ -892 +892 @@
 #  error "Which arch is this?"
 #endif
-__asm__ __volatile__("\
+__asm__("\
                                                                         \n\
         .type supdrvTracerProbeFireStub,@function                       \n\

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -121 +121 @@
         common/misc/handletablectx.o \
         common/misc/thread.o \
+        common/string/RTStrCopy.o \
         common/string/RTStrCopyP.o \
+        common/string/RTStrNCmp.o \
+        common/string/RTStrNLen.o \
+        common/string/stringalloc.o \
         common/string/strformat.o \
         common/string/strformatrt.o \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -6 +6 @@
 
 #
-# Copyright (C) 2007-2010 Oracle Corporation
+# Copyright (C) 2007-2012 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -53 +53 @@
     ${PATH_ROOT}/include/iprt/power.h=>include/iprt/power.h \
     ${PATH_ROOT}/include/iprt/process.h=>include/iprt/process.h \
+    ${PATH_ROOT}/include/iprt/rand.h=>include/iprt/rand.h \
     ${PATH_ROOT}/include/iprt/semaphore.h=>include/iprt/semaphore.h \
     ${PATH_ROOT}/include/iprt/spinlock.h=>include/iprt/spinlock.h \
@@ -115 +116 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyP.cpp=>common/string/RTStrCopyP.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopy.cpp=>common/string/RTStrCopy.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNCmp.cpp=>common/string/RTStrNCmp.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNLen.cpp=>common/string/RTStrNLen.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \

trunk/src/VBox/Runtime/common/rand/rand.cpp

@@ -61 +61 @@
 static DECLCALLBACK(int) rtRandInitOnce(void *pvUser1, void *pvUser2)
 {
-    NOREF(pvUser1);
-    NOREF(pvUser2);
-
     RTRAND hRand;
     int rc = RTRandAdvCreateSystemFaster(&hRand);
@@ -80 +77 @@
         AssertRC(rc);
 
+    NOREF(pvUser1);
+    NOREF(pvUser2);
     return rc;
 }

trunk/src/VBox/Runtime/common/string/stringalloc.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -62 +62 @@
     return VERR_NO_STR_MEMORY;
 }
-RT_EXPORT_SYMBOL(RTStrAllocTag);
+RT_EXPORT_SYMBOL(RTStrAllocExTag);
 
 
@@ -104 +104 @@
 RTDECL(char *) RTStrDupTag(const char *pszString, const char *pszTag)
 {
+#if defined(__cplusplus)
     AssertPtr(pszString);
+#endif
     size_t cch = strlen(pszString) + 1;
     char *psz = (char *)RTMemAllocTag(cch, pszTag);
@@ -116 +118 @@
 RTDECL(int)  RTStrDupExTag(char **ppszString, const char *pszString, const char *pszTag)
 {
+#if defined(__cplusplus)
     AssertPtr(ppszString);
     AssertPtr(pszString);
+#endif
 
     size_t cch = strlen(pszString) + 1;
@@ -134 +138 @@
 RTDECL(char *) RTStrDupNTag(const char *pszString, size_t cchMax, const char *pszTag)
 {
+#if defined(__cplusplus)
     AssertPtr(pszString);
+#endif
     char const *pszEnd = RTStrEnd(pszString, cchMax);
     size_t      cch    = pszEnd ? (uintptr_t)pszEnd - (uintptr_t)pszString : cchMax;
@@ -158 +164 @@
 RTDECL(int) RTStrAAppendNTag(char **ppsz, const char *pszAppend, size_t cchAppend, const char *pszTag)
 {
+    size_t cchOrg;
+    char  *pszNew;
+
     if (!cchAppend)
         return VINF_SUCCESS;
@@ -165 +174 @@
         Assert(cchAppend == RTStrNLen(pszAppend, cchAppend));
 
-    size_t const cchOrg = *ppsz ? strlen(*ppsz) : 0;
-    char *pszNew = (char *)RTMemReallocTag(*ppsz, cchOrg + cchAppend + 1, pszTag);
+    cchOrg = *ppsz ? strlen(*ppsz) : 0;
+    pszNew = (char *)RTMemReallocTag(*ppsz, cchOrg + cchAppend + 1, pszTag);
     if (!pszNew)
         return VERR_NO_STR_MEMORY;
@@ -247 +256 @@
 RTDECL(int) RTStrATruncateTag(char **ppsz, size_t cchNew, const char *pszTag)
 {
+    char *pszNew;
     char *pszOld = *ppsz;
     if (!cchNew)
@@ -253 +263 @@
         {
             *pszOld = '\0';
-            char *pszNew = (char *)RTMemReallocTag(pszOld, 1, pszTag);
+            pszNew = (char *)RTMemReallocTag(pszOld, 1, pszTag);
             if (pszNew)
                 *ppsz = pszNew;
@@ -260 +270 @@
     else
     {
+        char *pszZero;
         AssertPtrReturn(pszOld, VERR_OUT_OF_RANGE);
         AssertReturn(cchNew < ~(size_t)64, VERR_OUT_OF_RANGE);
-        char *pszZero = RTStrEnd(pszOld, cchNew + 63);
+        pszZero = RTStrEnd(pszOld, cchNew + 63);
         AssertReturn(!pszZero || (size_t)(pszZero - pszOld) >= cchNew, VERR_OUT_OF_RANGE);
         pszOld[cchNew] = '\0';
         if (!pszZero)
         {
-            char *pszNew = (char *)RTMemReallocTag(pszOld,  cchNew + 1, pszTag);
+            pszNew = (char *)RTMemReallocTag(pszOld,  cchNew + 1, pszTag);
             if (pszNew)
                 *ppsz = pszNew;