diff options
| author | Erlang/OTP <[email protected]> | 2015-09-07 17:49:18 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-09-07 17:49:18 +0200 |
| commit | 5794d3d4bf28a33be1e6c802d709c305f23773c0 (patch) | |
| tree | 1c068d838c7f4d48a216fc9de93afec64328215d /erts/emulator/beam/utils.c | |
| parent | a5d9e2b280ed25194d3391d6de975d328bf65a9c (diff) | |
| parent | 0c52e3c18da16dbb896871865b71093b8c5617c4 (diff) | |
| download | otp-5794d3d4bf28a33be1e6c802d709c305f23773c0.tar.gz otp-5794d3d4bf28a33be1e6c802d709c305f23773c0.tar.bz2 otp-5794d3d4bf28a33be1e6c802d709c305f23773c0.zip | |
Merge branch 'sverk/trace-process_dump-matchstate-17/OTP-12968' into maint-17
* sverk/trace-process_dump-matchstate-17/OTP-12968:
erts: Add testcase for tracing whith 'process_dump'
erts: Fix bug when tracing with 'process_dump'
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index f810fca9a4..a8bbdb9354 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -788,11 +788,10 @@ Uint32 make_hash(Eterm term_arg) Eterm hash = 0; unsigned op; - /* Must not collide with the real tag_val_def's: */ -#define MAKE_HASH_TUPLE_OP 0x11 -#define MAKE_HASH_TERM_ARRAY_OP 0x12 -#define MAKE_HASH_CDR_PRE_OP 0x13 -#define MAKE_HASH_CDR_POST_OP 0x14 +#define MAKE_HASH_TUPLE_OP (FIRST_VACANT_TAG_DEF) +#define MAKE_HASH_TERM_ARRAY_OP (FIRST_VACANT_TAG_DEF+1) +#define MAKE_HASH_CDR_PRE_OP (FIRST_VACANT_TAG_DEF+2) +#define MAKE_HASH_CDR_POST_OP (FIRST_VACANT_TAG_DEF+3) /* ** Convenience macro for calculating a bytewise hash on an unsigned 32 bit |