com php-src: Fixed JMPZNZ instruction printing: sapi/phpdbg/php dbg_opcode.c
| From: | Dmitry Stogov | Date: | Mon, 06 Jul 2015 13:30:50 +0000 |
| Subject: | com php-src: Fixed JMPZNZ instruction printing: sapi/phpdbg/php dbg_opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87763@lists.php.net to get a copy of this message | ||
Commit: 1a9f4f90da8fc6e91a1ac38addfa68556de89d4e
Author: Dmitry Stogov <dmitry@zend.com> Mon, 6 Jul 2015 16:30:50 +0300
Parents: da6e286dbbdc067c5583cd9a29bafc6457d640cc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a9f4f90da8fc6e91a1ac38addfa68556de89d4e
Log:
Fixed JMPZNZ instruction printing
Changed paths:
M sapi/phpdbg/phpdbg_opcode.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
index 8adbbba..fdfc0e9 100644
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@ -87,7 +87,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{
switch (op->opcode) {
/* TODO: ZEND_FAST_CALL, ZEND_FAST_RET op2 */
case ZEND_JMPZNZ:
- asprintf(&decode[2], "J%u or J%" PRIu32, op->op2.opline_num,
op->extended_value);
+ asprintf(&decode[2], "J%u or J%" PRIu32, OP_JMP_ADDR(op, op->op2) -
ops->opcodes, ZEND_OFFSET_TO_OPLINE(op, op->extended_value) - ops->opcodes);
break;
case ZEND_JMPZ: