diff options
| author | Sverker Eriksson <[email protected]> | 2013-05-22 11:57:00 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-05-22 11:57:00 +0200 |
| commit | 640c5dda5c2cfcab7980beacc1d1e485df225e77 (patch) | |
| tree | 6a3d2801205def766e321833432508ebd899aa82 /erts/emulator/beam/erl_bestfit_alloc.c | |
| parent | b4c9c40d42d1923aa95e0c703b04a9a0c6d02666 (diff) | |
| parent | 01eb20066918e107811d01f43b97e3925f894dbd (diff) | |
| download | otp-640c5dda5c2cfcab7980beacc1d1e485df225e77.tar.gz otp-640c5dda5c2cfcab7980beacc1d1e485df225e77.tar.bz2 otp-640c5dda5c2cfcab7980beacc1d1e485df225e77.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_bestfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_bestfit_alloc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c index 5625622e3f..ed843a51fb 100644 --- a/erts/emulator/beam/erl_bestfit_alloc.c +++ b/erts/emulator/beam/erl_bestfit_alloc.c @@ -972,20 +972,20 @@ info_options(Allctr_t *allctr, * to erts_bfalc_test() * \* */ -unsigned long -erts_bfalc_test(unsigned long op, unsigned long a1, unsigned long a2) +UWord +erts_bfalc_test(UWord op, UWord a1, UWord a2) { switch (op) { - case 0x200: return (unsigned long) ((BFAllctr_t *) a1)->address_order; - case 0x201: return (unsigned long) ((BFAllctr_t *) a1)->mbc_root; - case 0x202: return (unsigned long) ((RBTree_t *) a1)->parent; - case 0x203: return (unsigned long) ((RBTree_t *) a1)->left; - case 0x204: return (unsigned long) ((RBTree_t *) a1)->right; - case 0x205: return (unsigned long) ((RBTreeList_t *) a1)->next; - case 0x206: return (unsigned long) IS_BLACK((RBTree_t *) a1); - case 0x207: return (unsigned long) IS_TREE_NODE((RBTree_t *) a1); - case 0x208: return (unsigned long) 0; /* IS_AOFF */ - default: ASSERT(0); return ~((unsigned long) 0); + case 0x200: return (UWord) ((BFAllctr_t *) a1)->address_order; + 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 0x206: return (UWord) IS_BLACK((RBTree_t *) a1); + case 0x207: return (UWord) IS_TREE_NODE((RBTree_t *) a1); + case 0x208: return (UWord) 0; /* IS_AOFF */ + default: ASSERT(0); return ~((UWord) 0); } } |