paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 15:49:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ write the type indexes correctly

Browse Source
This commit is contained in:
Nikolay Nikolov 2023-12-31 23:50:53 +02:00
parent f5dbd38b7e
commit 88a42c3ee0
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
compiler/ogwasm.pas
View File

@ -49,6 +49,7 @@ interface
ImportName: string; ImportName: string;
FuncType: TWasmFuncType; FuncType: TWasmFuncType;
ExeFunctionIndex: Integer; ExeFunctionIndex: Integer;
ExeTypeIndex: Integer;
constructor Create; constructor Create;
destructor Destroy;override; destructor Destroy;override;
@ -231,6 +232,7 @@ interface
FWasmSections: array [TWasmSectionID] of tdynamicarray; FWasmSections: array [TWasmSectionID] of tdynamicarray;
procedure WriteWasmSection(wsid: TWasmSectionID); procedure WriteWasmSection(wsid: TWasmSectionID);
procedure PrepareImports; procedure PrepareImports;
procedure PrepareFunctions;
protected protected
function writeData:boolean;override; function writeData:boolean;override;
procedure DoRelocationFixup(objsec:TObjSection);override; procedure DoRelocationFixup(objsec:TObjSection);override;
@ -494,6 +496,7 @@ implementation
constructor TWasmObjSymbolLinkingData.Create; constructor TWasmObjSymbolLinkingData.Create;
begin begin
ExeFunctionIndex:=-1; ExeFunctionIndex:=-1;
ExeTypeIndex:=-1;
end; end;
destructor TWasmObjSymbolLinkingData.Destroy; destructor TWasmObjSymbolLinkingData.Destroy;
@ -4072,7 +4075,7 @@ implementation
var var
i: Integer; i: Integer;
exesec: TExeSection; exesec: TExeSection;
objsec: TObjSection; objsec: TWasmObjSection;
begin begin
exesec:=FindExeSection('.text'); exesec:=FindExeSection('.text');
if not assigned(exesec) then if not assigned(exesec) then
@ -4083,12 +4086,12 @@ implementation
WriteUleb(FWasmSections[wsiCode],exesec.ObjSectionList.Count); WriteUleb(FWasmSections[wsiCode],exesec.ObjSectionList.Count);
for i:=0 to exesec.ObjSectionList.Count-1 do for i:=0 to exesec.ObjSectionList.Count-1 do
begin begin
objsec:=TObjSection(exesec.ObjSectionList[i]); objsec:=TWasmObjSection(exesec.ObjSectionList[i]);
if not (oso_data in objsec.secoptions) then if not (oso_data in objsec.secoptions) then
internalerror(2023123104); internalerror(2023123104);
if not assigned(objsec.data) then if not assigned(objsec.data) then
internalerror(2023123105); internalerror(2023123105);
WriteUleb(FWasmSections[wsiFunction],0); { todo: TypIdx } WriteUleb(FWasmSections[wsiFunction],objsec.MainFuncSymbol.LinkingData.ExeTypeIndex);
WriteUleb(FWasmSections[wsiCode],objsec.Data.size); WriteUleb(FWasmSections[wsiCode],objsec.Data.size);
objsec.Data.seek(0); objsec.Data.seek(0);
CopyDynamicArray(objsec.Data,FWasmSections[wsiCode],objsec.Data.size); CopyDynamicArray(objsec.Data,FWasmSections[wsiCode],objsec.Data.size);
@ -4172,6 +4175,7 @@ implementation
procedure TWasmExeOutput.AfterUnusedSectionRemoval; procedure TWasmExeOutput.AfterUnusedSectionRemoval;
begin begin
PrepareImports; PrepareImports;
PrepareFunctions;
end; end;
procedure TWasmExeOutput.PrepareImports; procedure TWasmExeOutput.PrepareImports;
@ -4221,6 +4225,33 @@ implementation
end; end;
end; end;
procedure TWasmExeOutput.PrepareFunctions;
var
i: Integer;
exesec: TExeSection;
objsec: TWasmObjSection;
fsym: TWasmObjSymbol;
begin
exesec:=FindExeSection('.text');
if not assigned(exesec) then
internalerror(2023123106);
for i:=0 to exesec.ObjSectionList.Count-1 do
begin
objsec:=TWasmObjSection(exesec.ObjSectionList[i]);
fsym:=objsec.MainFuncSymbol;
if not assigned(fsym) then
internalerror(2023123107);
if not assigned(fsym.LinkingData.FuncType) then
internalerror(2023123108);
if fsym.LinkingData.ExeFunctionIndex<>-1 then
internalerror(2023123109);
if fsym.LinkingData.ExeTypeIndex<>-1 then
internalerror(2023123109);
fsym.LinkingData.ExeTypeIndex:=FFuncTypes.AddOrGetFuncType(fsym.LinkingData.FuncType);
fsym.LinkingData.ExeFunctionIndex:=i+Length(FFunctionImports);
end;
end;
{**************************************************************************** {****************************************************************************
TWasmAssembler TWasmAssembler