Bdescr

ghc-toolkit/ghc-libdir/include/rts/storage/Block.h

@@ -34,8 +34,13 @@
 #define BLOCK_SIZE_W (BLOCK_SIZE/sizeof(W_))
 #define BLOCK_MASK   (BLOCK_SIZE-1)
 
+#if defined(CMINUSMINUS)
+#define BLOCK_ROUND_UP(p)   ((p + BLOCK_SIZE - 1) & ~BLOCK_MASK)
+#define BLOCK_ROUND_DOWN(p) ((p & ~BLOCK_MASK))
+#else
 #define BLOCK_ROUND_UP(p)   (((W_)(p)+BLOCK_SIZE-1) & ~BLOCK_MASK)
 #define BLOCK_ROUND_DOWN(p) ((void *) ((W_)(p) & ~BLOCK_MASK))
+#endif
 
 /* Megablock related constants (MBLOCK_SHIFT is defined in Constants.h) */
 
@@ -156,33 +161,17 @@ typedef struct bdescr_ {
 /* Maximum flag value (do not define anything higher than this!) */
 #define BF_FLAG_MAX  (1 << 15)
 
-/* Finding the block descriptor for a given block -------------------------- */
-
-#if defined(CMINUSMINUS)
-
-#define Bdescr(p) \
-    ((((p) &  MBLOCK_MASK & ~BLOCK_MASK) >> (BLOCK_SHIFT-BDESCR_SHIFT)) \
-     | ((p) & ~MBLOCK_MASK))
-
-#else
-
-EXTERN_INLINE bdescr *Bdescr(StgPtr p);
-EXTERN_INLINE bdescr *Bdescr(StgPtr p)
-{
-  return (bdescr *)
-    ((((W_)p &  MBLOCK_MASK & ~BLOCK_MASK) >> (BLOCK_SHIFT-BDESCR_SHIFT))
-     | ((W_)p & ~MBLOCK_MASK)
-     );
-}
-
-#endif
-
 /* Useful Macros ------------------------------------------------------------ */
 
 /* Offset of first real data block in a megablock */
 
+#if defined(CMINUSMINUS)
+#define FIRST_BLOCK_OFF \
+   (BLOCK_ROUND_UP(BDESCR_SIZE * (MBLOCK_SIZE / BLOCK_SIZE)))
+#else
 #define FIRST_BLOCK_OFF \
    ((W_)BLOCK_ROUND_UP(BDESCR_SIZE * (MBLOCK_SIZE / BLOCK_SIZE)))
+#endif
 
 /* First data block in a given megablock */
 
@@ -194,8 +183,13 @@ EXTERN_INLINE bdescr *Bdescr(StgPtr p)
 
 /* First real block descriptor in a megablock */
 
+#if defined(CMINUSMINUS)
+#define FIRST_BDESCR(m) \
+   ((FIRST_BLOCK_OFF>>(BLOCK_SHIFT-BDESCR_SHIFT)) + m)
+#else
 #define FIRST_BDESCR(m) \
    ((bdescr *)((FIRST_BLOCK_OFF>>(BLOCK_SHIFT-BDESCR_SHIFT)) + (W_)(m)))
+#endif
 
 /* Last real block descriptor in a megablock */
 
@@ -218,6 +212,19 @@ EXTERN_INLINE bdescr *Bdescr(StgPtr p)
 #define BLOCKS_TO_MBLOCKS(n) \
    (1 + (W_)MBLOCK_ROUND_UP((n-BLOCKS_PER_MBLOCK) * BLOCK_SIZE) / MBLOCK_SIZE)
 
+/* Finding the block descriptor for a given block -------------------------- */
+
+#if defined(CMINUSMINUS)
+
+// Redefined
+#define Bdescr(p) \
+    ((p & ~MBLOCK_MASK) + FIRST_BDESCR(0))
+
+#else
+
+EXTERN_INLINE bdescr *Bdescr(StgPtr p);
+
+#endif
 
 #if !defined(CMINUSMINUS)
 /* to the end... */