From 5f10e84208c259a55db96789e9cbdf7e6af596a2 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Mon, 20 Apr 2015 20:58:52 +0200 Subject: Shrink phpdbg opcode dump output a bit more --- sapi/phpdbg/phpdbg_opcode.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'sapi/phpdbg/phpdbg_opcode.c') diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index 9622fd661b..654bd6288f 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -27,28 +27,15 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg); -static inline uint32_t phpdbg_decode_literal(zend_op_array *ops, zval *literal) /* {{{ */ -{ - int iter = 0; - - while (iter < ops->last_literal) { - if (literal == &ops->literals[iter]) { - return iter; - } - iter++; - } - - return 0; -} /* }}} */ - static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t type, HashTable *vars) /* {{{ */ { char *decode = NULL; switch (type &~ EXT_TYPE_UNUSED) { - case IS_CV: - asprintf(&decode, "$%s", ops->vars[EX_VAR_TO_NUM(op->var)]->val); - break; + case IS_CV: { + zend_string *var = ops->vars[EX_VAR_TO_NUM(op->var)]; + asprintf(&decode, "$%.*s%c", var->len <= 19 ? (int) var->len : 18, var->val, var->len <= 19 ? 0 : '+'); + } break; case IS_VAR: case IS_TMP_VAR: { -- cgit v1.2.1