Fix StackMapTable problems

m3m0r7 · m3m0r7 · commit 10589d6d5db3 · 2019-12-28T15:34:27.000+09:00
diff --git a/src/Compiler/Builder/Attributes/Architects/Frames/Frame.php b/src/Compiler/Builder/Attributes/Architects/Frames/Frame.php
@@ -54,13 +54,13 @@ public function getLocals(): array
 
     public function addLocal(int $verificationType, ...$arguments): self
     {
-        $this->locals[] = [$verificationType, $arguments];
+        $this->locals[] = array_merge([$verificationType], $arguments);
         return $this;
     }
 
     public function addStack(int $verificationType, ...$arguments): self
     {
-        $this->stacks[] = [$verificationType, $arguments];
+        $this->stacks[] = array_merge([$verificationType], $arguments);
         return $this;
     }
 
diff --git a/src/Compiler/Builder/Attributes/StackMapTable.php b/src/Compiler/Builder/Attributes/StackMapTable.php
@@ -18,7 +18,6 @@
 use PHPJava\Core\JVM\Stream\BinaryWriter;
 use PHPJava\Exceptions\AssembleStructureException;
 use PHPJava\Kernel\Maps\VerificationTypeTag;
-use PHPJava\Kernel\Resolvers\TypeResolver;
 use PHPJava\Kernel\Types\_Byte;
 use PHPJava\Kernel\Types\_Char;
 use PHPJava\Kernel\Types\_Float;
@@ -93,21 +92,6 @@ public function getValue(): string
         $emulatedAccumulator = new Accumulator();
         $currentOffset = 0;
 
