diff options
| author | John Högberg <[email protected]> | 2019-04-30 09:11:39 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-04-30 09:11:39 +0200 |
| commit | 62a01f1544ad542c880982129e411ea223464e09 (patch) | |
| tree | 09d16ec95fd7e5d4012627cd88d8a1238b243296 | |
| parent | 997d03c62fbd5f387c4ddbf47b89ba397765480a (diff) | |
| parent | f9b6d841c2fbc3af5496569baefb9017555c29a8 (diff) | |
| download | otp-62a01f1544ad542c880982129e411ea223464e09.tar.gz otp-62a01f1544ad542c880982129e411ea223464e09.tar.bz2 otp-62a01f1544ad542c880982129e411ea223464e09.zip | |
Merge branch 'john/erts/alloc-header-packing-win64'
* john/erts/alloc-header-packing-win64:
erts_alloc: Fix header packing on Win64
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index b34916271e..b46b311c59 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -336,7 +336,9 @@ void erts_alcu_sched_spec_data_init(struct ErtsSchedulerData_ *esdp); #if MBC_ABLK_OFFSET_BITS /* The shift is reduced by 1 since the highest bit is used for a flag. */ # define MBC_ABLK_OFFSET_SHIFT (sizeof(UWord)*8 - 1 - MBC_ABLK_OFFSET_BITS) -# define MBC_ABLK_OFFSET_MASK (((1ul << MBC_ABLK_OFFSET_BITS) - 1ul) << MBC_ABLK_OFFSET_SHIFT) +# define MBC_ABLK_OFFSET_MASK \ + (((UWORD_CONSTANT(1) << MBC_ABLK_OFFSET_BITS) - UWORD_CONSTANT(1)) \ + << MBC_ABLK_OFFSET_SHIFT) # define MBC_ABLK_SZ_MASK (~MBC_ABLK_OFFSET_MASK & ~BLK_FLG_MASK) #else # define MBC_ABLK_SZ_MASK (~BLK_FLG_MASK) |