diff options
| author | Sverker Eriksson <[email protected]> | 2011-04-27 17:14:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-04-27 17:14:35 +0200 |
| commit | 574de87663ecee7043df1783e7c3b830193b0399 (patch) | |
| tree | 8351d2af0973274534168f5442c0900bce0703f8 /erts/emulator/beam/erl_db.c | |
| parent | ef407fad10bccb97aab140f5b99786b8c7b2237a (diff) | |
| parent | 261a3e9b465a1d9cbd0361c5d3801bf63950e623 (diff) | |
| download | otp-574de87663ecee7043df1783e7c3b830193b0399.tar.gz otp-574de87663ecee7043df1783e7c3b830193b0399.tar.bz2 otp-574de87663ecee7043df1783e7c3b830193b0399.zip | |
Merge branch 'sverker/erts_printf-halfword' into dev
* sverker/erts_printf-halfword:
erts_printf %be to print integers of size Eterm
Fix use of type BeamInstr in hipe_debug.c
Conflicts:
erts/emulator/hipe/hipe_debug.c
Diffstat (limited to 'erts/emulator/beam/erl_db.c')
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 61e8a595be..e0a6aa05c6 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -3737,7 +3737,7 @@ static void print_table(int to, void *to_arg, int show, DbTable* tb) erts_print(to, to_arg, "Objects: %d\n", (int)erts_smp_atomic_read(&tb->common.nitems)); erts_print(to, to_arg, "Words: %bpu\n", - (Uint) ((erts_smp_atomic_read(&tb->common.memory_size) + (UWord) ((erts_smp_atomic_read(&tb->common.memory_size) + sizeof(Uint) - 1) / sizeof(Uint))); |