-        foreach ($this->getStore()->getAll() as $localStorage) {
-            [$localStorageIndex, $type] = $localStorage;
-            [$verificationTypeTag, $objectClassType] = TypeResolver::getVerificationTypeTagByKernelType($type);
-            $emulatedAccumulator->setToLocal(
-                $localStorageIndex,
-                [
-                    $verificationTypeTag,
-                    $objectClassType !== null
-                        ? $this->getEnhancedConstantPool()
-                            ->findClass($objectClassType)
-                        : null,
-                ]
-            );
-        }
-
         foreach ($this->operations as $operation) {
             $programCounter = $this->calculateProgramCounterByOperationCodes(
                 $this->operations,
@@ -141,7 +125,7 @@ public function getValue(): string
         usort(
             $entries,
             static function (FullFrame $a, FullFrame $b) {
-                return $a->getBranchTarget() - $b->getBranchTarget();
+                return $a->getBranchTarget() <=> $b->getBranchTarget();
             }
         );
 
diff --git a/src/Compiler/Emulator/Mnemonics/_aload_0.php b/src/Compiler/Emulator/Mnemonics/_aload_0.php
@@ -1,15 +1,20 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _aload_0 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(0)
+            [
+                VerificationTypeTag::ITEM_Object,
+                $this->getEnhancedConstantPool()
+                    ->findClass(\PHPJava\Packages\java\lang\_String::class),
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_aload_1.php b/src/Compiler/Emulator/Mnemonics/_aload_1.php
@@ -1,15 +1,20 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _aload_1 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(0)
+            [
+                VerificationTypeTag::ITEM_Object,
+                $this->getEnhancedConstantPool()
+                    ->findClass(\PHPJava\Packages\java\lang\_String::class),
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_aload_2.php b/src/Compiler/Emulator/Mnemonics/_aload_2.php
@@ -1,15 +1,20 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _aload_2 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(0)
+            [
+                VerificationTypeTag::ITEM_Object,
+                $this->getEnhancedConstantPool()
+                    ->findClass(\PHPJava\Packages\java\lang\_String::class),
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_aload_3.php b/src/Compiler/Emulator/Mnemonics/_aload_3.php
@@ -1,15 +1,20 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _aload_3 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(0)
+            [
+                VerificationTypeTag::ITEM_Object,
+                $this->getEnhancedConstantPool()
+                    ->findClass(\PHPJava\Packages\java\lang\_String::class),
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_iload_0.php b/src/Compiler/Emulator/Mnemonics/_iload_0.php
@@ -1,15 +1,18 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _iload_0 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(0)
+            [
+                VerificationTypeTag::ITEM_Integer,
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_iload_1.php b/src/Compiler/Emulator/Mnemonics/_iload_1.php
@@ -1,15 +1,18 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _iload_1 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(1)
+            [
+                VerificationTypeTag::ITEM_Integer,
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_iload_2.php b/src/Compiler/Emulator/Mnemonics/_iload_2.php
@@ -1,15 +1,18 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _iload_2 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(2)
+            [
+                VerificationTypeTag::ITEM_Integer,
+            ]
         );
     }
 }
diff --git a/src/Compiler/Emulator/Mnemonics/_iload_3.php b/src/Compiler/Emulator/Mnemonics/_iload_3.php
@@ -1,15 +1,18 @@
 <?php
 namespace PHPJava\Compiler\Emulator\Mnemonics;
 
+use PHPJava\Kernel\Maps\VerificationTypeTag;
+
 class _iload_3 extends AbstractOperationCode implements OperationCodeInterface
 {
     use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;
 
     public function execute(): void
     {
         $this->accumulator->pushToOperandStack(
-            $this->accumulator
-                ->getFromLocal(3)
+            [
+                VerificationTypeTag::ITEM_Integer,
+            ]
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ public function getLocals(): array`
`54`	`54`
`55`	`55`	`public function addLocal(int $verificationType, ...$arguments): self`
`56`	`56`	`{`
`57`		`- $this->locals[] = [$verificationType, $arguments];`
	`57`	`+ $this->locals[] = array_merge([$verificationType], $arguments);`
`58`	`58`	`return $this;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function addStack(int $verificationType, ...$arguments): self`
`62`	`62`	`{`
`63`		`- $this->stacks[] = [$verificationType, $arguments];`
	`63`	`+ $this->stacks[] = array_merge([$verificationType], $arguments);`
`64`	`64`	`return $this;`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,20 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Compiler\Emulator\Mnemonics;`
`3`	`3`
	`4`	`+use PHPJava\Kernel\Maps\VerificationTypeTag;`
	`5`	`+`
`4`	`6`	`class _aload_0 extends AbstractOperationCode implements OperationCodeInterface`
`5`	`7`	`{`
`6`	`8`	`use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;`
`7`	`9`
`8`	`10`	`public function execute(): void`
`9`	`11`	`{`
`10`	`12`	`$this->accumulator->pushToOperandStack(`
`11`		`- $this->accumulator`
`12`		`- ->getFromLocal(0)`
	`13`	`+ [`
	`14`	`+ VerificationTypeTag::ITEM_Object,`
	`15`	`+ $this->getEnhancedConstantPool()`
	`16`	`+ ->findClass(\PHPJava\Packages\java\lang\_String::class),`
	`17`	`+ ]`
`13`	`18`	`);`
`14`	`19`	`}`
`15`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,18 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Compiler\Emulator\Mnemonics;`
`3`	`3`
	`4`	`+use PHPJava\Kernel\Maps\VerificationTypeTag;`
	`5`	`+`
`4`	`6`	`class _iload_0 extends AbstractOperationCode implements OperationCodeInterface`
`5`	`7`	`{`
`6`	`8`	`use \PHPJava\Compiler\Emulator\Traits\GeneralProcessor;`
`7`	`9`
`8`	`10`	`public function execute(): void`
`9`	`11`	`{`
`10`	`12`	`$this->accumulator->pushToOperandStack(`
`11`		`- $this->accumulator`
`12`		`- ->getFromLocal(0)`
	`13`	`+ [`
	`14`	`+ VerificationTypeTag::ITEM_Integer,`
	`15`	`+ ]`
`13`	`16`	`);`
`14`	`17`	`}`
`15`	`18`	`}`