Compare commits

...
Author SHA1 Message Date
t3hn3rd b937e60838 feature: implement all float, conversion, table & bulk memory opcodes with IEEE 754 hardening
Complete implementation of remaining WASM MVP and post-MVP opcodes:

Float arithmetic (f32/f64):
- abs, neg (purely bitwise), ceil, floor, trunc, nearest, sqrt
- add, sub, mul, div with indeterminate form handling
  (Inf+(-Inf), Inf-Inf, Inf*0, 0/0, Inf/Inf -> NaN; x/0 -> ±Inf)
- min, max with signed-zero fix (OR for min, AND for max)
- copysign (bitwise sign transfer)

Float comparisons (f64 eq/ne/lt/gt/le/ge):
- Added bitwise NaN detection before comparisons to prevent EInvalidOp on x64 FPC

Conversion opcodes:
- i32.wrap_i64, i64.extend_i32_s/u
- i32/i64.trunc_f32/f64_s/u with NaN + overflow traps
- f32/f64.convert_i32/i64_s/u
- f32.demote_f64, f64.promote_f32
- i32/i64.reinterpret_f32/f64, f32/f64.reinterpret_i32/i64
- i32.extend8_s, i32.extend16_s, i64.extend8_s/16_s/32_s

0xFC prefix dispatch + saturating truncation (FC 00-07):
- i32/i64.trunc_sat_f32/f64_s/u with NaN->0, clamp to min/max

Bulk memory (FC 08-0B):
- memory.init, data.drop, memory.copy (overlap-safe), memory.fill

Table operations (FC 0C-11 + opcodes 0x25/0x26):
- table.get, table.set, table.init, elem.drop
- table.copy (overlap-safe), table.grow, table.size, table.fill

Control flow & infrastructure:
- select t* (typed select, 0x1C) with LEB128 type vector
- block/loop/if blocktype now parsed as LEB128 s33 (multi-byte support)
- Control flow scanner updated for all new opcodes (0xFC sub-opcodes,
  table.get/set, typed select)
- VM init: jump tables heap-allocated via kalloc, FC table initialized

All float ops use bitwise NaN detection to avoid FPC x64 EInvalidOp.
2026-02-24 21:45:10 +00:00
t3hn3rd 255ad4806e Merge branch 'feature/opcode-refactor' into develop 2026-02-24 15:38:48 +00:00
t3hn3rd 93dfff358d refactor: Split monolithic wasm.vm.opcodes.pas into 119 individual opcode units
- Extract each opcode procedure from wasm.vm.opcodes.pas into its own
unit file under src/wasm/vm/opcodes/ following the naming convention
wasm.vm.opcode.<name>.pas. The hub file now only imports the individual
units and contains initializeOpcodeJumpTable with fully qualified
procedure references.
- Add missing test coverage for the else opcode (4 tests), bringing the
total from 425 to 429 with all tests passing.

Files:
- 119 new opcode units under src/wasm/vm/opcodes/
- 1 new test: wasm.test.opcode.elseop.pas
- Modified: wasm.vm.opcodes.pas (hub-only), wasm.test.pas, build.bat
2026-02-24 15:38:36 +00:00
t3hn3rd 3ed5c0a847 Merge branch 'feature/build-clean' into develop 2026-02-24 14:57:43 +00:00
t3hn3rd ff65a0d5f0 refactor: build.bat flexible argument parsing, add run & help commands
- Replaced positional `%1` checks with a loop-based argument parser
  so flags (`test`, `clean`, `run`, `help`) work in any order/combination
- Added `run` flag: executes `bin\WASURO.exe` after a successful build
- Added `help` flag: prints usage info and exits
- Fixed `clean` early-exit to also check `DO_RUN` (not just `TESTFLAGS`),
  so `build.bat clean run` correctly continues to build+run
