Cell: move ASSERT macro into common.h

diff --git a/src/mesa/pipe/cell/common.h b/src/mesa/pipe/cell/common.h
index f9edd0cc262dad461a1cd2d4ade3ed1aaa133ee6..e92529911919fe59aa2fc85cc90fa09eb2aa4170 100644 (file)
--- a/src/mesa/pipe/cell/common.h
+++ b/src/mesa/pipe/cell/common.h
@@ -38,6 +38,17 @@
 #include "pipe/p_format.h"
 
 
+/** The standard assert macro doesn't seem to work reliably */
+#define ASSERT(x) \
+   if (!(x)) { \
+      ubyte *p = NULL; \
+      fprintf(stderr, "%s:%d: %s(): assertion %s failed.\n", \
+              __FILE__, __LINE__, __FUNCTION__, #x);             \
+      *p = 0; \
+      exit(1); \
+   }
+
+
 /** for sanity checking */
 #define ASSERT_ALIGN16(ptr) \
    assert((((unsigned long) (ptr)) & 0xf) == 0);

diff --git a/src/mesa/pipe/cell/spu/spu_main.h b/src/mesa/pipe/cell/spu/spu_main.h
index e4359bf60d0a647fb9b45358e953db85722f8d14..5bc5d9fa99d6cdca919e25f84a094dee9d2dfe52 100644 (file)
--- a/src/mesa/pipe/cell/spu/spu_main.h
+++ b/src/mesa/pipe/cell/spu/spu_main.h
@@ -86,15 +86,6 @@ extern struct spu_global spu;
 #define TAG_MISC              18
 
 
-/** The standard assert macro doesn't seem to work on SPUs */
-#define ASSERT(x) \
-   if (!(x)) { \
-      fprintf(stderr, "SPU %d: %s:%d: %s(): assertion %s failed.\n", \
-              spu.init.id, __FILE__, __LINE__, __FUNCTION__, #x); \
-      exit(1); \
-   }
-
-
 extern void
 wait_on_mask(unsigned tag);