diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c index e3a12e324c5..c9da1e90e9e 100644 --- a/erts/emulator/beam/big.c +++ b/erts/emulator/beam/big.c @@ -1777,20 +1777,6 @@ erts_make_integer_fact(Uint x, ErtsHeapFactory *hf) return uint_to_big(x, hp); } } -/* - * As erts_make_integer, but from a whole UWord. - */ -Eterm -erts_make_integer_from_uword(UWord x, Process *p) -{ - Eterm* hp; - if (IS_USMALL(0,x)) - return make_small(x); - else { - hp = HAlloc(p, BIG_UWORD_HEAP_SIZE(x)); - return uword_to_big(x,hp); - } -} /* ** convert Uint to bigint diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h index b30f42f0cf3..ae2c9ba52c7 100644 --- a/erts/emulator/beam/big.h +++ b/erts/emulator/beam/big.h @@ -161,7 +161,6 @@ Eterm uint_to_big(Uint, Eterm*); Eterm uword_to_big(UWord, Eterm*); Eterm erts_make_integer(Uint, Process *); Eterm erts_make_integer_fact(Uint, ErtsHeapFactory *); -Eterm erts_make_integer_from_uword(UWord x, Process *p); dsize_t big_bytes(Eterm); Eterm bytes_to_big(const byte*, dsize_t, int, Eterm*); diff --git a/erts/emulator/beam/index.c b/erts/emulator/beam/index.c index a062a002909..b982afdf938 100644 --- a/erts/emulator/beam/index.c +++ b/erts/emulator/beam/index.c @@ -114,28 +114,6 @@ int index_get(IndexTable* t, void* tmpl) return -1; } -static void index_merge_foreach(IndexSlot *p, IndexTable *dst) -{ - Uint sz; - int ix = dst->entries++; - if (ix >= dst->size) { - if (ix >= dst->limit) { - erts_exit(ERTS_ERROR_EXIT, "no more index entries in %s (max=%d)\n", - dst->htable.name, dst->limit); - } - sz = INDEX_PAGE_SIZE*sizeof(IndexSlot*); - dst->seg_table[ix>>INDEX_PAGE_SHIFT] = erts_alloc(dst->type, sz); - dst->size += INDEX_PAGE_SIZE; - } - p->index = ix; - dst->seg_table[ix>>INDEX_PAGE_SHIFT][ix&INDEX_PAGE_MASK] = p; -} - -void erts_index_merge(Hash* src, IndexTable* dst) -{ - hash_foreach(src, (HFOREACH_FUN)index_merge_foreach, dst); -} - void index_erase_latest_from(IndexTable* t, Uint from_ix) { if(from_ix < (Uint)t->entries) { diff --git a/erts/emulator/beam/index.h b/erts/emulator/beam/index.h index 30bc6a11215..815135ceab4 100644 --- a/erts/emulator/beam/index.h +++ b/erts/emulator/beam/index.h @@ -57,7 +57,6 @@ int index_table_sz(IndexTable *); int index_get(IndexTable*, void*); IndexSlot* index_put_entry(IndexTable*, void*); -void erts_index_merge(Hash*, IndexTable*); /* Erase all entries with index 'ix' and higher */