diff options
| author | Sverker Eriksson <[email protected]> | 2012-02-23 14:54:58 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-02-23 14:54:58 +0100 |
| commit | 738c6d54dde1e4c8f6030690eabe50a287301eb9 (patch) | |
| tree | 61f725e364cd65b8c16204b83536e8ccb3af56ff /erts/emulator/beam | |
| parent | 225da20b097ad73291cf48ba2782c64762163a46 (diff) | |
| parent | 99c0207298251d5557335864f15547ca07a7b050 (diff) | |
| download | otp-738c6d54dde1e4c8f6030690eabe50a287301eb9.tar.gz otp-738c6d54dde1e4c8f6030690eabe50a287301eb9.tar.bz2 otp-738c6d54dde1e4c8f6030690eabe50a287301eb9.zip | |
Merge branch 'sverk/hipe-debug-cherries'
* sverk/hipe-debug-cherries:
hipe,erts: Add DEBUG support with MFA's in stack descriptors
hipe: Fix address_to_mfa in hipe loader
hipe,erts: Debug support for native call trace
erts: Make erts_printf accept internal match states
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_printf_term.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c index 34da9cab84..2320b64295 100644 --- a/erts/emulator/beam/erl_printf_term.c +++ b/erts/emulator/beam/erl_printf_term.c @@ -437,7 +437,10 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount, } break; case BINARY_DEF: - { + if (header_is_bin_matchstate(*boxed_val(wobj))) { + PRINT_STRING(res, fn, arg, "#MatchState"); + } + else { ProcBin* pb = (ProcBin *) binary_val(wobj); if (pb->size == 1) PRINT_STRING(res, fn, arg, "<<1 byte>>"); |