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

Timestamp:

Oct 13, 2006, 11:13:48 AM (20 years ago)

Author:

Paul Price

Message:

Synchronising with SDRS, and cleaning up:

• Replaced is_psType() with PS_ASSERT_PTR() throughout psLib.
• Changed "char *" to "psString" where appropriate in psDB and a few other places (to indicate pointers on the PS memory system).
• Removed psLogArguments and psTraceArguments (functionality in psArgumentVerbosity).
• Renamed psMetadataLookupMD to psMetadataLookupMetadata (it was about time...). Similarly with the psPolynomial?D{From,To}MD functions.
• Removed psMetadataRemove() since it is ambiguous about what's removed --- use psMetadataRemove{Key,Index}.
• psArrayRemoveByPos --> psArrayRemoveIndex
• psArrayRemove --> psArrayRemoveData

File:

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

trunk/psLib/src/sys/psAssert.h

@@ -6 +6 @@
 #include <math.h>
 
+#include "psMemory.h"
 #include "psError.h"
 #include "psLogMsg.h"
+
+// Ensure this is a psLib pointer, by checking for the memblock bounds.
+#define PS_ASSERT_PTR(NAME, RVAL) \
+{ \
+    psMemBlock *mb = (psMemBlock*)(NAME) - 1; \
+    if (mb->startblock != P_PS_MEMMAGIC || mb->endblock != P_PS_MEMMAGIC || \
+            *(psPtr *)((int8_t *) (mb + 1) + mb->userMemorySize) != P_PS_MEMMAGIC) { \
+        psError(PS_ERR_MEMORY_CORRUPTION, false, \
+                "Error: Pointer %s is corrupted or not on the PS memory system.", \
+                #NAME); \
+        return (RVAL); \
+    } \
+}
 
 #define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \