Fix order of values stored in the operand stack

y-uti · y-uti · commit 68335b361f5c · 2019-04-04T22:32:30.000+09:00
diff --git a/src/Kernel/Mnemonics/_dadd.php b/src/Kernel/Mnemonics/_dadd.php
@@ -11,8 +11,8 @@ final class _dadd implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::add($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_dmul.php b/src/Kernel/Mnemonics/_dmul.php
@@ -11,8 +11,8 @@ final class _dmul implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::multiply($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_dsub.php b/src/Kernel/Mnemonics/_dsub.php
@@ -11,8 +11,8 @@ final class _dsub implements OperationInterface
 
     public function execute(): void
     {
-        $leftValue = $this->getStack();
         $rightValue = $this->getStack();
+        $leftValue = $this->getStack();
 
         $this->pushStack(BinaryTool::sub($leftValue, $rightValue, 8));
     }
diff --git a/src/Kernel/Mnemonics/_iadd.php b/src/Kernel/Mnemonics/_iadd.php
@@ -11,8 +11,8 @@ final class _iadd implements OperationInterface
 
     public function execute(): void
     {
-        $leftValue = $this->getStack();
         $rightValue = $this->getStack();
+        $leftValue = $this->getStack();
 
         $this->pushStack(BinaryTool::add($leftValue, $rightValue));
     }
diff --git a/src/Kernel/Mnemonics/_iand.php b/src/Kernel/Mnemonics/_iand.php
@@ -11,8 +11,8 @@ final class _iand implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::andBits($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_if_acmpeq.php b/src/Kernel/Mnemonics/_if_acmpeq.php
@@ -13,8 +13,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
         if ($leftOperand === $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_acmpne.php b/src/Kernel/Mnemonics/_if_acmpne.php
@@ -13,8 +13,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
         if ($leftOperand !== $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_icmpge.php b/src/Kernel/Mnemonics/_if_icmpge.php
@@ -13,10 +13,10 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
-        if ($leftOperand <= $rightOperand) {
+        if ($leftOperand >= $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmpgt.php b/src/Kernel/Mnemonics/_if_icmpgt.php
@@ -13,10 +13,10 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
-        if ($leftOperand < $rightOperand) {
+        if ($leftOperand > $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmplt.php b/src/Kernel/Mnemonics/_if_icmplt.php
@@ -13,10 +13,10 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
-        if ($rightOperand < $leftOperand) {
+        if ($leftOperand < $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmpne.php b/src/Kernel/Mnemonics/_if_icmpne.php
@@ -13,8 +13,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
         if ($leftOperand != $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_imul.php b/src/Kernel/Mnemonics/_imul.php
@@ -11,8 +11,8 @@ final class _imul implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::multiply($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ior.php b/src/Kernel/Mnemonics/_ior.php
@@ -11,8 +11,8 @@ final class _ior implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::orBits($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ishl.php b/src/Kernel/Mnemonics/_ishl.php
@@ -11,8 +11,8 @@ final class _ishl implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftLeft($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_ishr.php b/src/Kernel/Mnemonics/_ishr.php
@@ -11,8 +11,8 @@ final class _ishr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftRight($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_isub.php b/src/Kernel/Mnemonics/_isub.php
@@ -11,8 +11,8 @@ final class _isub implements OperationInterface
 
     public function execute(): void
     {
-        $leftValue = $this->getStack();
         $rightValue = $this->getStack();
+        $leftValue = $this->getStack();
 
         $this->pushStack(BinaryTool::sub($leftValue, $rightValue, 4));
     }
diff --git a/src/Kernel/Mnemonics/_iushr.php b/src/Kernel/Mnemonics/_iushr.php
@@ -11,8 +11,8 @@ final class _iushr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::unsignedShiftRight($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ixor.php b/src/Kernel/Mnemonics/_ixor.php
@@ -11,8 +11,8 @@ final class _ixor implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::xorBits($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ladd.php b/src/Kernel/Mnemonics/_ladd.php
@@ -11,8 +11,8 @@ final class _ladd implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::add($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_land.php b/src/Kernel/Mnemonics/_land.php
@@ -11,8 +11,8 @@ final class _land implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::andBits($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lmul.php b/src/Kernel/Mnemonics/_lmul.php
@@ -11,8 +11,8 @@ final class _lmul implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::multiply($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lor.php b/src/Kernel/Mnemonics/_lor.php
@@ -11,8 +11,8 @@ final class _lor implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::orBits($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lshl.php b/src/Kernel/Mnemonics/_lshl.php
@@ -11,8 +11,8 @@ final class _lshl implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftLeft($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_lshr.php b/src/Kernel/Mnemonics/_lshr.php
@@ -11,8 +11,8 @@ final class _lshr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftRight($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lsub.php b/src/Kernel/Mnemonics/_lsub.php
@@ -11,8 +11,8 @@ final class _lsub implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::sub($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lushr.php b/src/Kernel/Mnemonics/_lushr.php
@@ -11,8 +11,8 @@ final class _lushr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::unsignedShiftRight($value1, $value2, 8));
     }
diff --git a/src/Utilities/BinaryTool.php b/src/Utilities/BinaryTool.php
@@ -135,9 +135,9 @@ final public static function unsignedShiftRight($value1, $value2, $bytes)
     {
         $value1 = (int) $value1;
         $value2 = (int) $value2;
-        $bits = sprintf('%0' . ($bytes * 8) . 's', base_convert($value2, 10, 2));
+        $bits = sprintf('%0' . ($bytes * 8) . 's', base_convert($value1, 10, 2));
 
-        $bits = sprintf('%0' . ($bytes * 8) . 's', substr($bits, 0, strlen($bits) - $value1));
+        $bits = sprintf('%0' . ($bytes * 8) . 's', substr($bits, 0, strlen($bits) - $value2));
 
         if ($bits === '') {
             $bits = '0';
diff --git a/tests/BinaryOperatorTest.php b/tests/BinaryOperatorTest.php
@@ -0,0 +1,85 @@
+<?php
+namespace PHPJava\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class BinaryOperatorTest extends Base
+{
+    protected $fixtures = [
+        'BinaryOperatorTest',
+    ];
+
+    private function call($method, $value1, $value2)
+    {
+        $calculatedValue = $this->initiatedJavaClasses['BinaryOperatorTest']
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call($method, $value1, $value2);
+
+        return $calculatedValue->getValue();
+    }
+
+    public function testIntAdd()
+    {
+        $actual = $this->call('intAdd', 5, 3);
+        $this->assertEquals(8, $actual);
+    }
+
+    public function testIntSub()
+    {
+        $actual = $this->call('intSub', 5, 3);
+        $this->assertEquals(2, $actual);
+    }
+
+    public function testIntMul()
+    {
+        $actual = $this->call('intMul', 5, 3);
+        $this->assertEquals(15, $actual);
+    }
+
+    public function testIntShl()
+    {
+        $actual = $this->call('intShl', 3, 2);
+        $this->assertEquals(12, $actual);
+    }
+
+    public function testIntShr()
+    {
+        $actual = $this->call('intShr', 12, 2);
+        $this->assertEquals(3, $actual);
+    }
+
+    public function testIntUshr()
+    {
+        $actual = $this->call('intUshr', 12, 2);
+        $this->assertEquals(3, $actual);
+    }
+
+    public function testIntAnd()
+    {
+        $value1 = (int) base_convert('0011', 2, 10);
+        $value2 = (int) base_convert('0101', 2, 10);
+        $expect = (int) base_convert('0001', 2, 10);
+        $actual = $this->call('intAnd', $value1, $value2);
+        $this->assertEquals($expect, $actual);
+    }
+
+    public function testIntOr()
+    {
+        $value1 = (int) base_convert('0011', 2, 10);
+        $value2 = (int) base_convert('0101', 2, 10);
+        $expect = (int) base_convert('0111', 2, 10);
+        $actual = $this->call('intOr', $value1, $value2);
+        $this->assertEquals($expect, $actual);
+    }
+
+    public function testIntXor()
+    {
+        $value1 = (int) base_convert('0011', 2, 10);
+        $value2 = (int) base_convert('0101', 2, 10);
+        $expect = (int) base_convert('0110', 2, 10);
+        $actual = $this->call('intXor', $value1, $value2);
+        $this->assertEquals($expect, $actual);
+    }
+}
diff --git a/tests/BranchIfTest.php b/tests/BranchIfTest.php
diff --git a/tests/fixtures/java/BinaryOperatorTest.java b/tests/fixtures/java/BinaryOperatorTest.java
diff --git a/tests/fixtures/java/BranchIfTest.java b/tests/fixtures/java/BranchIfTest.java

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _dadd implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $value1 = $this->getStack();`
`15`	`14`	`$value2 = $this->getStack();`
	`15`	`+ $value1 = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::add($value1, $value2));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _dmul implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $value1 = $this->getStack();`
`15`	`14`	`$value2 = $this->getStack();`
	`15`	`+ $value1 = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::multiply($value1, $value2, 8));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _dsub implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $leftValue = $this->getStack();`
`15`	`14`	`$rightValue = $this->getStack();`
	`15`	`+ $leftValue = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::sub($leftValue, $rightValue, 8));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _iadd implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $leftValue = $this->getStack();`
`15`	`14`	`$rightValue = $this->getStack();`
	`15`	`+ $leftValue = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::add($leftValue, $rightValue));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _iand implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $value1 = $this->getStack();`
`15`	`14`	`$value2 = $this->getStack();`
	`15`	`+ $value1 = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::andBits($value1, $value2, 4));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public function execute(): void`
`13`	`13`	`{`
`14`	`14`	`$offset = $this->readShort();`
`15`	`15`
`16`		`- $leftOperand = $this->getStack();`
`17`	`16`	`$rightOperand = $this->getStack();`
	`17`	`+ $leftOperand = $this->getStack();`
`18`	`18`
`19`	`19`	`if ($leftOperand === $rightOperand) {`
`20`	`20`	`$this->setOffset($this->getProgramCounter() + $offset);`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ public function execute(): void`
`13`	`13`	`{`
`14`	`14`	`$offset = $this->readShort();`
`15`	`15`
`16`		`- $leftOperand = $this->getStack();`
`17`	`16`	`$rightOperand = $this->getStack();`
	`17`	`+ $leftOperand = $this->getStack();`
`18`	`18`
`19`		`- if ($leftOperand <= $rightOperand) {`
	`19`	`+ if ($leftOperand >= $rightOperand) {`
`20`	`20`	`$this->setOffset($this->getProgramCounter() + $offset);`
`21`	`21`	`}`
`22`	`22`	`}`