Changeset 14676 for trunk/psLib/src/sys/psAssert.h

Timestamp:

Aug 27, 2007, 1:14:35 PM (19 years ago)

Author:

jhoblitt

Message:

add psMemIsAlloced()

File:

• trunk/psLib/src/sys/psAssert.h (modified) (1 diff)

trunk/psLib/src/sys/psAssert.h

@@ -20 +20 @@
 }
 
-// Ensure this is a psLib pointer, by checking for the memblock bounds.
-#define PS_ASSERT_PTR(NAME, RVAL) \
+// Ensure this is a psLib pointer
+#define PS_ASSERT_PTR(PTR, RVAL) \
 { \
-    if (NAME == NULL) return(RVAL); \
-    psMemBlock *mb = (psMemBlock*)(NAME) - 1; \
-    if (mb->startblock != P_PS_MEMMAGIC || mb->endblock != P_PS_MEMMAGIC || \
-            *(psU32 *)((char *)(mb + 1) + mb->userMemorySize) != P_PS_MEMMAGIC) { \
+    if (PTR == NULL) return RVAL; \
+    if (!psMemIsAlloced(PTR)) { \
         psError(PS_ERR_MEMORY_CORRUPTION, false, \
-                "Error: Pointer %s is corrupted or not on the PS memory system.", \
-                #NAME); \
-        return (RVAL); \
+            "Error: Pointer %p is corrupted or not on the PS memory system.", \
+            PTR); \
+        return RVAL; \
     } \
 }