diff options
| author | Björn Gustavsson <[email protected]> | 2011-08-05 10:46:40 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-05 10:46:40 +0200 |
| commit | 302b2a1bf0194ca81c7731699b75e4800f718955 (patch) | |
| tree | 46b45bcefe605bdee0ee3788f9be688fc210214c /erts/emulator/beam/erl_bits.h | |
| parent | e995a244d830b688c2cb49ec0fda3653e41bb1c8 (diff) | |
| parent | 44a70b59a1903265a33ccefa3846e10b3f86eb5d (diff) | |
| download | otp-302b2a1bf0194ca81c7731699b75e4800f718955.tar.gz otp-302b2a1bf0194ca81c7731699b75e4800f718955.tar.bz2 otp-302b2a1bf0194ca81c7731699b75e4800f718955.zip | |
Merge branch 'dev' into major
* dev:
Fix binary construction with huge literal sizes
beam_load.c: Add overflow check of tag values
beam_makeops: Add some sanity checks
Fix construction of <<0:((1 bsl 32)-1)>>
Diffstat (limited to 'erts/emulator/beam/erl_bits.h')
| -rw-r--r-- | erts/emulator/beam/erl_bits.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bits.h b/erts/emulator/beam/erl_bits.h index 0f67733fa4..3309ea706b 100644 --- a/erts/emulator/beam/erl_bits.h +++ b/erts/emulator/beam/erl_bits.h @@ -150,7 +150,7 @@ void erts_bits_destroy_state(ERL_BITS_PROTO_0); * NBYTES(x) returns the number of bytes needed to store x bits. */ -#define NBYTES(x) (((x) + 7) >> 3) +#define NBYTES(x) (((Uint64)(x) + (Uint64) 7) >> 3) #define BYTE_OFFSET(ofs) ((Uint) (ofs) >> 3) #define BIT_OFFSET(ofs) ((ofs) & 7) |