diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
| commit | e63a8540a60e95aa5bd8e269add1b02afcc1b79b (patch) | |
| tree | b83a144eec24cc81adab0b9a778f7a730d8df79e /sapi/phpdbg/phpdbg_opcode.c | |
| parent | 7a4cc73641bb3eb878f7184bcbd026ee663cf2a9 (diff) | |
| parent | 53071e647049f099f7f7a0771ddb63fc2cdd621c (diff) | |
| download | php-git-e63a8540a60e95aa5bd8e269add1b02afcc1b79b.tar.gz | |
Merge branch 'openssl_error_store' into openssl_aead
Diffstat (limited to 'sapi/phpdbg/phpdbg_opcode.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_opcode.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index ccd7337e5c..44119c9e51 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -25,7 +25,7 @@ #include "phpdbg_utils.h" #include "ext/standard/php_string.h" -ZEND_EXTERN_MODULE_GLOBALS(phpdbg); +ZEND_EXTERN_MODULE_GLOBALS(phpdbg) static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ { @@ -74,7 +74,7 @@ char *phpdbg_decode_input_op( } else if (ZEND_VM_OP_NUM == (flags & ZEND_VM_OP_MASK)) { spprintf(&result, 0, "%" PRIu32, op.num); } else if (ZEND_VM_OP_TRY_CATCH == (flags & ZEND_VM_OP_MASK)) { - if (opline->opcode != ZEND_FAST_RET || opline->extended_value) { + if (op.num != (uint32_t)-1) { spprintf(&result, 0, "try-catch(%" PRIu32 ")", op.num); } } else if (ZEND_VM_OP_LIVE_RANGE == (flags & ZEND_VM_OP_MASK)) { @@ -99,21 +99,6 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *opline) /*{{{ */ uint32_t flags = zend_get_opcode_flags(opline->opcode); char *result, *decode[4] = {NULL, NULL, NULL, NULL}; - /* EX */ - switch (opline->opcode) { - case ZEND_FAST_CALL: - if (opline->extended_value == ZEND_FAST_CALL_FROM_FINALLY) { - decode[0] = estrdup("FAST_CALL<FROM_FINALLY>"); - } - break; - case ZEND_FAST_RET: - if (opline->extended_value != 0) { - spprintf(&decode[0], 0, "FAST_RET<%s>", - opline->extended_value == ZEND_FAST_RET_TO_CATCH ? "TO_CATCH" : "TO_FINALLY"); - } - break; - } - /* OP1 */ decode[1] = phpdbg_decode_input_op( ops, opline, opline->op1, opline->op1_type, ZEND_VM_OP1_FLAGS(flags)); |