feature: added built-in types as a OS/RTL->VM decoupling mechanism

- Added src/wasm/types/wasm.types.builtin.pas as a decoupling unit.
- Updated all units to only use these types.
- Added linter step (lint.ps1) to enforce usage of these types.

README.md

@@ -0,0 +1,89 @@
+# WASURO
+
+A WebAssembly virtual machine for the [Asuro](https://gitea.spexeah.com/Spexeah/Asuro) operating system, written in Standard Pascal.
+
+WASURO parses and executes WASM binaries directly in a bare-metal kernel environment — no runtime library, no classes, no heap manager beyond what the OS provides.
+
+## Architecture
+
+```
+src/
+├── emu/               # OS emulation layer (types, console, memory, LEB128)
+├── wasm/              # WASM Virtual Machine
+│   ├── parser/        # WASM binary parser
+│   │   └── sections/  # Section-specific parsers (type, function, export,
+│   │                  #   code, global, memory, start, data, etc.)
+│   ├── types/         # WASM type system, stack, and linear memory (heap)
+│   ├── vm/            # VM tick loop and opcode jump table
+│   └── test/          # Test suite
+│       ├── infra/     # Stack, heap, LEB128 tests
+│       ├── opcodes/   # Per-opcode test units
+│       └── parsers/   # Per-section parser tests
+└── project/           # Lazarus project files
+```
+
+### Key components
+
+- **VM** (`wasm.vm`) — Tick-based execution loop dispatching opcodes through a 256-entry jump table.
+- **Parser** (`wasm.parser`) — Validates the WASM magic/version header, then routes each binary section to its handler.
+- **Stack** (`wasm.types.stack`) — Operand and control stacks supporting i32, i64, f32, f64 push/pop.
+- **Heap** (`wasm.types.heap`) — Paged linear memory with read/write at 8/16/32/64-bit widths.
+- **Emulation layer** (`src/emu/`) — Provides the same `types`, `console`, `lmemorymanager`, and `leb128` interfaces that exist in the real Asuro kernel, allowing development and testing on a host OS.
+
+### Implemented opcodes
+
+| Category | Opcodes |
+|---|---|
+| Control | `nop`, `unreachable`, `drop`, `select`, `return` |
+| Variables | `local.get/set/tee`, `global.get/set` |
+| Constants | `i32.const`, `i64.const`, `f32.const`, `f64.const` |
+| i32 Arithmetic | `add`, `sub`, `mul`, `div_s/u`, `rem_s/u`, `clz`, `ctz`, `popcnt` |
+| i32 Bitwise | `and`, `or`, `xor`, `shl`, `shr_s/u`, `rotl`, `rotr` |
+| i32 Comparison | `eqz`, `eq`, `ne`, `lt_s/u`, `gt_s/u`, `le_s/u`, `ge_s/u` |
+| i64 Arithmetic | `add`, `sub`, `mul`, `div_s/u`, `rem_s/u`, `clz`, `ctz`, `popcnt` |
+| i64 Bitwise | `and`, `or`, `xor`, `shl`, `shr_s/u`, `rotl`, `rotr` |
+| i64 Comparison | `eqz`, `eq`, `ne`, `lt_s/u`, `gt_s/u`, `le_s/u`, `ge_s/u` |
+| f32/f64 Comparison | `eq`, `ne`, `lt`, `gt`, `le`, `ge` |
+| Memory Loads | `i32/i64/f32/f64.load`, sign/zero-extending variants (8/16/32-bit) |
+| Memory Stores | `i32/i64/f32/f64.store`, narrowing variants (8/16/32-bit) |
+| Memory Mgmt | `memory.size`, `memory.grow` |
+
+### Parsed sections
+
+Type, Function, Export, Code, Global, Memory, Start, Data, Import (stub), Table (stub), Element (stub), Custom (stub).
+
+## Constraints
+
+- **Standard Pascal only** — no runtime library, no classes.
+- **Kernel-compatible** — all arithmetic (including `shr_s`) uses manual implementations, no RTL intrinsics.
+- **Emulation layer** — `src/emu/` mirrors the real Asuro kernel API; only these interfaces are available.
+
+## Requirements
+
+- [Free Pascal Compiler](https://www.freepascal.org/) 3.2.2+ (x86_64-win64)
+- Windows (build script is a `.bat` file)
+
+## Building
+
+```bat
+# Normal build
+build.bat
+
+# Build with test suite
+build.bat test
+```
+
+Output: `bin\WASURO.exe`
+
+## Testing
+
+```bat
+build.bat test
+bin\WASURO.exe
+```
+
+Runs 374 tests across 108 test units. Exit code equals the number of failed tests (0 on success), making it CI/CD-friendly.
+
+## License
+
+See repository for license details.

build.bat

@@ -13,6 +13,10 @@ if "%1"=="test" set TESTFLAGS=-dRUN_TESTS
 if not exist "%BIN%" mkdir "%BIN%"
 if not exist "%LIB%" mkdir "%LIB%"
 
+REM ── Lint ────────────────────────────────────────────────────────────
+powershell -NoProfile -ExecutionPolicy Bypass -File "%ROOT%lint.ps1" -SrcRoot "%SRC%"
+if %ERRORLEVEL% NEQ 0 exit /b 1
+
 "%FPC%" ^
   %TESTFLAGS% ^
   -FE"%BIN%" ^

lint.ps1

@@ -0,0 +1,48 @@
+# lint.ps1 — Static lint rules for the WASURO project
+# Called by build.bat before compilation. Exit 1 on any violation.
+param(
+    [string]$SrcRoot = (Join-Path $PSScriptRoot 'src')
+)
+
+$fail = $false
+
+# ── Rule: No native types in src\wasm ────────────────────────────────
+# All code under src\wasm must use TWASM* aliases from wasm.types.builtin.
+# Only wasm.types.builtin.pas itself may reference the raw types.
+$forbiddenTypes = @(
+    'uint8','uint16','uint32','uint64',
+    'sint8','sint16',
+    'int32','int64',
+    'float','double',
+    'puint8','puint16','puint32','puint64',
+    'pfloat','pdouble','pchar',
+    'boolean','char','void','integer'
+)
+$pattern = '(?i)(?<![a-z0-9_])(' + ($forbiddenTypes -join '|') + ')(?![a-z0-9_])'
+
+$files = Get-ChildItem (Join-Path $SrcRoot 'wasm') -Recurse -Filter '*.pas' |
+    Where-Object { $_.Name -ne 'wasm.types.builtin.pas' }
+
+$ruleHits = 0
+foreach ($file in $files) {
+    $content = [IO.File]::ReadAllText($file.FullName)
+    $matches = [regex]::Matches($content, $pattern)
+    if ($matches.Count -gt 0) {
+        $found = @{}
+        foreach ($m in $matches) { $found[$m.Value.ToLower()] = $true }
+        $list = ($found.Keys | Sort-Object) -join ', '
+        Write-Host "  $($file.Name): $list"
+        $ruleHits++
+    }
+}
+
+if ($ruleHits -gt 0) {
+    Write-Host ''
+    Write-Host "Lint failed: $ruleHits file(s) use native types. Use TWASM* from wasm.types.builtin instead."
+    $fail = $true
+}
+
+# ── Add more rules here ─────────────────────────────────────────────
+
+if ($fail) { exit 1 }
+Write-Host 'Lint passed.'

src/wasm/parser/sections/wasm.parser.sections.codeSection.pas

@@ -3,16 +3,16 @@ unit wasm.parser.sections.codeSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
 procedure printCtxCode(ctx : PWASMProcessContext);
 var
-    i : uint32;
+    i : TWASMUInt32;
 
 begin
     writestring('[wasm.parser]     Flat Code: ');
@@ -25,15 +25,15 @@ end;
 
 procedure walk(ctx : PWASMProcessContext);
 var
-   localpos, pos, bend : puint8;
-   bytesRead : uint8;
+   localpos, pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
    currentEntry : PWASMCodeEntry;
-   i,j,l : uint32;
-   localCount,localTemp,localIndex : uint32;
+   i,j,l : TWASMUInt32;
+   localCount,localTemp,localIndex : TWASMUInt32;
    localType: TWasmValueType;
-   codeLength: uint32;
-   codeOffset: uint32;
-   totalSize: uint32;
+   codeLength: TWASMUInt32;
+   codeOffset: TWASMUInt32;
+   totalSize: TWASMUInt32;
 begin
     // Walk the code entries
     for i:=1 to ctx^.Sections.CodeSection^.CodeCount do begin
@@ -59,17 +59,17 @@ begin
 end;
 
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   localpos, pos, bend : puint8;
-   bytesRead : uint8;
+   localpos, pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
    currentEntry : PWASMCodeEntry;
-   i,j,l : uint32;
-   localCount,localTemp,localIndex : uint32;
+   i,j,l : TWASMUInt32;
+   localCount,localTemp,localIndex : TWASMUInt32;
    localType: TWasmValueType;
-   codeLength: uint32;
-   codeOffset: uint32;
-   totalSize: uint32;
+   codeLength: TWASMUInt32;
+   codeOffset: TWASMUInt32;
+   totalSize: TWASMUInt32;
 
 begin
     writestring('[wasm.parser] Handle Section: Code - Size: ');
@@ -77,7 +77,7 @@ begin
 
     // Initialize the read/end pointers
     pos:= buffer;
-    bend:= puint8(pos + section_length);
+    bend:= TWASMPUInt8(pos + section_length);
 
     // Initialize the code section
     ctx^.Sections.CodeSection:= PWASMCodeSection(kalloc(sizeof(TWASMCodeSection)));
@@ -158,7 +158,7 @@ begin
             end;
 
             // Read the code
-            currentEntry^.Code:= puint8(kalloc(currentEntry^.CodeLength));
+            currentEntry^.Code:= TWASMPUInt8(kalloc(currentEntry^.CodeLength));
             for j:=1 to currentEntry^.CodeLength do begin
                 currentEntry^.Code[j - 1]:= pos^;
                 inc(pos);
@@ -171,12 +171,12 @@ begin
             totalSize:= totalSize + currentEntry^.CodeLength;
         end;
 
-        ctx^.ExecutionState.Code:= puint8(kalloc(totalSize));
+        ctx^.ExecutionState.Code:= TWASMPUInt8(kalloc(totalSize));
         ctx^.ExecutionState.Limit:= totalSize;
         localpos:= ctx^.ExecutionState.Code;
         for i:=1 to ctx^.Sections.CodeSection^.CodeCount do begin
             currentEntry:= @ctx^.Sections.CodeSection^.Entries[i - 1];
-            currentEntry^.CodeIndex:= uint32(localpos - ctx^.ExecutionState.Code);
+            currentEntry^.CodeIndex:= TWASMUInt32(localpos - ctx^.ExecutionState.Code);
             for j:=1 to currentEntry^.CodeLength do begin
                 localpos^:= currentEntry^.Code[j - 1];
                 inc(localpos);

src/wasm/parser/sections/wasm.parser.sections.customSection.pas

@@ -3,14 +3,14 @@ unit wasm.parser.sections.customSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 begin
     writestring('[wasm.parser] Handle Section: Custom - Size: ');
     writeintlnWND(section_length, 0);

src/wasm/parser/sections/wasm.parser.sections.dataSection.pas

@@ -3,31 +3,31 @@ unit wasm.parser.sections.dataSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types, wasm.types.heap;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   pos, bend : puint8;
-   bytesRead : uint8;
-   segCount : uint32;
-   i, j : uint32;
-   memIdx : uint32;
-   offset : uint32;
-   dataSize : uint32;
-   opcode : uint8;
-   tmpU32 : uint32;
+   pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
+   segCount : TWASMUInt32;
+   i, j : TWASMUInt32;
+   memIdx : TWASMUInt32;
+   offset : TWASMUInt32;
+   dataSize : TWASMUInt32;
+   opcode : TWASMUInt8;
+   tmpU32 : TWASMUInt32;
 
 begin
     writestring('[wasm.parser] Handle Section: Data - Size: ');
     writeintlnWND(section_length, 0);
 
     pos := buffer;
-    bend := puint8(buffer + section_length);
+    bend := TWASMPUInt8(buffer + section_length);
 
     { Read segment count }
     bytesRead := read_leb128_to_uint32(pos, bend, @segCount);

src/wasm/parser/sections/wasm.parser.sections.elementSection.pas

@@ -3,14 +3,14 @@ unit wasm.parser.sections.elementSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 begin
     writestring('[wasm.parser] Handle Section: Element - Size: ');
     writeintlnWND(section_length, 0);

src/wasm/parser/sections/wasm.parser.sections.exportSection.pas

@@ -3,17 +3,17 @@ unit wasm.parser.sections.exportSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
 procedure walk(ctx : PWASMProcessContext);
 var
    currentEntry : PWASMExportEntry;
-   i : uint32;
+   i : TWASMUInt32;
 
 begin
     // Walk the export entries
@@ -28,12 +28,12 @@ begin
     end;
 end;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   pos, bend : puint8;
-   bytesRead : uint8;
+   pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
    currentEntry : PWASMExportEntry;
-   i,j : uint32;
+   i,j : TWASMUInt32;
 
 begin
     writestring('[wasm.parser] Handle Section: Export - Size: ');
@@ -41,7 +41,7 @@ begin
 
     // Initialize the read/end pointers
     pos:= buffer;
-    bend:= puint8(pos + section_length);
+    bend:= TWASMPUInt8(pos + section_length);
 
     // Initialize the export section
     ctx^.Sections.ExportSection:= PWASMExportSection(kalloc(sizeof(TWASMExportSection)));
@@ -69,12 +69,12 @@ begin
             inc(pos, bytesRead);
 
             // Read the export name
-            currentEntry^.Name:= pchar(kalloc(currentEntry^.NameLength + 1));
+            currentEntry^.Name:= TWASMPChar(kalloc(currentEntry^.NameLength + 1));
             for j:=0 to currentEntry^.NameLength - 1 do begin
-                currentEntry^.Name[j]:= char(pos^);
+                currentEntry^.Name[j]:= TWASMChar(pos^);
                 inc(pos);
             end;
-            currentEntry^.Name[currentEntry^.NameLength]:= char($00);
+            currentEntry^.Name[currentEntry^.NameLength]:= TWASMChar($00);
 
             // Read the export type
             currentEntry^.ExportType:= TWasmExportType(pos^);

src/wasm/parser/sections/wasm.parser.sections.functionSection.pas

@@ -3,17 +3,17 @@ unit wasm.parser.sections.functionSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
 procedure walk(ctx : PWASMProcessContext);
 var
    currentFunc : PWASMFunction;
-   i : uint32;
+   i : TWASMUInt32;
 
 begin
     // Walk the functions
@@ -24,12 +24,12 @@ begin
     end;
 end;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   pos, bend : puint8;
-   bytesRead : uint8;
+   pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
    currentFunc : PWASMFunction;
-   i : uint32;
+   i : TWASMUInt32;
 
 begin
     writestring('[wasm.parser] Handle Section: Function - Size: ');
@@ -37,7 +37,7 @@ begin
 
     // Initialize the read/end pointers
     pos:= buffer;
-    bend:= puint8(pos + section_length);
+    bend:= TWASMPUInt8(pos + section_length);
 
     // Initialize the function section
     ctx^.Sections.FunctionSection:= PWASMFunctionSection(kalloc(sizeof(TWASMFunctionSection)));

src/wasm/parser/sections/wasm.parser.sections.globalSection.pas

@@ -3,16 +3,16 @@ unit wasm.parser.sections.globalSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
 procedure walk(ctx : PWASMProcessContext);
 var
-   i : uint32;
+   i : TWASMUInt32;
    entry : PWASMGlobalEntry;
 begin
     for i := 0 to ctx^.ExecutionState.Globals^.GlobalCount - 1 do begin
@@ -35,25 +35,25 @@ begin
     end;
 end;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   pos, bend : puint8;
-   bytesRead : uint8;
-   globalCount : uint32;
-   i : uint32;
+   pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
+   globalCount : TWASMUInt32;
+   i : TWASMUInt32;
    entry : PWASMGlobalEntry;
-   valType : uint8;
-   mutFlag : uint8;
-   opcode : uint8;
-   tmpU32 : uint32;
-   tmpU64 : uint64;
+   valType : TWASMUInt8;
+   mutFlag : TWASMUInt8;
+   opcode : TWASMUInt8;
+   tmpU32 : TWASMUInt32;
+   tmpU64 : TWASMUInt64;
 
 begin
     writestring('[wasm.parser] Handle Section: Global - Size: ');
     writeintlnWND(section_length, 0);
 
     pos := buffer;
-    bend := puint8(buffer + section_length);
+    bend := TWASMPUInt8(buffer + section_length);
 
     { Read global count }
     bytesRead := read_leb128_to_uint32(pos, bend, @globalCount);
@@ -88,19 +88,19 @@ begin
             $41: begin { i32.const }
                 bytesRead := read_leb128_to_uint32(pos, bend, @tmpU32);
                 Inc(pos, bytesRead);
-                entry^.Value.i32Value := int32(tmpU32);
+                entry^.Value.i32Value := TWASMInt32(tmpU32);
             end;
             $42: begin { i64.const }
                 bytesRead := read_leb128_to_uint64(pos, bend, @tmpU64);
                 Inc(pos, bytesRead);
-                entry^.Value.i64Value := int64(tmpU64);
+                entry^.Value.i64Value := TWASMInt64(tmpU64);
             end;
             $43: begin { f32.const }
-                entry^.Value.f32Value := pfloat(pos)^;
+                entry^.Value.f32Value := TWASMPFloat(pos)^;
                 Inc(pos, 4);
             end;
             $44: begin { f64.const }
-                entry^.Value.f64Value := pdouble(pos)^;
+                entry^.Value.f64Value := TWASMPDouble(pos)^;
                 Inc(pos, 8);
             end;
         else

src/wasm/parser/sections/wasm.parser.sections.importSection.pas

@@ -3,14 +3,14 @@ unit wasm.parser.sections.importSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 begin
     writestring('[wasm.parser] Handle Section: Import - Size: ');
     writeintlnWND(section_length, 0);

src/wasm/parser/sections/wasm.parser.sections.memorySection.pas

@@ -3,16 +3,16 @@ unit wasm.parser.sections.memorySection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types, wasm.types.heap;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
 procedure walk(ctx : PWASMProcessContext);
 var
-   i : uint32;
+   i : TWASMUInt32;
    mem : PWASMMemoryLimits;
 begin
     for i := 0 to ctx^.Sections.MemorySection^.MemoryCount - 1 do begin
@@ -29,21 +29,21 @@ begin
     end;
 end;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   pos, bend : puint8;
-   bytesRead : uint8;
-   memCount : uint32;
-   i : uint32;
+   pos, bend : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
+   memCount : TWASMUInt32;
+   i : TWASMUInt32;
    mem : PWASMMemoryLimits;
-   flags : uint32;
+   flags : TWASMUInt32;
 
 begin
     writestring('[wasm.parser] Handle Section: Memory - Size: ');
     writeintlnWND(section_length, 0);
 
     pos := buffer;
-    bend := puint8(buffer + section_length);
+    bend := TWASMPUInt8(buffer + section_length);
 
     { Read memory count }
     bytesRead := read_leb128_to_uint32(pos, bend, @memCount);

src/wasm/parser/sections/wasm.parser.sections.startSection.pas

@@ -3,25 +3,25 @@ unit wasm.parser.sections.startSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   bytesRead : uint8;
-   funcIdx : uint32;
+   bytesRead : TWASMUInt8;
+   funcIdx : TWASMUInt32;
 
 begin
     writestring('[wasm.parser] Handle Section: Start - Size: ');
     writeintlnWND(section_length, 0);
 
     { Read the start function index }
-    bytesRead := read_leb128_to_uint32(buffer, puint8(buffer + section_length), @funcIdx);
-    ctx^.Sections.StartIndex := int32(funcIdx);
+    bytesRead := read_leb128_to_uint32(buffer, TWASMPUInt8(buffer + section_length), @funcIdx);
+    ctx^.Sections.StartIndex := TWASMInt32(funcIdx);
 
     writestring('[wasm.parser]     Start Function Index: ');
     writeintlnWND(funcIdx, 0);

src/wasm/parser/sections/wasm.parser.sections.tableSection.pas

@@ -3,14 +3,14 @@ unit wasm.parser.sections.tableSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 begin
     writestring('[wasm.parser] Handle Section: Table - Size: ');
     writeintlnWND(section_length, 0);

src/wasm/parser/sections/wasm.parser.sections.typeSection.pas

@@ -3,10 +3,10 @@ unit wasm.parser.sections.typeSection;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 
 implementation
 
@@ -14,10 +14,10 @@ procedure walk(ctx : PWASMProcessContext);
 var
    currentType : PWASMType;
    currentParam : PWASMParam;
-   i,j : uint32;
+   i,j : TWASMUInt32;
 
 begin
-     // Walk the types
+     // Walk the wasm.types.builtin
      for i:=1 to ctx^.Sections.TypeSection^.TypeCount do begin
           currentType:= @ctx^.Sections.TypeSection^.Types[i - 1];
           writestring('[wasm.parser]     Index: ');
@@ -50,13 +50,13 @@ begin
      end;
 end;
 
-procedure handle(buffer: puint8; section_length: uint32; ctx: PWASMProcessContext);
+procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
 var
-   pos : puint8;
-   bytesRead : uint8;
+   pos : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
    currentType : PWASMType;
    currentParam : PWASMParam;
-   i, parsedTypes : uint32;
+   i, parsedTypes : TWASMUInt32;
 
 begin
      writestring('[wasm.parser] Handle Section: Type - Size: ');
@@ -67,31 +67,31 @@ begin
      ctx^.Sections.TypeSection:= PWASMTypeSection(kalloc(sizeof(TWASMTypeSection)));
      ctx^.Sections.TypeSection^.TypeCount:= 0;
 
-     // Read the number of function types
-     bytesRead:= read_leb128_to_uint32(buffer, puint8(buffer + section_length), @ctx^.Sections.TypeSection^.TypeCount);
+     // Read the number of function wasm.types.builtin
+     bytesRead:= read_leb128_to_uint32(buffer, TWASMPUInt8(buffer + section_length), @ctx^.Sections.TypeSection^.TypeCount);
      inc(pos, bytesRead);
 
-     // Read the function types
+     // Read the function wasm.types.builtin
      if(ctx^.Sections.TypeSection^.TypeCount > 0) then begin
           // Allocate the first type
           ctx^.Sections.TypeSection^.Types:= PWASMType(kalloc(sizeof(TWASMType) * ctx^.Sections.TypeSection^.TypeCount));
 
-          // Read the function types
+          // Read the function wasm.types.builtin
           for parsedTypes:=1 to ctx^.Sections.TypeSection^.TypeCount do begin
                currentType:= @ctx^.Sections.TypeSection^.Types[parsedTypes - 1];
 
                // Check if we are at the end of the buffer
-               if pos >= puint8(buffer + section_length) then Exit;
+               if pos >= TWASMPUInt8(buffer + section_length) then Exit;
 
                // Read the function type
                currentType^._type:= pos^;
                inc(pos);
 
                // Read the number of parameters
-               bytesRead:= read_leb128_to_uint32(pos, puint8(buffer + section_length), @currentType^.ParamCount);
+               bytesRead:= read_leb128_to_uint32(pos, TWASMPUInt8(buffer + section_length), @currentType^.ParamCount);
                inc(pos, bytesRead);
 
-               // Read the parameter types
+               // Read the parameter wasm.types.builtin
                if(currentType^.ParamCount > 0) then begin
                     currentType^.ParamTypes:= PWASMParam(kalloc(sizeof(TWASMParam) * currentType^.ParamCount));
                     for i:=1 to currentType^.ParamCount do begin
@@ -102,10 +102,10 @@ begin
                end;
 
                // Read the number of return values
-               bytesRead:= read_leb128_to_uint32(pos, puint8(buffer + section_length), @currentType^.ReturnCount);
+               bytesRead:= read_leb128_to_uint32(pos, TWASMPUInt8(buffer + section_length), @currentType^.ReturnCount);
                inc(pos, bytesRead);
 
-               // Read the return types
+               // Read the return wasm.types.builtin
                if(currentType^.ReturnCount > 0) then begin
                     currentType^.ReturnTypes:= PWASMParam(kalloc(sizeof(TWASMParam) * currentType^.ReturnCount));
                     for i:=1 to currentType^.ReturnCount do begin
@@ -117,7 +117,7 @@ begin
           end;
      end;
 
-     // Walk the types
+     // Walk the wasm.types.builtin
      walk(ctx);
 end;
 

src/wasm/parser/wasm.parser.pas

@@ -3,11 +3,11 @@ unit wasm.parser;
 interface
 
 uses
-    types, lmemorymanager, console, leb128,
+    wasm.types.builtin, lmemorymanager, console, leb128,
     wasm.types, wasm.types.heap, wasm.types.stack,
     wasm.parser.sections;
 
-function parse(buffer: puint8; buffer_end: puint8) : PWASMProcessContext;
+function parse(buffer: TWASMPUInt8; buffer_end: TWASMPUInt8) : PWASMProcessContext;
 
 implementation
 
@@ -50,13 +50,13 @@ begin
     newContext:= ctx;
 end;
 
-function parse(buffer: puint8; buffer_end: puint8): PWASMProcessContext;
+function parse(buffer: TWASMPUInt8; buffer_end: TWASMPUInt8): PWASMProcessContext;
 var
    ctx : PWASMProcessContext;
-   pos : puint8;
-   bytesRead : uint8;
-   section_id : uint8;
-   section_length : uint32;
+   pos : TWASMPUInt8;
+   bytesRead : TWASMUInt8;
+   section_id : TWASMUInt8;
+   section_length : TWASMUInt32;
 
 begin
     // Allocate the context
@@ -66,7 +66,7 @@ begin
     writestringln('[wasm.parser] Parsing WASM Binary');
 
     // Check for the WASM Magic
-    if(puint32(pos)^ = wasm.types.WASM_HDR_MAGIC) then begin
+    if(TWASMPUInt32(pos)^ = wasm.types.WASM_HDR_MAGIC) then begin
         writestringln('[wasm.parser] Binary is valid.');
 
         // Set binary to valid
@@ -74,7 +74,7 @@ begin
         inc(pos, 4);
 
         // Read the version
-        ctx^.Version:= puint32(pos)^;
+        ctx^.Version:= TWASMPUInt32(pos)^;
         inc(pos, 4);
         writestring('[wasm.parser] Version: ');
         writeintlnWND(ctx^.Version, 0);

src/wasm/parser/wasm.parser.sections.pas

@@ -3,7 +3,7 @@ unit wasm.parser.sections;
 interface
 
 uses
-    types,
+    wasm.types.builtin,
     wasm.types,
     wasm.parser.sections.customSection,
     wasm.parser.sections.typeSection,
@@ -18,11 +18,11 @@ uses
     wasm.parser.sections.codeSection,
     wasm.parser.sections.dataSection;
 
-procedure handle(sectionId : uint8; buffer : puint8; section_length : uint32; ctx : PWASMProcessContext);
+procedure handle(sectionId : TWASMUInt8; buffer : TWASMPUInt8; section_length : TWASMUInt32; ctx : PWASMProcessContext);
 
 implementation
 
-procedure handle(sectionId : uint8; buffer : puint8; section_length : uint32; ctx : PWASMProcessContext);
+procedure handle(sectionId : TWASMUInt8; buffer : TWASMPUInt8; section_length : TWASMUInt32; ctx : PWASMProcessContext);
 begin
     // Handle the section
     case sectionId of

src/wasm/test/infra/wasm.test.heap.pas

@@ -7,16 +7,16 @@ procedure run;
 implementation
 
 uses
-    types, wasm.types.heap, wasm.test.framework;
+    wasm.types.builtin, wasm.types.heap, wasm.test.framework;
 
 procedure run;
 var
     h : PWasmHeap;
-    v8 : uint8;
-    v16 : uint16;
-    v32 : uint32;
-    v64 : uint64;
-    ok : boolean;
+    v8 : TWASMUInt8;
+    v16 : TWASMUInt16;
+    v32 : TWASMUInt32;
+    v64 : TWASMUInt64;
+    ok : TWASMBoolean;
 begin
     test_begin('heap');
 
@@ -25,33 +25,33 @@ begin
     { Test: new heap has 1 page }
     assert_u32('new heap pagecount=1', h^.PageCount, 1);
 
-    { Test: write/read uint8 }
+    { Test: write/read TWASMUInt8 }
     ok := write_uint8(0, h, $AB);
     assert_bool('write_uint8 success', ok, true);
     ok := read_uint8(0, h, @v8);
     assert_bool('read_uint8 success', ok, true);
-    assert_u32('read_uint8 value', uint32(v8), $AB);
+    assert_u32('read_uint8 value', TWASMUInt32(v8), $AB);
 
-    { Test: write/read uint16 }
+    { Test: write/read TWASMUInt16 }
     ok := write_uint16(4, h, $1234);
     assert_bool('write_uint16 success', ok, true);
     ok := read_uint16(4, h, @v16);
     assert_bool('read_uint16 success', ok, true);
-    assert_u32('read_uint16 value', uint32(v16), $1234);
+    assert_u32('read_uint16 value', TWASMUInt32(v16), $1234);
 
-    { Test: write/read uint32 }
+    { Test: write/read TWASMUInt32 }
     ok := write_uint32(8, h, $DEADBEEF);
     assert_bool('write_uint32 success', ok, true);
     ok := read_uint32(8, h, @v32);
     assert_bool('read_uint32 success', ok, true);
     assert_u32('read_uint32 value', v32, $DEADBEEF);
 
-    { Test: write/read uint64 }
-    ok := write_uint64(16, h, uint64($CAFEBABE12345678));
+    { Test: write/read TWASMUInt64 }
+    ok := write_uint64(16, h, TWASMUInt64($CAFEBABE12345678));
     assert_bool('write_uint64 success', ok, true);
     ok := read_uint64(16, h, @v64);
     assert_bool('read_uint64 success', ok, true);
-    assert_u64('read_uint64 value', v64, uint64($CAFEBABE12345678));
+    assert_u64('read_uint64 value', v64, TWASMUInt64($CAFEBABE12345678));
 
     { Test: out of bounds read fails }
     ok := read_uint8($10000, h, @v8);

src/wasm/test/infra/wasm.test.leb128.pas

@@ -7,15 +7,15 @@ procedure run;
 implementation
 
 uses
-    types, leb128, wasm.test.framework;
+    wasm.types.builtin, leb128, wasm.test.framework;
 
 procedure run;
 var
-    buf : array[0..9] of uint8;
-    buf_end : puint8;
-    res32 : uint32;
-    res64 : uint64;
-    bytesRead : uint8;
+    buf : array[0..9] of TWASMUInt8;
+    buf_end : TWASMPUInt8;
+    res32 : TWASMUInt32;
+    res64 : TWASMUInt64;
+    bytesRead : TWASMUInt8;
 begin
     test_begin('leb128');
     buf_end := @buf[10];
@@ -24,13 +24,13 @@ begin
     buf[0] := $00;
     bytesRead := read_leb128_to_uint32(@buf[0], buf_end, @res32);
     assert_u32('u32 value=0', res32, 0);
-    assert_u32('u32 value=0 bytes=1', uint32(bytesRead), 1);
+    assert_u32('u32 value=0 bytes=1', TWASMUInt32(bytesRead), 1);
 
     { Test: single byte, value 42 }
     buf[0] := $2A;
     bytesRead := read_leb128_to_uint32(@buf[0], buf_end, @res32);
     assert_u32('u32 value=42', res32, 42);
-    assert_u32('u32 value=42 bytes=1', uint32(bytesRead), 1);
+    assert_u32('u32 value=42 bytes=1', TWASMUInt32(bytesRead), 1);
 
     { Test: single byte, value 127 }
     buf[0] := $7F;
@@ -42,7 +42,7 @@ begin
     buf[1] := $01;
     bytesRead := read_leb128_to_uint32(@buf[0], buf_end, @res32);
     assert_u32('u32 value=128', res32, 128);
-    assert_u32('u32 value=128 bytes=2', uint32(bytesRead), 2);
+    assert_u32('u32 value=128 bytes=2', TWASMUInt32(bytesRead), 2);
 
     { Test: two bytes, value 255 }
     buf[0] := $FF;
@@ -62,21 +62,21 @@ begin
     buf[2] := $26;
     bytesRead := read_leb128_to_uint32(@buf[0], buf_end, @res32);
     assert_u32('u32 value=624485', res32, 624485);
-    assert_u32('u32 value=624485 bytes=3', uint32(bytesRead), 3);
+    assert_u32('u32 value=624485 bytes=3', TWASMUInt32(bytesRead), 3);
 
-    { Test: uint64 single byte }
+    { Test: TWASMUInt64 single byte }
     buf[0] := $2A;
     bytesRead := read_leb128_to_uint64(@buf[0], buf_end, @res64);
     assert_u64('u64 value=42', res64, 42);
-    assert_u32('u64 value=42 bytes=1', uint32(bytesRead), 1);
+    assert_u32('u64 value=42 bytes=1', TWASMUInt32(bytesRead), 1);
 
-    { Test: uint64 two bytes }
+    { Test: TWASMUInt64 two bytes }
     buf[0] := $80;
     buf[1] := $01;
     bytesRead := read_leb128_to_uint64(@buf[0], buf_end, @res64);
     assert_u64('u64 value=128', res64, 128);
 
-    { Test: uint64 multi-byte }
+    { Test: TWASMUInt64 multi-byte }
     buf[0] := $E5;
     buf[1] := $8E;
     buf[2] := $26;

src/wasm/test/infra/wasm.test.stack.pas

@@ -7,7 +7,7 @@ procedure run;
 implementation
 
 uses
-    types, wasm.types, wasm.types.stack, wasm.test.framework;
+    wasm.types.builtin, wasm.types, wasm.types.stack, wasm.test.framework;
 
 procedure run;
 var