- Added section comment headers (Build, Run) for consistency
2026-02-24 14:57:30 +00:00
t3hn3rd 76d7d737c0 Merge branch 'feature/missing-opcodes' into develop 2026-02-24 14:47:01 +00:00
t3hn3rd d12ad11746 feature: implement control flow opcodes, extract constants & helpers
## Control Flow Opcodes
- Implemented all 10 remaining stub control flow opcodes:
  block, loop, if, else, end, br, br_if, br_table, call, call_indirect
- Rewrote return opcode to walk control stack and restore call frames
- Fixed tick() hang: now halts when IP >= Limit

## Refactoring
- Extracted WASM_HDR_MAGIC and CTRL_FRAME_* constants to wasm.types.constants.pas
- Extracted push_control_frame, scan_forward, do_branch helpers to wasm.vm.control.pas
- Updated wasm.parser.pas to reference constants via wasm.types.constants

## Tests
- Added 9 new test units (25 tests):
  block, loop, if, end, br, br_if, br_table, call, call_indirect
- Added E2E binary test: 115-byte handcrafted WASM binary exercising
  all control flow opcodes (2 functions, expected result=30)
- All 425/425 tests passing
2026-02-24 14:46:30 +00:00
t3hn3rd 679973c6e9 Merge branch 'feature/type-refactoring' into develop 2026-02-24 13:24:15 +00:00
t3hn3rd 68df3565cb feature: types refactored from one monolithic file to seperation of duties
- wasm.types.context.pas
- wasm.types.enums.pas
- wasm.types.sections.pas
- wasm.types.values.pas
2026-02-24 13:23:46 +00:00
t3hn3rd 862e3254df Merge branch 'hotfix/binary-test-builtins' into develop 2026-02-24 13:05:42 +00:00
t3hn3rd 6794c52a77 patch: binary-test patched to use builtin types 2026-02-24 13:05:33 +00:00
t3hn3rd 7cc4459dfd Merge branch 'feature/builtin-types' into develop 2026-02-24 13:04:25 +00:00
t3hn3rd ae344e7495 Merge branch 'feature/binary-tests' into develop 2026-02-24 13:04:20 +00:00
t3hn3rd 430ebcd203 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.
2026-02-24 13:03:27 +00:00
454 changed files with 15821 additions and 2739 deletions

No files matched your search

