diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-14 18:39:14 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-14 18:39:14 +0000 |
| commit | b9ad0002f5fc40f5808f85119a67012c2e9a4141 (patch) | |
| tree | 5dc09ca330b2358670215ff9cdbf6f3bfdcbd6e4 /sapi/phpdbg/phpdbg_opcode.c | |
| parent | 0bfa245aa3f3994d3095afd696bbd3f0130594ab (diff) | |
| parent | 855d2966385755435b65d77e1c0dfda17555eab9 (diff) | |
| download | php-git-b9ad0002f5fc40f5808f85119a67012c2e9a4141.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'sapi/phpdbg/phpdbg_opcode.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_opcode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index 99f43344a4..20841cbc42 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -64,7 +64,7 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t } break; case IS_CONST: - asprintf(&decode, "C%u", phpdbg_decode_literal(ops, op->zv TSRMLS_CC)); + asprintf(&decode, "C%u", phpdbg_decode_literal(ops, RT_CONSTANT(ops, *op) TSRMLS_CC)); break; case IS_UNUSED: @@ -86,7 +86,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM #ifdef ZEND_FAST_CALL case ZEND_FAST_CALL: #endif - asprintf(&decode[1], "J%ld", op->op1.jmp_addr - ops->opcodes); + asprintf(&decode[1], "J%ld", OP_JMP_ADDR(op, op->op1) - ops->opcodes); goto format; case ZEND_JMPZNZ: @@ -103,7 +103,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM case ZEND_JMP_SET: #endif decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC); - asprintf(&decode[2], "J%ld", op->op2.jmp_addr - ops->opcodes); + asprintf(&decode[2], "J%ld", OP_JMP_ADDR(op, op->op2) - ops->opcodes); goto result; case ZEND_RECV_INIT: |