diff options
| author | Anatol Belski <ab@php.net> | 2014-12-12 14:25:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-12 14:25:59 +0100 |
| commit | dfb18b1188492efa48ade07029172c5535f65f93 (patch) | |
| tree | 5da6d50a4918a06299162a22aa5cb98e5c76a26a /sapi/phpdbg/phpdbg_opcode.c | |
| parent | de99a94c384fdb6a71c20692df33dc24a2b81a4b (diff) | |
| parent | f4311686cc2c7d07abce2b752b4e8597771c5b25 (diff) | |
| download | php-git-dfb18b1188492efa48ade07029172c5535f65f93.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
updated NEWS
PowerPC64 support for add and sub with overflow check
PowerPC64 support for operators with overflow check
Fixed bug #68583 Crash in timeout thread
Reduced size of zend_op on 64-bit systems.
Make ZEND_INIT_FCALL keep predcalculted size of necessary stack space in opline->op1.num to avoid its recalculation on each execution.
Removed unused variables
Improved array_merge() and array_replace() (1-st array may be added using simple procedure).
Replaced zendi_convert_to_long() with _zval_get_long_func()
Moved zend_is_true() from zend_execute.h/zend_execute_API.c into zend_operators.h/zend_operators.c. Splited the most expensive part of inline i_zend_is_true() into a separate zend_object_is_true(). Replaced zendi_convert_to_long() with cals to zend_is_true().
Revert "Save one xor instr"
Save one xor instr
Conflicts:
Zend/zend_execute_API.c
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: |