1 files changed, 89 insertions, 108 deletions

diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
index 0935e748e5..e64ab0d636 100644
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -25,121 +25,88 @@
 #include "phpdbg_utils.h"
 #include "ext/standard/php_string.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
-static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t type, HashTable *vars) /* {{{ */
+static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
+{
+	const char *ret = zend_get_opcode_name(opcode);
+	if (ret) {
+		return ret + 5; /* Skip ZEND_ prefix */
+	}
+	return "UNKNOWN";
+} /* }}} */
+
+static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t type) /* {{{ */
 {
 	char *decode = NULL;
 
-	switch (type &~ EXT_TYPE_UNUSED) {
+	switch (type) {
 		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 : '+');
+			spprintf(&decode, 0, "$%.*s%c",
+				ZSTR_LEN(var) <= 19 ? (int) ZSTR_LEN(var) : 18,
+				ZSTR_VAL(var), ZSTR_LEN(var) <= 19 ? 0 : '+');
 		} break;
 
 		case IS_VAR:
-		case IS_TMP_VAR: {
-			zend_ulong id = 0, *pid = NULL;
-			if (vars != NULL) {
-				if ((pid = zend_hash_index_find_ptr(vars, (zend_ulong) ops->vars - op->var))) {
-					id = *pid;
-				} else {
-					id = zend_hash_num_elements(vars);
-					zend_hash_index_update_mem(vars, (zend_ulong) ops->vars - op->var, &id, sizeof(zend_ulong));
-				}
-			}
-			asprintf(&decode, "@" ZEND_ULONG_FMT, id);
-		} break;
-
+			spprintf(&decode, 0, "@%u", EX_VAR_TO_NUM(op->var) - ops->last_var);
+		break;
+		case IS_TMP_VAR:
+			spprintf(&decode, 0, "~%u", EX_VAR_TO_NUM(op->var) - ops->last_var);
+		break;
 		case IS_CONST: {
 			zval *literal = RT_CONSTANT(ops, *op);
-			switch (Z_TYPE_P(literal)) {
-				case IS_UNDEF:
-					decode = zend_strndup("", 0);
-					break;
-				case IS_NULL:
-					decode = zend_strndup(ZEND_STRL("null"));
-					break;
-				case IS_FALSE:
-					decode = zend_strndup(ZEND_STRL("false"));
-					break;
-				case IS_TRUE:
-					decode = zend_strndup(ZEND_STRL("true"));
-					break;
-				case IS_LONG:
-					asprintf(&decode, ZEND_ULONG_FMT, Z_LVAL_P(literal));
-					break;
-				case IS_DOUBLE:
-					asprintf(&decode, "%.*G", 14, Z_DVAL_P(literal));
-					break;
-				case IS_STRING: {
-					int i;
-					zend_string *str = php_addcslashes(Z_STR_P(literal), 0, "\\\"", 2);
-					for (i = 0; i < str->len; i++) {
-						if (str->val[i] < 32) {
-							str->val[i] = ' ';
-						}
-					}
-					asprintf(&decode, "\"%.*s\"%c", str->len <= 18 ? (int) str->len : 17, str->val, str->len <= 18 ? 0 : '+');
-					zend_string_release(str);
-					} break;
-				case IS_RESOURCE:
-					asprintf(&decode, "Rsrc #%d", Z_RES_HANDLE_P(literal));
-					break;
-				case IS_ARRAY:
-					asprintf(&decode, "array(%d)", zend_hash_num_elements(Z_ARR_P(literal)));
-					break;
-				case IS_OBJECT: {
-					zend_string *str = Z_OBJCE_P(literal)->name;
-					asprintf(&decode, "%.*s%c", str->len <= 18 ? (int) str->len : 18, str->val, str->len <= 18 ? 0 : '+');
-					} break;
-				case IS_CONSTANT:
-					decode = zend_strndup(ZEND_STRL("<constant>"));
-					break;
-				case IS_CONSTANT_AST:
-					decode = zend_strndup(ZEND_STRL("<ast>"));
-					break;
-				default:
-					asprintf(&decode, "unknown type: %d", Z_TYPE_P(literal));
-					break;
-			}
+			decode = phpdbg_short_zval_print(literal, 20);
 		} break;
-
-		case IS_UNUSED:
-			return NULL;
 	}
 	return decode;
 } /* }}} */
 
