Changeset 8563 in vbox for trunk/include

Timestamp:

May 5, 2008 11:48:05 AM (17 years ago)

Author:

vboxsync

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

30478

Message:

VALID_PHYS32_PTR -> VALID_PHYS32. Fixed AssertGCPhys32 string. Moved the assertion function to the top of the file to help compiler caches.

Location:

trunk/include/iprt

Files:

• assert.h (modified) (2 diffs)
• cdefs.h (modified) (1 diff)

trunk/include/iprt/assert.h

@@ -76 +76 @@
  * @{
  */
+
+__BEGIN_DECLS
+
+/**
+ * The 1st part of an assert message.
+ *
+ * @param   pszExpr     Expression. Can be NULL.
+ * @param   uLine       Location line number.
+ * @param   pszFile     Location file name.
+ * @param   pszFunction Location function name.
+ * @remark  This API exists in HC Ring-3 and GC.
+ */
+RTDECL(void)    AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction);
+
+/**
+ * The 2nd (optional) part of an assert message.
+ * @param   pszFormat   Printf like format string.
+ * @param   ...         Arguments to that string.
+ * @remark  This API exists in HC Ring-3 and GC.
+ */
+RTDECL(void)    AssertMsg2(const char *pszFormat, ...);
+
+/**
+ * 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. */
+extern RTDATADECL(char) g_szRTAssertMsg1[1024];
+/** The last assert message, 2nd part. */
+extern RTDATADECL(char) g_szRTAssertMsg2[2048];
+
+__END_DECLS
 
 
@@ -1948 +1986 @@
  * Asserts that the high dword of a physical address is zero
  *
- * @param   pv      The pointer.
- */
-#define AssertGCPhys32(pv)          AssertMsg(VALID_PHYS32_PTR(pv), ("%p\n", (pv)))
-
-__BEGIN_DECLS
-
-/**
- * The 1st part of an assert message.
- *
- * @param   pszExpr     Expression. Can be NULL.
- * @param   uLine       Location line number.
- * @param   pszFile     Location file name.
- * @param   pszFunction Location function name.
- * @remark  This API exists in HC Ring-3 and GC.
- */
-RTDECL(void)    AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction);
-
-/**
- * The 2nd (optional) part of an assert message.
- * @param   pszFormat   Printf like format string.
- * @param   ...         Arguments to that string.
- * @remark  This API exists in HC Ring-3 and GC.
- */
-RTDECL(void)    AssertMsg2(const char *pszFormat, ...);
-
-/**
- * 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. */
-extern RTDATADECL(char) g_szRTAssertMsg1[1024];
-/** The last assert message, 2nd part. */
-extern RTDATADECL(char) g_szRTAssertMsg2[2048];
-
-__END_DECLS
+ * @param   GCPhys      The address (RTGCPHYS).
+ */
+#define AssertGCPhys32(GCPhys)      AssertMsg(VALID_PHYS32(GCPhys), ("%RGp\n", (RTGCPHYS)(GCPhys)))
+
 
 /** @} */

trunk/include/iprt/cdefs.h

@@ -1207 +1207 @@
 
 
-/** @def VALID_PHYS32_PTR
+/** @def VALID_PHYS32
  * 32 bits physical address validation macro.
- * @param   ptr
- */
-#define VALID_PHYS32_PTR(ptr)     ( (RTGCPHYS64)(ptr) < _4G )
+ * @param   Phys          The RTGCPHYS address.
+ */
+#define VALID_PHYS32(Phys)  ( (uint64_t)(Phys) < (uint64_t)_4G )
 
 /** @def N_