diff options
| author | Lukas Larsson <[email protected]> | 2016-10-12 16:29:01 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-10-12 16:29:01 +0200 |
| commit | 885599a603fdf33f04125b6052f73d7c8e193d70 (patch) | |
| tree | 9b0fd2da5ab637fa9f228a4384021a3312bc5d2a /erts/emulator/beam/erl_process_dump.c | |
| parent | 83801d03ae4e3e157862eb51179c4c154795f976 (diff) | |
| parent | c283f299551d53b62027ae1a8b189285c57573e8 (diff) | |
| download | otp-885599a603fdf33f04125b6052f73d7c8e193d70.tar.gz otp-885599a603fdf33f04125b6052f73d7c8e193d70.tar.bz2 otp-885599a603fdf33f04125b6052f73d7c8e193d70.zip | |
Merge branch 'lukas/erts/beam_func_info_struct/OTP-13821'
* lukas/erts/beam_func_info_struct/OTP-13821:
erts: Fix some dtrace related compile issues
erts: Refactor rename Export.code[] to Export.beam[]
erts: Improve printouts for some etp commands
erts: Fix erts_debug:df with new func_info
erts: Refactor find_function_from_pc to return MFA
erts: Refactor out func_info into struct
Diffstat (limited to 'erts/emulator/beam/erl_process_dump.c')
| -rw-r--r-- | erts/emulator/beam/erl_process_dump.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c index a70dfb8e73..e7a311b430 100644 --- a/erts/emulator/beam/erl_process_dump.c +++ b/erts/emulator/beam/erl_process_dump.c @@ -334,8 +334,8 @@ stack_element_dump(int to, void *to_arg, Eterm* sp, int yreg) static void print_function_from_pc(int to, void *to_arg, BeamInstr* x) { - BeamInstr* addr = find_function_from_pc(x); - if (addr == NULL) { + ErtsCodeMFA* cmfa = find_function_from_pc(x); + if (cmfa == NULL) { if (x == beam_exit) { erts_print(to, to_arg, "<terminate process>"); } else if (x == beam_continue_exit) { @@ -347,7 +347,8 @@ print_function_from_pc(int to, void *to_arg, BeamInstr* x) } } else { erts_print(to, to_arg, "%T:%T/%bpu + %bpu", - addr[0], addr[1], addr[2], ((x-addr)-2) * sizeof(Eterm)); + cmfa->module, cmfa->function, cmfa->arity, + (x-(BeamInstr*)cmfa) * sizeof(Eterm)); } } |