diff options
author | Björn-Egil Dahlberg <egil@erlang.org> | 2015-06-17 17:33:29 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <egil@erlang.org> | 2015-06-24 16:22:30 +0200 |
commit | 1c86a620d74f4f9383c4956dafd3e2486300dc0d (patch) | |
tree | dcd5c82bec090b26a58f89b9d00151fee595be02 /erts/emulator/beam/erl_db.c | |
parent | cb67108e19d02e41a3cffde0eabfce3614657f3f (diff) | |
download | otp-1c86a620d74f4f9383c4956dafd3e2486300dc0d.tar.gz otp-1c86a620d74f4f9383c4956dafd3e2486300dc0d.tar.bz2 otp-1c86a620d74f4f9383c4956dafd3e2486300dc0d.zip |
erts: Remove HALFWORD_HEAP definition
Diffstat (limited to 'erts/emulator/beam/erl_db.c')
-rw-r--r-- | erts/emulator/beam/erl_db.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 878ee32b47..f3da28b65a 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -1774,15 +1774,9 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1) * (it looks like an continuation pointer), but that is will crash the * emulator if this BIF is call traced. */ -#if HALFWORD_HEAP - Eterm *hp = HAlloc(BIF_P, 3); - hp[0] = make_pos_bignum_header(2); - *((UWord *) (UWord) (hp+1)) = (UWord) tb; -#else Eterm *hp = HAlloc(BIF_P, 2); hp[0] = make_pos_bignum_header(1); hp[1] = (Eterm) tb; -#endif BIF_TRAP1(&ets_delete_continue_exp, BIF_P, make_big(hp)); } else { @@ -3652,11 +3646,8 @@ static BIF_RETTYPE ets_delete_trap(BIF_ALIST_1) Eterm* ptr = big_val(cont); DbTable *tb = *((DbTable **) (UWord) (ptr + 1)); -#if HALFWORD_HEAP - ASSERT(*ptr == make_pos_bignum_header(2)); -#else ASSERT(*ptr == make_pos_bignum_header(1)); -#endif + db_lock(tb, LCK_WRITE); trap = free_table_cont(p, tb, 0, 1); db_unlock(tb, LCK_WRITE); |