Optimized binary reader

m3m0r7 · m3m0r7 · commit ea80d374df43 · 2019-04-30T15:26:54.000+09:00
diff --git a/src/Core/JVM/AttributePool.php b/src/Core/JVM/AttributePool.php
@@ -20,10 +20,12 @@ public function __construct(
         $this->reader = $reader;
         for ($i = 0; $i < $entries; $i++) {
             // not implemented, read only
-            $this->entries[$i] = new AttributeInfo($reader);
-            $this->entries[$i]->setConstantPool($constantPool);
-            $this->entries[$i]->setDebugTool($debugTool);
-            $this->entries[$i]->execute();
+            $entry = (new AttributeInfo($reader))
+                ->setConstantPool($constantPool)
+                ->setDebugTool($debugTool);
+            $entry->execute();
+
+            $this->entries[] = $entry;
         }
     }
 
diff --git a/src/Core/JVM/Stream/BinaryReader.php b/src/Core/JVM/Stream/BinaryReader.php
@@ -35,17 +35,17 @@ public function readByte()
 
     public function readUnsignedByte()
     {
-        return (int) sprintf('%u', ord($this->read(1)));
+        return current(unpack('C', $this->read(1)));
     }
 
     public function readUnsignedInt()
     {
-        return base_convert(bin2hex($this->read(4)), 16, 10);
+        return current(unpack('N', $this->read(4)));
     }
 
     public function readUnsignedShort()
     {
-        return (int) sprintf('%u', hexdec(bin2hex($this->read(2))));
+        return current(unpack('n', $this->read(2)));
     }
 
     public function readInt()
@@ -57,16 +57,12 @@ public function readInt()
     public function readShort()
     {
         $short = $this->readUnsignedShort();
-        return (($short & 0x8000) > 0) ? ($short - 0xFFFF - 1) : $short ;
+        return (($short & 0x8000) > 0) ? ($short - 0xFFFF - 1) : $short;
     }
 
     public function readUnsignedLong()
     {
-        if (PHP_INT_MAX === 2147483647) {
-            return base_convert(bin2hex($this->read(8)), 16, 10);
-        }
-
-        return (int) sprintf('%u', hexdec(bin2hex($this->read(8))));
+        return current(unpack('J', $this->read(8)));
     }
 
     public function readLong()
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -224,6 +224,8 @@ public function __construct(ReaderInterface $reader, array $options = [])
             $options
         );
 
+        var_dump(microtime(true) - $this->startTime);
+
         if ($this->invoker->getStatic()->getMethods()->has('<clinit>')) {
             $this->invoker
                 ->getStatic()

Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,17 @@ public function readByte()`
`35`	`35`
`36`	`36`	`public function readUnsignedByte()`
`37`	`37`	`{`
`38`		`- return (int) sprintf('%u', ord($this->read(1)));`
	`38`	`+ return current(unpack('C', $this->read(1)));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function readUnsignedInt()`
`42`	`42`	`{`
`43`		`- return base_convert(bin2hex($this->read(4)), 16, 10);`
	`43`	`+ return current(unpack('N', $this->read(4)));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function readUnsignedShort()`
`47`	`47`	`{`
`48`		`- return (int) sprintf('%u', hexdec(bin2hex($this->read(2))));`
	`48`	`+ return current(unpack('n', $this->read(2)));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function readInt()`
`@@ -57,16 +57,12 @@ public function readInt()`
`57`	`57`	`public function readShort()`
`58`	`58`	`{`
`59`	`59`	`$short = $this->readUnsignedShort();`
`60`		`- return (($short & 0x8000) > 0) ? ($short - 0xFFFF - 1) : $short ;`
	`60`	`+ return (($short & 0x8000) > 0) ? ($short - 0xFFFF - 1) : $short;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function readUnsignedLong()`
`64`	`64`	`{`
`65`		`- if (PHP_INT_MAX === 2147483647) {`
`66`		`- return base_convert(bin2hex($this->read(8)), 16, 10);`
`67`		`- }`
`68`		`-`
`69`		`- return (int) sprintf('%u', hexdec(bin2hex($this->read(8))));`
	`65`	`+ return current(unpack('J', $this->read(8)));`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`public function readLong()`