Refactor

m3m0r7 · Dec 29, 2023 · 32d5572 · 32d5572
1 parent a568cab
commit 32d5572
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/VM/Core/Runtime/Kernel/Ruby3/Kernel.php b/src/VM/Core/Runtime/Kernel/Ruby3/Kernel.php
@@ -133,6 +133,12 @@ protected function setupHeaders(): KernelInterface
         $this->magic = $this->stream()->read(4);
         $this->majorVersion = $this->stream()->readAsUnsignedLong();
         $this->minorVersion = $this->stream()->readAsUnsignedLong();
+        $this->size = $this->stream()->readAsUnsignedLong();
+        $this->extraSize = $this->stream()->readAsUnsignedLong();
+        $this->instructionSequenceListSize = $this->stream()->readAsUnsignedLong();
+        $this->globalObjectListSize = $this->stream()->readAsUnsignedLong();
+        $this->instructionSequenceListOffset = $this->stream()->readAsUnsignedLong();
+        $this->globalObjectListOffset = $this->stream()->readAsUnsignedLong();
 
         return $this;
     }

diff --git a/src/VM/Core/Runtime/Kernel/Ruby3_2/Kernel.php b/src/VM/Core/Runtime/Kernel/Ruby3_2/Kernel.php
@@ -33,12 +33,6 @@ protected function setupHeaders(): KernelInterface
     {
         parent::setupHeaders();
 
-        $this->size = $this->stream()->readAsUnsignedLong();
-        $this->extraSize = $this->stream()->readAsUnsignedLong();
-        $this->instructionSequenceListSize = $this->stream()->readAsUnsignedLong();
-        $this->globalObjectListSize = $this->stream()->readAsUnsignedLong();
-        $this->instructionSequenceListOffset = $this->stream()->readAsUnsignedLong();
-        $this->globalObjectListOffset = $this->stream()->readAsUnsignedLong();
         $this->rubyPlatform = $this->stream()->readAsString();
 
         return $this;

diff --git a/src/VM/Core/Runtime/Kernel/Ruby3_3/Kernel.php b/src/VM/Core/Runtime/Kernel/Ruby3_3/Kernel.php
@@ -37,14 +37,8 @@ protected function setupHeaders(): KernelInterface
     {
         parent::setupHeaders();
 
-        $this->size = $this->stream()->readAsUnsignedLong();
-        $this->extraSize = $this->stream()->readAsUnsignedLong();
-        $this->instructionSequenceListSize = $this->stream()->readAsUnsignedLong();
-        $this->globalObjectListSize = $this->stream()->readAsUnsignedLong();
-        $this->instructionSequenceListOffset = $this->stream()->readAsUnsignedLong();
-        $this->globalObjectListOffset = $this->stream()->readAsUnsignedLong();
-        $this->endian = $this->stream()->readAsShort();
-        $this->wordSize = $this->stream()->readAsShort();
+        $this->endian = $this->stream()->readAsUnsignedShort();
+        $this->wordSize = $this->stream()->readAsUnsignedShort();
 
         return $this;
     }