-char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{{{ */
+char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */
 {
-	char *decode[4] = {NULL, NULL, NULL, NULL};
+	const char *opcode_name = phpdbg_decode_opcode(op->opcode);
+	char *result, *decode[4] = {NULL, NULL, NULL, NULL};
+
+	/* EX */
+	switch (op->opcode) {
+	case ZEND_FAST_CALL:
+		if (op->extended_value == ZEND_FAST_CALL_FROM_FINALLY) {
+			decode[0] = estrdup("FAST_CALL<FROM_FINALLY>");
+		}
+		break;
+	case ZEND_FAST_RET:
+		if (op->extended_value != 0) {
+			spprintf(&decode[0], 0, "FAST_RET<%s>",
+				op->extended_value == ZEND_FAST_RET_TO_CATCH ? "TO_CATCH" : "TO_FINALLY");
+		}
+		break;
+	}
 
 	/* OP1 */
 	switch (op->opcode) {
 	case ZEND_JMP:
-	case ZEND_GOTO:
 	case ZEND_FAST_CALL:
-		asprintf(&decode[1], "J%ld", OP_JMP_ADDR(op, op->op1) - ops->opcodes);
+		spprintf(&decode[1], 0, "J%td", OP_JMP_ADDR(op, op->op1) - ops->opcodes);
 		break;
 
 	case ZEND_INIT_FCALL:
 	case ZEND_RECV:
 	case ZEND_RECV_INIT:
 	case ZEND_RECV_VARIADIC:
-		asprintf(&decode[1], "%" PRIu32, op->op1.num);
+		spprintf(&decode[1], 0, "%" PRIu32, op->op1.num);
 		break;
 
 	default:
-		decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars);
+		decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type);
 		break;
 	}
 
 	/* OP2 */
 	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);
+		spprintf(&decode[2], 0, "J%td or J%td",
+			OP_JMP_ADDR(op, op->op2) - ops->opcodes,
+			ZEND_OFFSET_TO_OPLINE(op, op->extended_value) - ops->opcodes);
 		break;
 
 	case ZEND_JMPZ:
@@ -147,7 +114,15 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{
 	case ZEND_JMPZ_EX:
 	case ZEND_JMPNZ_EX:
 	case ZEND_JMP_SET:
-		asprintf(&decode[2], "J%ld", OP_JMP_ADDR(op, op->op2) - ops->opcodes);
+	case ZEND_ASSERT_CHECK:
+		spprintf(&decode[2], 0, "J%td", OP_JMP_ADDR(op, op->op2) - ops->opcodes);
+		break;
+
+	case ZEND_FAST_CALL:
+	case ZEND_FAST_RET:
+		if (op->extended_value != 0) {
+			spprintf(&decode[2], 0, "J%" PRIu32, op->op2.opline_num);
+		}
 		break;
 
 	case ZEND_SEND_VAL:
@@ -157,41 +132,44 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{
 	case ZEND_SEND_REF:
 	case ZEND_SEND_VAR_EX:
 	case ZEND_SEND_USER:
-		asprintf(&decode[2], "%" PRIu32, op->op2.num);
+		spprintf(&decode[2], 0, "%" PRIu32, op->op2.num);
 		break;
 
 	default:
-		decode[2] = phpdbg_decode_op(ops, &op->op2, op->op2_type, vars);
+		decode[2] = phpdbg_decode_op(ops, &op->op2, op->op2_type);
 		break;
 	}
 
 	/* RESULT */
 	switch (op->opcode) {
 	case ZEND_CATCH:
-		asprintf(&decode[2], "%" PRIu32, op->result.num);
+		spprintf(&decode[3], 0, "%" PRIu32, op->result.num);
 		break;
 	default:
-		decode[3] = phpdbg_decode_op(ops, &op->result, op->result_type, vars);
+		decode[3] = phpdbg_decode_op(ops, &op->result, op->result_type);
 		break;
 	}
 
-	asprintf(&decode[0],
-		"%-20s %-20s %-20s",
+	spprintf(&result, 0,
+		"%-23s %-20s %-20s %-20s",
+		decode[0] ? decode[0] : opcode_name,
 		decode[1] ? decode[1] : "",
 		decode[2] ? decode[2] : "",
 		decode[3] ? decode[3] : "");
 
+	if (decode[0])
+		efree(decode[0]);
 	if (decode[1])
-		free(decode[1]);
+		efree(decode[1]);
 	if (decode[2])
-		free(decode[2]);
+		efree(decode[2]);
 	if (decode[3])
-		free(decode[3]);
+		efree(decode[3]);
 
-	return decode[0];
+	return result;
 } /* }}} */
 
-void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, zend_bool ignore_flags) /* {{{ */
+void phpdbg_print_opline_ex(zend_execute_data *execute_data, zend_bool ignore_flags) /* {{{ */
 {
 	/* force out a line while stepping so the user knows what is happening */
 	if (ignore_flags ||
@@ -200,40 +178,43 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze
 		(PHPDBG_G(oplog)))) {
 
 		zend_op *opline = (zend_op *) execute_data->opline;
-		char *decode = phpdbg_decode_opline(&execute_data->func->op_array, opline, vars);
+		char *decode = phpdbg_decode_opline(&execute_data->func->op_array, opline);
 
 		if (ignore_flags || (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) || (PHPDBG_G(flags) & PHPDBG_IS_STEPPING))) {
 			/* output line info */
-			phpdbg_notice("opline", "line=\"%u\" opline=\"%p\" opcode=\"%s\" op=\"%s\" file=\"%s\"", "L%-5u %16p %-30s %s %s",
+			phpdbg_notice("opline", "line=\"%u\" opline=\"%p\" op=\"%s\" file=\"%s\"", "L%-5u %16p %s %s",
 			   opline->lineno,
 			   opline,
-			   phpdbg_decode_opcode(opline->opcode),
 			   decode,
-			   execute_data->func->op_array.filename ? execute_data->func->op_array.filename->val : "unknown");
+			   execute_data->func->op_array.filename ? ZSTR_VAL(execute_data->func->op_array.filename) : "unknown");
 		}
 
 		if (!ignore_flags && PHPDBG_G(oplog)) {
-			phpdbg_log_ex(fileno(PHPDBG_G(oplog)), "L%-5u %16p %-30s %s %s",
+			phpdbg_log_ex(fileno(PHPDBG_G(oplog)), "L%-5u %16p %s %s\n",
 				opline->lineno,
 				opline,
-				phpdbg_decode_opcode(opline->opcode),
 				decode,
-				execute_data->func->op_array.filename ? execute_data->func->op_array.filename->val : "unknown");
+				execute_data->func->op_array.filename ? ZSTR_VAL(execute_data->func->op_array.filename) : "unknown");
 		}
 
-		if (decode) {
-			free(decode);
-		}
+		efree(decode);
 	}
-} /* }}} */
 
-void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags) /* {{{ */
-{
-	phpdbg_print_opline_ex(execute_data, NULL, ignore_flags);
+	if (PHPDBG_G(oplog_list)) {
+		phpdbg_oplog_entry *cur = zend_arena_alloc(&PHPDBG_G(oplog_arena), sizeof(phpdbg_oplog_entry));
+		zend_op_array *op_array = &execute_data->func->op_array;
+		cur->op = (zend_op *) execute_data->opline;
+		cur->opcodes = op_array->opcodes;
+		cur->filename = op_array->filename;
+		cur->scope = op_array->scope;
+		cur->function_name = op_array->function_name;
+		cur->next = NULL;
+		PHPDBG_G(oplog_cur)->next = cur;
+		PHPDBG_G(oplog_cur) = cur;
+	}
 } /* }}} */
 
-const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
+void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags) /* {{{ */
 {
-	const char *ret = zend_get_opcode_name(opcode);
-	return ret?ret:"UNKNOWN";
+	phpdbg_print_opline_ex(execute_data, ignore_flags);
 } /* }}} */