From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 21 Nov 2013 16:45:12 +0000 (+0000)
Subject: move opcode stuff to opcode.c
X-Git-Tag: php-5.6.0alpha1~110^2~143^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8743afbaa4c810cb0d137f0ff5602ecfa766fe7c;p=php

move opcode stuff to opcode.c
---

diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c
index fe9470f5d8..727f5e4c3d 100644
--- a/phpdbg_opcode.c
+++ b/phpdbg_opcode.c
@@ -21,6 +21,118 @@
 #include "zend_compile.h"
 #include "phpdbg_opcode.h"
 
+static inline zend_uint phpdbg_decode_literal(zend_op_array *ops, zend_literal *literal TSRMLS_DC) /* {{{ */
+{
+	zend_uint 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, zend_uint type, HashTable *vars TSRMLS_DC) /* {{{ */
+{
+	char *decode = NULL;
+
+	switch (type &~ EXT_TYPE_UNUSED) {
+		case IS_CV:
+			asprintf(&decode, "$%s", ops->vars[op->var].name);
+		break;
+		
+		case IS_VAR:
+		case IS_TMP_VAR: {
+			zend_ulong id = 0, *pid = NULL;
+			if (zend_hash_index_find(vars, (zend_ulong) ops->vars - op->var, (void**) &pid) != SUCCESS) {
+				id = zend_hash_num_elements(vars);
+				zend_hash_index_update(
+					vars, (zend_ulong) ops->vars - op->var, 
+					(void**) &id, 
+					sizeof(zend_ulong), NULL);
+			} else id = *pid;
+			asprintf(&decode, "@%lu", id);
+		} break;
+		
+		case IS_CONST:
+			asprintf(&decode, "C%lu", phpdbg_decode_literal(ops, op->literal TSRMLS_CC));
+		break;
+		
+		case IS_UNUSED:
+			asprintf(&decode, "<unused>");
+		break;
+	}
+	return decode;
+} /* }}} */
+
+char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRMLS_DC) /*{{{ */
+{
+	char *decode[4] = {NULL, NULL, NULL, NULL};
+	
+	switch (op->opcode) {
+	case ZEND_JMP:
+#ifdef ZEND_GOTO
+	case ZEND_GOTO:
+#endif
+#ifdef ZEND_FAST_CALL
+	case ZEND_FAST_CALL:
+#endif
+			asprintf(&decode[1], "#%lu", op->op1.jmp_addr - ops->opcodes);
+		goto format;
+	      
+	case ZEND_JMPZNZ:
+			decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
+			asprintf(
+				&decode[2], "#%lu or #%lu", op->op2.opline_num, op->extended_value);
+		goto result;
+      
+	case ZEND_JMPZ:
+	case ZEND_JMPNZ:
+	case ZEND_JMPZ_EX:
+	case ZEND_JMPNZ_EX:
+      
+#ifdef ZEND_JMP_SET
+	case ZEND_JMP_SET:
+#endif
+#ifdef ZEND_JMP_SET_VAR
+	case ZEND_JMP_SET_VAR:
+#endif
+        	decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
+      		asprintf(
+      			&decode[2], "#%lu", op->op2.jmp_addr - ops->opcodes);
+      	goto result;
+
+	case ZEND_RECV_INIT:
+		goto result;
+          
+		default: {
+			decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
+			decode[2] = phpdbg_decode_op(ops, &op->op2, op->op2_type, vars TSRMLS_CC);
+result:
+			decode[3] = phpdbg_decode_op(ops, &op->result, op->result_type, vars TSRMLS_CC);		
+format:
+			asprintf(
+				&decode[0],
+				"%-20s %-20s %-20s", 
+				decode[1] ? decode[1] : "", 
+				decode[2] ? decode[2] : "",
+				decode[3] ? decode[3] : "");
+		}
+	}
+	
+	if (decode[1])
+		free(decode[1]);
+	if (decode[2])
+		free(decode[2]);
+	if (decode[3])
+		free(decode[3]);
+
+	return decode[0];
+} /* }}} */
+
 const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
 {
 #define CASE(s) case s: return #s
diff --git a/phpdbg_opcode.h b/phpdbg_opcode.h
index 28fc806c1c..83c0ac5add 100644
--- a/phpdbg_opcode.h
+++ b/phpdbg_opcode.h
@@ -23,5 +23,6 @@
 #include "zend_types.h"
 
 const char *phpdbg_decode_opcode(zend_uchar);
+char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRMLS_DC);
 
 #endif /* PHPDBG_OPCODE_H */
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 016474b791..860183b101 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -1025,118 +1025,6 @@ out:
 	return ret;
 } /* }}} */
 
-static inline zend_uint phpdbg_decode_literal(zend_op_array *ops, zend_literal *literal TSRMLS_DC) /* {{{ */
-{
-	zend_uint 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, zend_uint type, HashTable *vars TSRMLS_DC) /* {{{ */
-{
-	char *decode = NULL;
-
-	switch (type &~ EXT_TYPE_UNUSED) {
-		case IS_CV:
-			asprintf(&decode, "$%s", ops->vars[op->var].name);
-		break;
-		
-		case IS_VAR:
-		case IS_TMP_VAR: {
-			zend_ulong id = 0, *pid = NULL;
-			if (zend_hash_index_find(vars, (zend_ulong) ops->vars - op->var, (void**) &pid) != SUCCESS) {
-				id = zend_hash_num_elements(vars);
-				zend_hash_index_update(
-					vars, (zend_ulong) ops->vars - op->var, 
-					(void**) &id, 
-					sizeof(zend_ulong), NULL);
-			} else id = *pid;
-			asprintf(&decode, "@%lu", id);
-		} break;
-		
-		case IS_CONST:
-			asprintf(&decode, "C%lu", phpdbg_decode_literal(ops, op->literal TSRMLS_CC));
-		break;
-		
-		case IS_UNUSED:
-			asprintf(&decode, "<unused>");
-		break;
-	}
-	return decode;
-} /* }}} */
-
-char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRMLS_DC) /*{{{ */
-{
-	char *decode[4] = {NULL, NULL, NULL, NULL};
-	
-	switch (op->opcode) {
-	case ZEND_JMP:
-#ifdef ZEND_GOTO
-	case ZEND_GOTO:
-#endif
-#ifdef ZEND_FAST_CALL
-	case ZEND_FAST_CALL:
-#endif
-			asprintf(&decode[1], "#%lu", op->op1.jmp_addr - ops->opcodes);
-		goto format;
-	      
-	case ZEND_JMPZNZ:
-			decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
-			asprintf(
-				&decode[2], "#%lu or #%lu", op->op2.opline_num, op->extended_value);
-		goto result;
-      
-	case ZEND_JMPZ:
-	case ZEND_JMPNZ:
-	case ZEND_JMPZ_EX:
-	case ZEND_JMPNZ_EX:
-      
-#ifdef ZEND_JMP_SET
-	case ZEND_JMP_SET:
-#endif
-#ifdef ZEND_JMP_SET_VAR
-	case ZEND_JMP_SET_VAR:
-#endif
-        	decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
-      		asprintf(
-      			&decode[2], "#%lu", op->op2.jmp_addr - ops->opcodes);
-      	goto result;
-
-	case ZEND_RECV_INIT:
-		goto result;
-          
-		default: {
-			decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
-			decode[2] = phpdbg_decode_op(ops, &op->op2, op->op2_type, vars TSRMLS_CC);
-result:
-			decode[3] = phpdbg_decode_op(ops, &op->result, op->result_type, vars TSRMLS_CC);		
-format:
-			asprintf(
-				&decode[0],
-				"%-20s %-20s %-20s", 
-				decode[1] ? decode[1] : "", 
-				decode[2] ? decode[2] : "",
-				decode[3] ? decode[3] : "");
-		}
-	}
-	
-	if (decode[1])
-		free(decode[1]);
-	if (decode[2])
-		free(decode[2]);
-	if (decode[3])
-		free(decode[3]);
-
-	return decode[0];
-} /* }}} */
-
 void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, zend_bool ignore_flags TSRMLS_DC) /* {{{ */
 {
     /* force out a line while stepping so the user knows what is happening */