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_db_util.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_db_util.c')
-rw-r--r-- | erts/emulator/beam/erl_db_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index 6732b708a8..4e987d5bee 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -1769,7 +1769,7 @@ Eterm db_prog_match(Process *c_p, Eterm t; Eterm *esp; MatchVariable* variables; - BeamInstr *cp; + ErtsCodeMFA *cp; const UWord *pc = prog->text; Eterm *ehp; Eterm ret; @@ -2408,9 +2408,9 @@ restart: ehp = HAllocX(build_proc, 4, HEAP_XTRA); *esp++ = make_tuple(ehp); ehp[0] = make_arityval(3); - ehp[1] = cp[0]; - ehp[2] = cp[1]; - ehp[3] = make_small((Uint) cp[2]); + ehp[1] = cp->module; + ehp[2] = cp->function; + ehp[3] = make_small((Uint) cp->arity); } break; case matchSilent: |