diff options
author | krakjoe <joe.watkins@live.co.uk> | 2014-04-13 08:06:42 +0100 |
---|---|---|
committer | krakjoe <joe.watkins@live.co.uk> | 2014-04-13 08:06:42 +0100 |
commit | ef86b57f3b6745d5215e1316512c108f46df8668 (patch) | |
tree | 5a7c8cf1061c0977ae1c99bce2bc49437d24319c /phpdbg_opcode.c | |
parent | 2fde2ada50a00512490511349389d08ede9822f8 (diff) | |
parent | 3db29ee43960a4e164244a55b0e2a4b23a112e49 (diff) | |
download | php-git-ef86b57f3b6745d5215e1316512c108f46df8668.tar.gz |
Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer
Conflicts:
phpdbg_prompt.c
Diffstat (limited to 'phpdbg_opcode.c')
-rw-r--r-- | phpdbg_opcode.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c index 50073eb22b..6b13625fc1 100644 --- a/phpdbg_opcode.c +++ b/phpdbg_opcode.c @@ -183,6 +183,7 @@ void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ { +#if ZEND_EXTENSION_API_NO <= PHP_5_5_API_NO #define CASE(s) case s: return #s switch (opcode) { CASE(ZEND_NOP); @@ -360,4 +361,8 @@ const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ default: return "UNKNOWN"; } +#else + const char *ret = zend_get_opcode_name(opcode); + return ret?ret:"UNKNOWN"; +#endif } /* }}} */ |