perf: make *Addr/*Idx to primitive int

13 files changed, 16 insertions, 34 deletions

diff --git a/src/Structure/Modules/DataMode.php b/src/Structure/Modules/DataMode.php
index 08228d9..96cd7dc 100644
--- a/src/Structure/Modules/DataMode.php
+++ b/src/Structure/Modules/DataMode.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules;
 
 use Nsfisis\Waddiwasi\Structure\Instructions\Expr;
-use Nsfisis\Waddiwasi\Structure\Types\MemIdx;
 
 abstract readonly class DataMode
 {
@@ -15,7 +14,7 @@ abstract readonly class DataMode
     }
 
     final public static function Active(
-        MemIdx $memory,
+        int $memory,
         Expr $offset,
     ): DataModes\Active {
         return new DataModes\Active($memory, $offset);
diff --git a/src/Structure/Modules/DataModes/Active.php b/src/Structure/Modules/DataModes/Active.php
index 4e74ced..1a46f3e 100644
--- a/src/Structure/Modules/DataModes/Active.php
+++ b/src/Structure/Modules/DataModes/Active.php
@@ -6,12 +6,11 @@ namespace Nsfisis\Waddiwasi\Structure\Modules\DataModes;
 
 use Nsfisis\Waddiwasi\Structure\Instructions\Expr;
 use Nsfisis\Waddiwasi\Structure\Modules\DataMode;
-use Nsfisis\Waddiwasi\Structure\Types\MemIdx;
 
 final readonly class Active extends DataMode
 {
     protected function __construct(
-        public MemIdx $memory,
+        public int $memory,
         public Expr $offset,
     ) {
     }
diff --git a/src/Structure/Modules/ElemMode.php b/src/Structure/Modules/ElemMode.php
index d6496dd..051a7e1 100644
--- a/src/Structure/Modules/ElemMode.php
+++ b/src/Structure/Modules/ElemMode.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules;
 
 use Nsfisis\Waddiwasi\Structure\Instructions\Expr;
-use Nsfisis\Waddiwasi\Structure\Types\TableIdx;
 
 abstract readonly class ElemMode
 {
@@ -15,7 +14,7 @@ abstract readonly class ElemMode
     }
 
     final public static function Active(
-        TableIdx $table,
+        int $table,
         Expr $offset,
     ): ElemModes\Active {
         return new ElemModes\Active($table, $offset);
diff --git a/src/Structure/Modules/ElemModes/Active.php b/src/Structure/Modules/ElemModes/Active.php
index 06f3b41..bd5f123 100644
--- a/src/Structure/Modules/ElemModes/Active.php
+++ b/src/Structure/Modules/ElemModes/Active.php
@@ -6,12 +6,11 @@ namespace Nsfisis\Waddiwasi\Structure\Modules\ElemModes;
 
 use Nsfisis\Waddiwasi\Structure\Instructions\Expr;
 use Nsfisis\Waddiwasi\Structure\Modules\ElemMode;
-use Nsfisis\Waddiwasi\Structure\Types\TableIdx;
 
 final readonly class Active extends ElemMode
 {
     protected function __construct(
-        public TableIdx $table,
+        public int $table,
         public Expr $offset,
     ) {
     }
diff --git a/src/Structure/Modules/ExportDesc.php b/src/Structure/Modules/ExportDesc.php
index 7183c2a..06e67ba 100644
--- a/src/Structure/Modules/ExportDesc.php
+++ b/src/Structure/Modules/ExportDesc.php
@@ -4,29 +4,24 @@ declare(strict_types=1);
 
 namespace Nsfisis\Waddiwasi\Structure\Modules;
 
-use Nsfisis\Waddiwasi\Structure\Types\FuncIdx;
-use Nsfisis\Waddiwasi\Structure\Types\GlobalIdx;
-use Nsfisis\Waddiwasi\Structure\Types\MemIdx;
-use Nsfisis\Waddiwasi\Structure\Types\TableIdx;
-
 abstract readonly class ExportDesc
 {
-    final public static function Func(FuncIdx $func): ExportDescs\Func
+    final public static function Func(int $func): ExportDescs\Func
     {
         return new ExportDescs\Func($func);
     }
 
-    final public static function Table(TableIdx $table): ExportDescs\Table
+    final public static function Table(int $table): ExportDescs\Table
     {
         return new ExportDescs\Table($table);
     }
 
-    final public static function Mem(MemIdx $mem): ExportDescs\Mem
+    final public static function Mem(int $mem): ExportDescs\Mem
     {
         return new ExportDescs\Mem($mem);
     }
 
-    final public static function Global(GlobalIdx $global): ExportDescs\Global_
+    final public static function Global(int $global): ExportDescs\Global_
     {
         return new ExportDescs\Global_($global);
     }
diff --git a/src/Structure/Modules/ExportDescs/Func.php b/src/Structure/Modules/ExportDescs/Func.php
index 43dc039..dabd213 100644
--- a/src/Structure/Modules/ExportDescs/Func.php
+++ b/src/Structure/Modules/ExportDescs/Func.php
@@ -5,12 +5,11 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules\ExportDescs;
 
 use Nsfisis\Waddiwasi\Structure\Modules\ExportDesc;
-use Nsfisis\Waddiwasi\Structure\Types\FuncIdx;
 
 final readonly class Func extends ExportDesc
 {
     protected function __construct(
-        public FuncIdx $func,
+        public int $func,
     ) {
     }
 }
diff --git a/src/Structure/Modules/ExportDescs/Global_.php b/src/Structure/Modules/ExportDescs/Global_.php
index 4e87b4a..6fa15f9 100644
--- a/src/Structure/Modules/ExportDescs/Global_.php
+++ b/src/Structure/Modules/ExportDescs/Global_.php
@@ -5,12 +5,11 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules\ExportDescs;
 
 use Nsfisis\Waddiwasi\Structure\Modules\ExportDesc;
-use Nsfisis\Waddiwasi\Structure\Types\GlobalIdx;
 
 final readonly class Global_ extends ExportDesc
 {
     protected function __construct(
-        public GlobalIdx $global,
+        public int $global,
     ) {
     }
 }
diff --git a/src/Structure/Modules/ExportDescs/Mem.php b/src/Structure/Modules/ExportDescs/Mem.php
index 068963c..7eeebf2 100644
--- a/src/Structure/Modules/ExportDescs/Mem.php
+++ b/src/Structure/Modules/ExportDescs/Mem.php
@@ -5,12 +5,11 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules\ExportDescs;
 
 use Nsfisis\Waddiwasi\Structure\Modules\ExportDesc;
-use Nsfisis\Waddiwasi\Structure\Types\MemIdx;
 
 final readonly class Mem extends ExportDesc
 {
     protected function __construct(
-        public MemIdx $mem,
+        public int $mem,
     ) {
     }
 }
diff --git a/src/Structure/Modules/ExportDescs/Table.php b/src/Structure/Modules/ExportDescs/Table.php
index d9501bd..ff32cc0 100644
--- a/src/Structure/Modules/ExportDescs/Table.php
+++ b/src/Structure/Modules/ExportDescs/Table.php
@@ -5,12 +5,11 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules\ExportDescs;
 
 use Nsfisis\Waddiwasi\Structure\Modules\ExportDesc;
-use Nsfisis\Waddiwasi\Structure\Types\TableIdx;
 
 final readonly class Table extends ExportDesc
 {
     protected function __construct(
-        public TableIdx $table,
+        public int $table,
     ) {
     }
 }
diff --git a/src/Structure/Modules/Func.php b/src/Structure/Modules/Func.php
index c91e8e8..bab1889 100644
--- a/src/Structure/Modules/Func.php
+++ b/src/Structure/Modules/Func.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules;
 
 use Nsfisis\Waddiwasi\Structure\Instructions\Expr;
-use Nsfisis\Waddiwasi\Structure\Types\TypeIdx;
 
 final readonly class Func
 {
@@ -13,7 +12,7 @@ final readonly class Func
      * @param list<Local> $locals
      */
     public function __construct(
-        public TypeIdx $type,
+        public int $type,
         public array $locals,
         public Expr $body,
     ) {
diff --git a/src/Structure/Modules/ImportDesc.php b/src/Structure/Modules/ImportDesc.php
index a5f2b40..77bd928 100644
--- a/src/Structure/Modules/ImportDesc.php
+++ b/src/Structure/Modules/ImportDesc.php
@@ -7,11 +7,10 @@ namespace Nsfisis\Waddiwasi\Structure\Modules;
 use Nsfisis\Waddiwasi\Structure\Types\GlobalType;
 use Nsfisis\Waddiwasi\Structure\Types\MemType;
 use Nsfisis\Waddiwasi\Structure\Types\TableType;
-use Nsfisis\Waddiwasi\Structure\Types\TypeIdx;
 
 abstract readonly class ImportDesc
 {
-    final public static function Func(TypeIdx $func): ImportDescs\Func
+    final public static function Func(int $func): ImportDescs\Func
     {
         return new ImportDescs\Func($func);
     }
diff --git a/src/Structure/Modules/ImportDescs/Func.php b/src/Structure/Modules/ImportDescs/Func.php
index 8aa3e34..2bf373e 100644
--- a/src/Structure/Modules/ImportDescs/Func.php
+++ b/src/Structure/Modules/ImportDescs/Func.php
@@ -5,12 +5,11 @@ declare(strict_types=1);
 namespace Nsfisis\Waddiwasi\Structure\Modules\ImportDescs;
 
 use Nsfisis\Waddiwasi\Structure\Modules\ImportDesc;
-use Nsfisis\Waddiwasi\Structure\Types\TypeIdx;
 
 final readonly class Func extends ImportDesc
 {
     protected function __construct(
-        public TypeIdx $func,
+        public int $func,
     ) {
     }
 }
diff --git a/src/Structure/Modules/Start.php b/src/Structure/Modules/Start.php
index afb583b..1ef75df 100644
--- a/src/Structure/Modules/Start.php
+++ b/src/Structure/Modules/Start.php
@@ -4,12 +4,10 @@ declare(strict_types=1);
 
 namespace Nsfisis\Waddiwasi\Structure\Modules;
 
-use Nsfisis\Waddiwasi\Structure\Types\FuncIdx;
-
 final readonly class Start
 {
     public function __construct(
-        public FuncIdx $func,
+        public int $func,
     ) {
     }
 }