diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-18 23:55:59 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-20 18:00:42 +0200 |
| commit | 1f9bba68a9d9fadbecf740404fe293f494b66516 (patch) | |
| tree | eb49866ba72b9363aeda55d2ae4104fd23d799f8 | |
| parent | e3cd0709dbc7aecdc9dbc2747942f76df4ca76b5 (diff) | |
| download | php-git-1f9bba68a9d9fadbecf740404fe293f494b66516.tar.gz | |
Make opcode breakpoints work again
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_opcode.c | 18 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_opcode.h | 1 |
3 files changed, 11 insertions, 12 deletions
diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index 48239ccac8..06c1e40b6f 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -928,9 +928,9 @@ static inline phpdbg_breakbase_t *phpdbg_find_breakpoint_opline(phpdbg_opline_pt static inline phpdbg_breakbase_t *phpdbg_find_breakpoint_opcode(zend_uchar opcode) /* {{{ */ { - const char *opname = phpdbg_decode_opcode(opcode); + const char *opname = zend_get_opcode_name(opcode); - if (memcmp(opname, PHPDBG_STRL("UNKNOWN")) == 0) { + if (!opname) { return NULL; } diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index 8a58a44f0b..75c91e0cf5 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -27,6 +27,15 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg); +static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ +{ + const char *ret = zend_get_opcode_name(opcode); + if (ret) { + return ret + 5; /* Skip ZEND_ prefix */ + } + return "UNKNOWN"; +} /* }}} */ + static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t type) /* {{{ */ { char *decode = NULL; @@ -204,12 +213,3 @@ void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags { phpdbg_print_opline_ex(execute_data, ignore_flags); } /* }}} */ - -const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ -{ - const char *ret = zend_get_opcode_name(opcode); - if (ret) { - return ret + 5; /* Skip ZEND_ prefix */ - } - return "UNKNOWN"; -} /* }}} */ diff --git a/sapi/phpdbg/phpdbg_opcode.h b/sapi/phpdbg/phpdbg_opcode.h index ab7e9e261d..34c9c37e50 100644 --- a/sapi/phpdbg/phpdbg_opcode.h +++ b/sapi/phpdbg/phpdbg_opcode.h @@ -23,7 +23,6 @@ #include "zend_types.h" -const char *phpdbg_decode_opcode(zend_uchar); char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op); void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags); void phpdbg_print_opline_ex(zend_execute_data *execute_data, zend_bool ignore_flags); |