paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-10 10:28:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ implement R_WASM_TABLE_INDEX_I32 relocations in the wasm internal linker

Browse Source
This commit is contained in:
Nikolay Nikolov 2024-01-01 16:41:03 +02:00
parent 1b2d29ea1a
commit 7a228bccfc
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/ogwasm.pas
View File

@ -49,6 +49,7 @@ interface
ImportName: string;
FuncType: TWasmFuncType;
ExeFunctionIndex: Integer;
ExeIndirectFunctionTableIndex: Integer;
ExeTypeIndex: Integer;
constructor Create;
@ -235,10 +236,15 @@ interface
TypeIdx: uint32;
end;
FIndirectFunctionTable: array of record
FuncIdx: Integer;
end;
FWasmSections: array [TWasmSectionID] of tdynamicarray;
procedure WriteWasmSection(wsid: TWasmSectionID);
procedure PrepareImports;
procedure PrepareFunctions;
function AddOrGetIndirectFunctionTableIndex(FuncIdx: Integer): integer;
protected
function writeData:boolean;override;
procedure DoRelocationFixup(objsec:TObjSection);override;
@ -521,6 +527,7 @@ implementation
constructor TWasmObjSymbolLinkingData.Create;
begin
ExeFunctionIndex:=-1;
ExeIndirectFunctionTableIndex:=-1;
ExeTypeIndex:=-1;
end;
@ -4216,6 +4223,15 @@ implementation
end;
procedure TWasmExeOutput.DoRelocationFixup(objsec: TObjSection);
procedure writeUInt32LE(v: uint32);
begin
{$ifdef FPC_BIG_ENDIAN}
v:=SwapEndian(v);
{$endif FPC_BIG_ENDIAN}
objsec.data.write(v,4);
end;
var
i: Integer;
objreloc: TWasmObjRelocation;
@ -4240,12 +4256,17 @@ implementation
case objsym.typ of
AT_FUNCTION:
begin
Writeln('TODO: function table index');
if objsym.LinkingData.ExeFunctionIndex=-1 then
internalerror(2024010103);
if objsym.LinkingData.ExeIndirectFunctionTableIndex=-1 then
objsym.LinkingData.ExeIndirectFunctionTableIndex:=AddOrGetIndirectFunctionTableIndex(objsym.LinkingData.ExeFunctionIndex);
objsec.Data.seek(objreloc.DataOffset);
writeUInt32LE(UInt32(objsym.LinkingData.ExeIndirectFunctionTableIndex));
end;
AT_DATA:
begin
objsec.Data.seek(objreloc.DataOffset);
objsec.writeUInt32LE(UInt32((objsym.offset+objsym.objsection.MemPos)+objreloc.Addend));
writeUInt32LE(UInt32((objsym.offset+objsym.objsection.MemPos)+objreloc.Addend));
end;
else
internalerror(2024010108);
@ -4276,6 +4297,8 @@ implementation
FFuncTypes:=TWasmFuncTypeTable.Create;
for i in TWasmSectionID do
FWasmSections[i] := tdynamicarray.create(SectionDataMaxGrow);
SetLength(FIndirectFunctionTable,1);
FIndirectFunctionTable[0].FuncIdx:=-1;
end;
destructor TWasmExeOutput.destroy;
@ -4430,6 +4453,21 @@ implementation
end;
end;
function TWasmExeOutput.AddOrGetIndirectFunctionTableIndex(FuncIdx: Integer): integer;
var
i: Integer;
begin
for i:=1 to length(FIndirectFunctionTable)-1 do
if FIndirectFunctionTable[i].FuncIdx=FuncIdx then
begin
Result:=i;
exit;
end;
SetLength(FIndirectFunctionTable,Length(FIndirectFunctionTable)+1);
Result:=High(FIndirectFunctionTable);
FIndirectFunctionTable[Result].FuncIdx:=FuncIdx;
end;
{****************************************************************************
TWasmAssembler