]> granicus.if.org Git - php/commitdiff
Fixed JMPZNZ instruction printing
authorDmitry Stogov <dmitry@zend.com>
Mon, 6 Jul 2015 13:30:50 +0000 (16:30 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 6 Jul 2015 13:30:50 +0000 (16:30 +0300)
sapi/phpdbg/phpdbg_opcode.c

index 8adbbba36ff1021a6c70d67869b6813a0fa531d2..fdfc0e9278c5561cadc3f2fb4f8ee890cf51c537 100644 (file)
@@ -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: