From 1fc55df22708c39cb86d9857450cb866653bd4e9 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Sat, 18 Apr 2015 13:57:56 +0000
Subject: [PATCH] remove debug code

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1588 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 bin/phpdc.phpr           |  2 +-
 lib/Decompiler.class.php | 24 ++++++++++++++++++++----
 processor/processor.m4   |  7 +------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/bin/phpdc.phpr b/bin/phpdc.phpr
index 9aa5c7e..969cbb5 100755
--- a/bin/phpdc.phpr
+++ b/bin/phpdc.phpr
@@ -2,7 +2,7 @@
 <?php
 
 $srcdir = dirname(__FILE__);
-require_once("$srcdir/../lib/orig/Decompiler.class.php");
+require_once("$srcdir/../lib/Decompiler.class.php");
 if (file_exists("$srcdir/phpdc.debug.php")) {
 	include("$srcdir/phpdc.debug.php");
 }
diff --git a/lib/Decompiler.class.php b/lib/Decompiler.class.php
index 046ee59..3e58c38 100644
--- a/lib/Decompiler.class.php
+++ b/lib/Decompiler.class.php
@@ -1395,12 +1395,20 @@ class Decompiler
 
 			case XC_GOTO:
 				$target = $op['op1']['var'];
+				if (!isset($opcodes[$target])) {
+					fprintf(STDERR, "%d: internal error\n", __LINE__);
+					break;
+				}
 				$op['goto'] = $target;
 				$opcodes[$target]['gofrom'][] = $i;
 				break;
 
 			case XC_JMP:
 				$target = $op['op1']['var'];
+				if (!isset($opcodes[$target])) {
+					fprintf(STDERR, "%d: internal error\n", __LINE__);
+					break;
+				}
 				$op['jmpouts'] = array($target);
 				$opcodes[$target]['jmpins'][] = $i;
 				break;
@@ -1408,6 +1416,14 @@ class Decompiler
 			case XC_JMPZNZ:
 				$jmpz = $op['op2']['opline_num'];
 				$jmpnz = $op['extended_value'];
+				if (!isset($opcodes[$jmpz])) {
+					fprintf(STDERR, "%d: internal error\n", __LINE__);
+					break;
+				}
+				if (!isset($opcodes[$jmpnz])) {
+					fprintf(STDERR, "%d: internal error\n", __LINE__);
+					break;
+				}
 				$op['jmpouts'] = array($jmpz, $jmpnz);
 				$opcodes[$jmpz]['jmpins'][] = $i;
 				$opcodes[$jmpnz]['jmpins'][] = $i;
@@ -1423,10 +1439,10 @@ class Decompiler
 			case XC_FE_FETCH:
 			// case XC_JMP_NO_CTOR:
 				$target = $op['op2']['opline_num'];
-				//if (!isset($target)) {
-				//	$this->dumpop($op, $EX);
-				//	var_dump($op); exit;
-				//}
+				if (!isset($opcodes[$target])) {
+					fprintf(STDERR, "%d: internal error\n", __LINE__);
+					break;
+				}
 				$op['jmpouts'] = array($target);
 				$opcodes[$target]['jmpins'][] = $i;
 				break;
diff --git a/processor/processor.m4 b/processor/processor.m4
index e2ab934..955f720 100644
--- a/processor/processor.m4
+++ b/processor/processor.m4
@@ -662,12 +662,7 @@ define(`UNION_znode_op', `dnl {{{
 			', `
 				IFDASM(`{
 					zval *zv;
-					zval *srczv;
-					srczv = &dasm->active_op_array_src->literals[SRC(`$1.constant')].constant;
-					if (Z_TYPE_P(srczv) == IS_STRING) {
-						size_t index = SRC(`$1.constant');
-						fprintf(stderr, "%p %p %s\n", srczv, Z_STRVAL_P(srczv), Z_STRVAL_P(srczv));
-					}
+					zval *srczv = &dasm->active_op_array_src->literals[SRC(`$1.constant')].constant;
 					ALLOC_ZVAL(zv);
 					MAKE_COPY_ZVAL(&srczv, zv);
 					add_assoc_zval_ex(DST(), XCACHE_STRS("$1.constant"), zv);