constructorの不具合修正

m3m0r7 · m3m0r7 · commit 36ae3ff4ee94 · 2015-11-09T03:08:04.000+09:00
diff --git a/PHPJava/Attributes/JavaStackMapTableAttribute.php b/PHPJava/Attributes/JavaStackMapTableAttribute.php
@@ -19,8 +19,11 @@ public function __construct (&$Class) {
             
         }
         
-        // $this->AttributeData = new $classAttributeName($Class);
+    }
+    
+    public function getStackMapFrames () {
         
+        return $this->StackMapFrames;
         
     }
     
diff --git a/PHPJava/Invoker/JavaMethodInvoker.php b/PHPJava/Invoker/JavaMethodInvoker.php
@@ -95,15 +95,17 @@ public function __call ($methodName, $arguments) {
         foreach ($this->getClass()->getMethods() as $methodInfo) {
 
             $cpMethodName = $cpInfo[$methodInfo->getNameIndex()]->getString();
-
+            
             if ($methodName === $cpMethodName) {
 
                 $accessibility = $this->_getAccessiblity($methodInfo);
 
                 // メソッドのシグネチャを取得する
                 $javaArguments = JavaClass::parseSignature($cpInfo[$methodInfo->getDescriptorIndex()]->getString());
 
-                if (sizeof($arguments) !== $javaArguments['argumentsCount']) {
+                $argumentsCount = sizeof($arguments);
+                
+                if ($argumentsCount !== $javaArguments['argumentsCount']) {
 
                     // 引数の配列の大きさが違う
                     continue;
@@ -127,9 +129,6 @@ public function __call ($methodName, $arguments) {
 
                     if ($attributeData instanceof \JavaCodeAttribute) {
 
-                        // runnable code
-                        $opCodes = $attributeData->getOpCodes();
-
                         $handle = fopen('php://memory', 'rw');
                         fwrite($handle, $attributeData->getCode());
                         rewind($handle);
@@ -138,13 +137,18 @@ public function __call ($methodName, $arguments) {
 
                         // 局所変数格納用
                         $localstorage = array(
-                            0 => $this->getClass(),
+                            0 => null,
                             1 => null,
                             2 => null,
                             3 => null
                         );
+                        
+                        $i = 0;
+                        if ($this->_constructed) {
+                            $localstorage[0] = $this->getClass();
+                            $i = 1;
+                        }
 
-                        $i = 1;
                         foreach ($arguments as $argument) {
 
                             $localstorage[$i] = $argument;
@@ -191,12 +195,14 @@ public function __call ($methodName, $arguments) {
                     }
 
                 }
+                
+                return;
 
             }
 
 
         }
-
+        
         throw new JavaInvokerException('undefined method "' . $methodName . '"');
 
     }
diff --git a/PHPJava/Statements/JavaStatement_iadd.php b/PHPJava/Statements/JavaStatement_iadd.php
@@ -6,7 +6,7 @@ public function execute () {
 
         $leftValue = $this->getStack();
         $rightValue = $this->getStack();
-
+        
         $this->pushStack(BinaryTools::add($leftValue, $rightValue, 4));
 
     }
diff --git a/PHPJava/Statements/JavaStatement_invokevirtual.php b/PHPJava/Statements/JavaStatement_invokevirtual.php
@@ -21,9 +21,9 @@ public function execute () {
             $arguments[] = $this->getStack();
 
         }
-
+        
         $invokerClass = $this->getStack();
-
+        
         if ($invokerClass instanceof \JavaClass) {
 
             $result = call_user_func_array(array(
@@ -38,18 +38,14 @@ public function execute () {
 
             // load platform
             $this->getInvoker()->loadPlatform($class);
-            $cp->getClass()->traceDump();
+            $invokerClassName = '\\' . str_replace('/', '\\', $class);
 
             $result = call_user_func_array(array(
-
+                
                 $invokerClass,
                 $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString()
 
             ), $arguments);
-            
-            // empty to array
-            // $stacks = array();
-
 
         }
 
diff --git a/PHPJava/Utils/BinaryTools.php b/PHPJava/Utils/BinaryTools.php
@@ -130,7 +130,7 @@ public final static function multiply ($value1, $value2, $bytes) {
     }
 
     public final static function add ($value1, $value2, $bytes) {
-
+        
         if (function_exists('gmp_add')) {
 
             $a = gmp_init($value1);

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,11 @@ public function __construct (&$Class) {`
`19`	`19`
`20`	`20`	`}`
`21`	`21`
`22`		`- // $this->AttributeData = new $classAttributeName($Class);`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ public function getStackMapFrames () {`
`23`	`25`
	`26`	`+ return $this->StackMapFrames;`
`24`	`27`
`25`	`28`	`}`
`26`	`29`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public function execute () {`
`6`	`6`
`7`	`7`	`$leftValue = $this->getStack();`
`8`	`8`	`$rightValue = $this->getStack();`
`9`		`-`
	`9`	`+`
`10`	`10`	`$this->pushStack(BinaryTools::add($leftValue, $rightValue, 4));`
`11`	`11`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public final static function multiply ($value1, $value2, $bytes) {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`public final static function add ($value1, $value2, $bytes) {`
`133`		`-`
	`133`	`+`
`134`	`134`	`if (function_exists('gmp_add')) {`
`135`	`135`
`136`	`136`	`$a = gmp_init($value1);`