diff options
| author | Sverker Eriksson <[email protected]> | 2013-06-20 15:17:46 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-06-20 15:17:46 +0200 |
| commit | 534f6c34f9f133d462b4e463b356be7f2188dc0a (patch) | |
| tree | b8f545fe6460cc7a07801ea2964299d105b91b37 /erts/emulator/beam/erl_bestfit_alloc.c | |
| parent | 2b2646d97a0f2248d7ec1be81fb88488cfec9a56 (diff) | |
| parent | 6898b6285f443e9ad8d01ce17b08bb7991c6ea5f (diff) | |
| download | otp-534f6c34f9f133d462b4e463b356be7f2188dc0a.tar.gz otp-534f6c34f9f133d462b4e463b356be7f2188dc0a.tar.bz2 otp-534f6c34f9f133d462b4e463b356be7f2188dc0a.zip | |
Merge branch 'maint'
Conflicts:
erts/vsn.mk
lib/kernel/vsn.mk
lib/stdlib/vsn.mk
Diffstat (limited to 'erts/emulator/beam/erl_bestfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_bestfit_alloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c index 58e53c3d00..41f449bb28 100644 --- a/erts/emulator/beam/erl_bestfit_alloc.c +++ b/erts/emulator/beam/erl_bestfit_alloc.c @@ -966,15 +966,17 @@ UWord erts_bfalc_test(UWord op, UWord a1, UWord a2) { switch (op) { - case 0x200: return (UWord) ((BFAllctr_t *) a1)->address_order; + case 0x200: return (UWord) ((BFAllctr_t *) a1)->address_order; /* IS_AOBF */ case 0x201: return (UWord) ((BFAllctr_t *) a1)->mbc_root; case 0x202: return (UWord) ((RBTree_t *) a1)->parent; case 0x203: return (UWord) ((RBTree_t *) a1)->left; case 0x204: return (UWord) ((RBTree_t *) a1)->right; - case 0x205: return (UWord) ((RBTreeList_t *) a1)->next; + case 0x205: return (UWord) LIST_NEXT(a1); case 0x206: return (UWord) IS_BLACK((RBTree_t *) a1); case 0x207: return (UWord) IS_TREE_NODE((RBTree_t *) a1); case 0x208: return (UWord) 1; /* IS_BF_ALGO */ + case 0x20a: return (UWord) !((BFAllctr_t *) a1)->address_order; /* IS_BF */ + case 0x20b: return (UWord) LIST_PREV(a1); default: ASSERT(0); return ~((UWord) 0); } } |