SPARC NCG: Fix 64bit integers returned from ccalls

[ghc-hetmet.git] / rts / Sparks.h

diff --git a/rts/Sparks.h b/rts/Sparks.h
index 9696889..e2c60e9 100644 (file)
--- a/rts/Sparks.h
+++ b/rts/Sparks.h
@@ -51,17 +51,24 @@ typedef struct  SparkPool_ {
 } SparkPool;
 
 
-/* INVARIANTS, in this order: bottom/top consistent, reasonable size,
-   topBound consistent, space pointer, space accessible to us */
+/* INVARIANTS, in this order: reasonable size,
+   topBound consistent, space pointer, space accessible to us.
+   
+   NB. This is safe to use only (a) on a spark pool owned by the
+   current thread, or (b) when there's only one thread running, or no
+   stealing going on (e.g. during GC).
+*/
 #define ASSERT_SPARK_POOL_INVARIANTS(p)         \
-  ASSERT((p)->bottom >= (p)->top);              \
   ASSERT((p)->size > 0);                        \
-  ASSERT((p)->size > (p)->bottom - (p)->top);  \
   ASSERT((p)->topBound <= (p)->top);            \
   ASSERT((p)->elements != NULL);                \
   ASSERT(*((p)->elements) || 1);                \
   ASSERT(*((p)->elements - 1  + ((p)->size)) || 1);
 
+// No: it is possible that top > bottom when using reclaimSpark()
+//  ASSERT((p)->bottom >= (p)->top);           
+//  ASSERT((p)->size > (p)->bottom - (p)->top);
+
 // Initialisation
 void initSparkPools (void);
 
@@ -100,7 +107,8 @@ sparkPoolSize (SparkPool *pool)
 INLINE_HEADER void
 discardSparks (SparkPool *pool)
 {
-    pool->top = pool->topBound = pool->bottom = 0;
+    pool->top = pool->bottom;
+//    pool->topBound = pool->top;
 }
 
 #endif