+1
View File
@@ -1,3 +1,4 @@
bin
lib
AGENTS.md
GAP_ANALYSIS.md
+39
View File
@@ -8,11 +8,43 @@ set LIB=%ROOT%lib
set FPC=C:\Lazarus\fpc\3.2.2\bin\x86_64-win64\fpc.exe
set TESTFLAGS=
set DO_CLEAN=0
set DO_RUN=0
:parse_args
if "%1"=="" goto args_done
if "%1"=="test" set TESTFLAGS=-dRUN_TESTS
if "%1"=="clean" set DO_CLEAN=1
if "%1"=="run" set DO_RUN=1
if "%1"=="help" (
echo Usage: build.bat [options]
echo Options:
echo test - Build with tests enabled
echo clean - Clean build outputs
echo run - Run the built executable after building
echo help - Show this help message
exit /b 0
)
shift
goto parse_args
:args_done
if %DO_CLEAN%==1 (
echo Cleaning build outputs...
if exist "%BIN%" rd /s /q "%BIN%"
if exist "%LIB%" rd /s /q "%LIB%"
echo Clean complete.
if "%TESTFLAGS%"=="" if %DO_RUN%==0 exit /b 0
)
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
REM ── Build ────────────────────────────────────────────────────────────
"%FPC%" ^
%TESTFLAGS% ^
-FE"%BIN%" ^
@@ -28,6 +60,7 @@ if not exist "%LIB%" mkdir "%LIB%"
-Fu"%SRC%\wasm\test\infra" ^
-Fu"%SRC%\wasm\types" ^
-Fu"%SRC%\wasm\vm" ^
-Fu"%SRC%\wasm\vm\opcodes" ^
-gw3 ^
-o"%BIN%\WASURO.exe" ^
"%SRC%\project\WASURO.lpr"
@@ -38,3 +71,9 @@ if %ERRORLEVEL% NEQ 0 (
)
echo Build succeeded: %BIN%\WASURO.exe
REM ── Run ────────────────────────────────────────────────────────────
if %DO_RUN%==1 (
echo Running WASURO...
"%BIN%\WASURO.exe"
)
+48
View File
@@ -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.'
+1 -1
View File
@@ -7,7 +7,7 @@ uses
types,
wasm.types,
wasm.types.context,
wasm.parser,
wasm.vm, wasm.test.binary.return42,
wasm.types.stack
@@ -3,16 +3,16 @@ unit wasm.parser.sections.codeSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.enums, wasm.types.values, wasm.types.sections, wasm.types.context;
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);
@@ -3,14 +3,14 @@ unit wasm.parser.sections.customSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.context;
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);
@@ -0,0 +1,44 @@
unit wasm.parser.sections.dataCountSection;
interface
uses
wasm.types.builtin, wasm.types.context;
procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
implementation
uses console, leb128, lmemorymanager, wasm.types.sections;
{ DataCount section (ID 12): contains a single u32 count of data segments.
Pre-allocates the DataSegments array so that bulk memory opcodes
can reference segments by index during validation. }
procedure handle(buffer: TWASMPUInt8; section_length: TWASMUInt32; ctx: PWASMProcessContext);
var
pos, bend : TWASMPUInt8;
bytesRead : TWASMUInt8;
dataCount : TWASMUInt32;
begin
writestring('[wasm.parser] Handle Section: DataCount - Size: ');
writeintlnWND(section_length, 0);
pos := buffer;
bend := TWASMPUInt8(buffer + section_length);
bytesRead := read_leb128_to_uint32(pos, bend, @dataCount);
Inc(pos, bytesRead);
writestring('[wasm.parser] Data Count: ');
writeintlnWND(dataCount, 0);
{ Pre-allocate data segment storage with correct count.
The actual segment data will be filled when the Data section is parsed. }
ctx^.ExecutionState.DataSegments^.SegmentCount := dataCount;
if dataCount > 0 then
ctx^.ExecutionState.DataSegments^.Segments := PWASMDataSegment(kalloc(dataCount * sizeof(TWASMDataSegment)))
else
ctx^.ExecutionState.DataSegments^.Segments := nil;
end;
end.
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
@@ -3,17 +3,17 @@ unit wasm.parser.sections.exportSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.enums, wasm.types.sections, wasm.types.context;
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^);
@@ -3,17 +3,17 @@ unit wasm.parser.sections.functionSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.sections, wasm.types.context;
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)));
@@ -3,16 +3,16 @@ unit wasm.parser.sections.globalSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.enums, wasm.types.sections, wasm.types.context;
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
File diff suppressed because it is too large. Load diff
@@ -3,16 +3,16 @@ unit wasm.parser.sections.memorySection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types, wasm.types.heap;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.sections, wasm.types.context, 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);
@@ -3,25 +3,25 @@ unit wasm.parser.sections.startSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.context;
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);
@@ -3,17 +3,86 @@ unit wasm.parser.sections.tableSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.sections, wasm.types.context;
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: TWASMPUInt8;
buf_end: TWASMPUInt8;
bytesRead: TWASMUInt8;
table_count, i, j, min_size, max_size: TWASMUInt32;
elem_type, limits_flag: TWASMUInt8;
tables: PWASMTables;
begin
writestring('[wasm.parser] Handle Section: Table - Size: ');
writeintlnWND(section_length, 0);
pos := buffer;
buf_end := buffer;
Inc(buf_end, section_length);
bytesRead := read_leb128_to_uint32(pos, buf_end, @table_count);
Inc(pos, bytesRead);
writestring('[wasm.parser] Tables: ');
writeintlnWND(table_count, 0);
tables := ctx^.ExecutionState.Tables;
tables^.TableCount := table_count;
if table_count > 0 then
tables^.Tables := PWASMTableInstance(kalloc(sizeof(TWASMTableInstance) * table_count))
else
tables^.Tables := nil;
for i := 0 to table_count - 1 do begin
elem_type := pos^;
Inc(pos);
limits_flag := pos^;
Inc(pos);
bytesRead := read_leb128_to_uint32(pos, buf_end, @min_size);
Inc(pos, bytesRead);
max_size := 0;
if limits_flag = 1 then begin
bytesRead := read_leb128_to_uint32(pos, buf_end, @max_size);
Inc(pos, bytesRead);
end;
writestring('[wasm.parser] Table ');
writeintWND(i, 0);
writestring(' - ElemType: $');
writeintWND(elem_type, 0);
writestring(' Initial: ');
writeintWND(min_size, 0);
if limits_flag = 1 then begin
writestring(' Max: ');
writeintWND(max_size, 0);
end;
writestringln('');
tables^.Tables[i].ElementType := elem_type;
tables^.Tables[i].Size := min_size;
tables^.Tables[i].HasMax := (limits_flag = 1);
if limits_flag = 1 then
tables^.Tables[i].MaxSize := max_size
else
tables^.Tables[i].MaxSize := 0;
{ Allocate elements and initialize to $FFFFFFFF (uninitialized) }
if min_size > 0 then begin
tables^.Tables[i].Elements := TWASMPUInt32(kalloc(sizeof(TWASMUInt32) * min_size));
for j := 0 to min_size - 1 do
tables^.Tables[i].Elements[j] := $FFFFFFFF;
end else
tables^.Tables[i].Elements := nil;
end;
end;
end.
@@ -3,10 +3,10 @@ unit wasm.parser.sections.typeSection;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.enums, wasm.types.values, wasm.types.sections, wasm.types.context;
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;
+27 -11
View File
@@ -3,11 +3,11 @@ unit wasm.parser;
interface
uses
types, lmemorymanager, console, leb128,
wasm.types, wasm.types.heap, wasm.types.stack,
wasm.parser.sections;
wasm.types.builtin, lmemorymanager, console, leb128,
wasm.types.enums, wasm.types.sections, wasm.types.context, wasm.types.heap, wasm.types.stack,
wasm.parser.sections, wasm.types.constants;
function parse(buffer: puint8; buffer_end: puint8) : PWASMProcessContext;
function parse(buffer: TWASMPUInt8; buffer_end: TWASMPUInt8) : PWASMProcessContext;
implementation
@@ -36,6 +36,7 @@ begin
// Initialize the sections
ctx^.Sections.TypeSection:= nil;
ctx^.Sections.ImportSection:= nil;
ctx^.Sections.FunctionSection:= nil;
ctx^.Sections.ExportSection:= nil;
ctx^.Sections.CodeSection:= nil;
@@ -47,16 +48,31 @@ begin
ctx^.ExecutionState.Globals^.GlobalCount:= 0;
ctx^.ExecutionState.Globals^.Globals:= nil;
// Initialize tables (empty until table section is parsed)
ctx^.ExecutionState.Tables:= PWASMTables(kalloc(sizeof(TWASMTables)));
ctx^.ExecutionState.Tables^.TableCount:= 0;
ctx^.ExecutionState.Tables^.Tables:= nil;
// Initialize data segments (empty until data section is parsed)
ctx^.ExecutionState.DataSegments:= PWASMDataSegments(kalloc(sizeof(TWASMDataSegments)));
ctx^.ExecutionState.DataSegments^.SegmentCount:= 0;
ctx^.ExecutionState.DataSegments^.Segments:= nil;
// Initialize element segments (empty until element section is parsed)
ctx^.ExecutionState.ElementSegments:= PWASMElementSegments(kalloc(sizeof(TWASMElementSegments)));
ctx^.ExecutionState.ElementSegments^.SegmentCount:= 0;
ctx^.ExecutionState.ElementSegments^.Segments:= nil;
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 +82,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.constants.WASM_HDR_MAGIC) then begin
writestringln('[wasm.parser] Binary is valid.');
// Set binary to valid
@@ -74,7 +90,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);
+8 -5
View File
@@ -3,8 +3,8 @@ unit wasm.parser.sections;
interface
uses
types,
wasm.types,
wasm.types.builtin,
wasm.types.enums, wasm.types.context,
wasm.parser.sections.customSection,
wasm.parser.sections.typeSection,
wasm.parser.sections.importSection,
@@ -16,13 +16,14 @@ uses
wasm.parser.sections.startSection,
wasm.parser.sections.elementSection,
wasm.parser.sections.codeSection,
wasm.parser.sections.dataSection;
wasm.parser.sections.dataSection,
wasm.parser.sections.dataCountSection;
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
@@ -50,6 +51,8 @@ begin
ord(sidCode): wasm.parser.sections.codeSection.handle (buffer, section_length, ctx);
// Data Section
ord(sidData): wasm.parser.sections.dataSection.handle (buffer, section_length, ctx);
// DataCount Section
ord(sidDataCount): wasm.parser.sections.dataCountSection.handle (buffer, section_length, ctx);
end;
end;
+86
View File
@@ -0,0 +1,86 @@
unit wasm.parser.validate;
interface
uses wasm.types.builtin, wasm.types.context;
{ Validates a parsed WASM module for structural consistency.
Returns true if valid, false otherwise.
Sets errorMsg to a description of the first error found. }
function validate_module(ctx : PWASMProcessContext; var errorMsg : TWASMPChar) : TWASMBoolean;
implementation
uses console;
function validate_module(ctx : PWASMProcessContext; var errorMsg : TWASMPChar) : TWASMBoolean;
var i : TWASMUInt32;
begin
validate_module := true;
{ Check 1: Binary must be valid (magic number was correct) }
if not ctx^.ValidBinary then begin
errorMsg := 'Invalid WASM binary: bad magic number';
validate_module := false;
exit;
end;
{ Check 2: Version must be 1 (MVP) }
if ctx^.Version <> 1 then begin
errorMsg := 'Unsupported WASM version (expected 1)';
validate_module := false;
exit;
end;
{ Check 3: If function section exists, code section must exist and counts must match }
if (ctx^.Sections.FunctionSection <> nil) then begin
if (ctx^.Sections.CodeSection = nil) then begin
errorMsg := 'Function section present but code section missing';
validate_module := false;
exit;
end;
if ctx^.Sections.FunctionSection^.FunctionCount <> ctx^.Sections.CodeSection^.CodeCount then begin
errorMsg := 'Function count does not match code count';
validate_module := false;
exit;
end;
end;
{ Check 4: If code section exists, function section must exist }
if (ctx^.Sections.CodeSection <> nil) then begin
if (ctx^.Sections.FunctionSection = nil) then begin
errorMsg := 'Code section present but function section missing';
validate_module := false;
exit;
end;
end;
{ Check 5: Function type indices must be within range of type section }
if (ctx^.Sections.FunctionSection <> nil) and (ctx^.Sections.TypeSection <> nil) then begin
for i := 0 to ctx^.Sections.FunctionSection^.FunctionCount - 1 do begin
if ctx^.Sections.FunctionSection^.Functions[i].Index >= ctx^.Sections.TypeSection^.TypeCount then begin
errorMsg := 'Function type index out of range';
validate_module := false;
exit;
end;
end;
end;
{ Check 6: Start function index must be within range }
if ctx^.Sections.StartIndex >= 0 then begin
if (ctx^.Sections.FunctionSection = nil) then begin
errorMsg := 'Start function specified but no function section';
validate_module := false;
exit;
end;
if TWASMUInt32(ctx^.Sections.StartIndex) >= ctx^.Sections.FunctionSection^.FunctionCount then begin
errorMsg := 'Start function index out of range';
validate_module := false;
exit;
end;
end;
errorMsg := nil;
end;
end.
Loaded 20 of 454 files, more files were not shown because too many files have changed in this diff. Show more