diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-08-20 12:49:27 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-08-20 12:51:32 -0500 |
| commit | e9e3cf54c4fcc3f2cb4e01f2721b40bea7bb9117 (patch) | |
| tree | 5e0ace0e4608b24f48519e08434aa30ed084969d /includes | |
| parent | b4ec06789886ed5e21d50dc38cabc48cf9ad9cfb (diff) | |
| download | haskell-e9e3cf54c4fcc3f2cb4e01f2721b40bea7bb9117.tar.gz | |
[ci skip] includes: detabify/dewhitespace rts/storage/Block.h
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/storage/Block.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h index 29c081bba8..755c8177cf 100644 --- a/includes/rts/storage/Block.h +++ b/includes/rts/storage/Block.h @@ -146,7 +146,7 @@ typedef struct bdescr_ { /* Block is free, and on the free list (TODO: is this used?) */ #define BF_FREE 16 /* Block is executable */ -#define BF_EXEC 32 +#define BF_EXEC 32 /* Block contains only a small amount of live data */ #define BF_FRAGMENTED 64 /* we know about this block (for finding leaks) */ @@ -168,7 +168,7 @@ 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 & ~BLOCK_MASK) >> (BLOCK_SHIFT-BDESCR_SHIFT)) | ((W_)p & ~MBLOCK_MASK) ); } @@ -185,7 +185,7 @@ EXTERN_INLINE bdescr *Bdescr(StgPtr p) /* First data block in a given megablock */ #define FIRST_BLOCK(m) ((void *)(FIRST_BLOCK_OFF + (W_)(m))) - + /* Last data block in a given megablock */ #define LAST_BLOCK(m) ((void *)(MBLOCK_SIZE-BLOCK_SIZE + (W_)(m))) @@ -217,7 +217,7 @@ EXTERN_INLINE bdescr *Bdescr(StgPtr p) (1 + (W_)MBLOCK_ROUND_UP((n-BLOCKS_PER_MBLOCK) * BLOCK_SIZE) / MBLOCK_SIZE) -#ifndef CMINUSMINUS +#ifndef CMINUSMINUS /* to the end... */ /* Double-linked block lists: --------------------------------------------- */ |