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

Timestamp:

Oct 15, 2008 10:46:08 PM (16 years ago)

Author:

vboxsync

Message:

Created assert-r0drv-linux.c (finally).

Location:

trunk/src/VBox/HostDrivers/Support/linux

Files:

• Makefile (modified) (4 diffs)
• SUPDrv-linux.c (modified) (1 diff)
• files_vboxdrv (modified) (1 diff)

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

@@ -77 +77 @@
         r0drv/memobj-r0drv.o \
         r0drv/mpnotification-r0drv.o \
+        r0drv/linux/assert-r0drv-linux.o \
         r0drv/linux/alloc-r0drv-linux.o \
         r0drv/linux/initterm-r0drv-linux.o \
@@ -91 +92 @@
         r0drv/linux/timer-r0drv-linux.o \
         common/err/RTErrConvertFromErrno.o \
-        generic/RTAssertShouldPanic-generic.o
-ifeq ($(BUILD_TARGET_ARCH),x86)
-OBJS += math/gcc/divdi3.o \
-        math/gcc/moddi3.o \
-        math/gcc/qdivrem.o \
-        math/gcc/udivdi3.o
-endif
-ifeq ($(BUILD_TARGET_ARCH),amd64)
-OBJS += alloc/heapsimple.o
-endif
-
-ifeq ($(BUILD_TYPE),debug)
-OBJS += common/log/log.o \
+        common/log/log.o \
         common/log/logellipsis.o \
         common/log/logrel.o \
@@ -115 +104 @@
         common/string/strtonum.o \
         r0drv/linux/RTLogWriteDebugger-r0drv-linux.o \
+        generic/RTAssertShouldPanic-generic.o \
         generic/RTLogWriteStdErr-stub-generic.o \
         generic/RTLogWriteStdOut-stub-generic.o \
@@ -122 +112 @@
 ifeq ($(BUILD_TARGET_ARCH),x86)
 OBJS += math/gcc/divdi3.o \
+        math/gcc/moddi3.o \
+        math/gcc/qdivrem.o \
+        math/gcc/udivdi3.o \
+        math/gcc/divdi3.o \
         math/gcc/umoddi3.o
 endif
-endif # debug
+ifeq ($(BUILD_TARGET_ARCH),amd64)
+OBJS += alloc/heapsimple.o
+endif
 
 ifneq ($(MAKECMDGOALS),clean)

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

@@ -944 +944 @@
 }
 
-
-/** @todo move to IPRT! */
-RTDECL(void) AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
-{
-    printk("!!Assertion Failed!!\n"
-             "Expression: %s\n"
-             "Location  : %s(%d) %s\n",
-             pszExpr, pszFile, uLine, pszFunction);
-}
-
-
-/** @todo move to IPRT! */
-RTDECL(void) AssertMsg2(const char *pszFormat, ...)
-{   /* forwarder. */
-    va_list ap;
-    char    msg[256];
-
-    va_start(ap, pszFormat);
-    vsnprintf(msg, sizeof(msg) - 1, pszFormat, ap);
-    msg[sizeof(msg) - 1] = '\0';
-    printk("%s", msg);
-    va_end(ap);
-}
-
-
-/* GCC C++ hack. (shouldn't be necessary with the right exception flags...) */
-unsigned __gxx_personality_v0 = 0xcccccccc;
-
-
 module_init(VBoxDrvLinuxInit);
 module_exit(VBoxDrvLinuxUnload);

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

@@ -99 +99 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/mpnotification-r0drv.c=>r0drv/mpnotification-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c=>r0drv/linux/RTLogWriteDebugger-r0drv-linux.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c=>r0drv/linux/assert-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c=>r0drv/linux/initterm-r0drv-linux.c \