paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-22 03:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ wasm object reader: allow other sections to be created before the first code section

Browse Source
This commit is contained in:
Nikolay Nikolov 2024-01-02 20:25:54 +02:00
parent ff4744e0ed
commit 3724e00169
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/ogwasm.pas
View File

@ -3882,7 +3882,7 @@ implementation
var
ModuleMagic: array [0..3] of Byte;
ModuleVersion: array [0..3] of Byte;
i, j, FirstDataSegmentIdx, SegI: Integer;
i, j, FirstCodeSegmentIdx, FirstDataSegmentIdx, SegI: Integer;
CurrSec, ObjSec: TObjSection;
BaseSectionOffset: UInt32;
ObjReloc: TWasmObjRelocation;
@ -3940,6 +3940,7 @@ implementation
end;
{ create segments }
FirstCodeSegmentIdx:=ObjData.ObjSectionList.Count;
for i:=low(CodeSegments) to high(CodeSegments) do
with CodeSegments[i] do
begin
@ -4030,9 +4031,9 @@ implementation
objsym:=TWasmObjSymbol(ObjData.CreateSymbol(SymName));
objsym.bind:=AB_GLOBAL;
objsym.typ:=AT_FUNCTION;
objsym.objsection:=TObjSection(ObjData.ObjSectionList[SymIndex-FuncTypeImportsCount]);
objsym.objsection:=TObjSection(ObjData.ObjSectionList[FirstCodeSegmentIdx+SymIndex-FuncTypeImportsCount]);
if (SymFlags and WASM_SYM_EXPLICIT_NAME)=0 then
TWasmObjSection(ObjData.ObjSectionList[SymIndex-FuncTypeImportsCount]).MainFuncSymbol:=objsym;
TWasmObjSection(ObjData.ObjSectionList[FirstCodeSegmentIdx+SymIndex-FuncTypeImportsCount]).MainFuncSymbol:=objsym;
objsym.offset:=0;
objsym.size:=objsym.objsection.Size;
end;
@ -4119,7 +4120,7 @@ implementation
Exit;
end;
BaseSectionOffset:=CodeSegments[SegI].CodeSectionOffset;
ObjSec:=TObjSection(ObjData.ObjSectionList[SegI]);
ObjSec:=TObjSection(ObjData.ObjSectionList[FirstCodeSegmentIdx+SegI]);
end;
1:
begin