Changeset 4979 in vbox for trunk/include/iprt/assert.h

Timestamp:

Sep 22, 2007 12:04:09 AM (18 years ago)

Author:

vboxsync

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

24745

Message:

New ring-0 assertion avoidance, now for all platforms.

File:

• trunk/include/iprt/assert.h (modified) (3 diffs)

trunk/include/iprt/assert.h

@@ -109 +109 @@
 #  define AssertCompileMemberAlignment(type, member, align) \
     AssertCompile(!(RT_OFFSETOF(type, member) & ((align) - 1)))
-# endif 
+# endif
 #else
 # define AssertCompileMemberAlignment(type, member, align) \
     AssertCompile(!(RT_OFFSETOF(type, member) & ((align) - 1)))
-#endif 
+#endif
 
 
@@ -491 +491 @@
 #ifdef __GNUC__
 # ifndef __L4ENV__
-#  define AssertReleaseBreakpoint()   do { __asm__ __volatile__ ("int3\n\tnop"); } while (0)
+#  define AssertReleaseBreakpoint()     do { RTAssertDoBreakpoint(); __asm__ __volatile__ ("int3\n\tnop"); } while (0)
 # else
-#  define AssertReleaseBreakpoint()   do { __asm__ __volatile__ ("int3; jmp 1f; 1:"); } while (0)
+#  define AssertReleaseBreakpoint()     do { RTAssertDoBreakpoint(); __asm__ __volatile__ ("int3; jmp 1f; 1:"); } while (0)
 # endif
 #elif defined(_MSC_VER)
-# define AssertReleaseBreakpoint()      __debugbreak()
+# define AssertReleaseBreakpoint()      do { RTAssertDoBreakpoint(); __debugbreak(); } while (0)
 #else
 # error "Unknown compiler"
@@ -1174 +1174 @@
 
 /**
- * Overridable function that decides whether assertions executes the breakpoint or not. 
- * 
+ * Overridable function that decides whether assertions executes the breakpoint or not.
+ *
  * The generic implementation will return true.
- * 
+ *
  * @returns true if the breakpoint should be hit, false if it should be ignored.
  * @remark  The RTDECL() makes this a bit difficult to override on windows. Sorry.
  */
 RTDECL(bool)    RTAssertDoBreakpoint(void);
-
 
 /** The last assert message, 1st part. */