paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-16 01:30:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* track wasm global types in the internal object writer

Browse Source
This commit is contained in:
Nikolay Nikolov 2021-09-27 03:03:57 +03:00
parent 812732cb6a
commit 5ad2d47e23
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/assemble.pas
View File

@ -1838,6 +1838,8 @@ Implementation
end;
end;
{$ifdef WASM}
ait_globaltype:
TWasmObjData(ObjData).DeclareGlobalType(tai_globaltype(hp));
ait_functype:
TWasmObjData(ObjData).DeclareFuncType(tai_functype(hp));
ait_export_name:

21
compiler/ogwasm.pas
View File

@ -70,6 +70,7 @@ interface
ImportModule: string;
ImportName: string;
ExportName: string;
GlobalType: TWasmBasicType;
Locals: array of TWasmBasicType;
constructor Create(HashObjectList: TFPHashObjectList; const s: TSymStr);
procedure AddLocal(bastyp: TWasmBasicType);
@ -103,6 +104,7 @@ interface
procedure writeReloc(Data:TRelocDataInt;len:aword;p:TObjSymbol;Reloctype:TObjRelocationType);override;
function AddOrCreateObjSymbolExtraData(const symname:TSymStr): TWasmObjSymbolExtraData;
function AddFuncType(wft: TWasmFuncType): integer;
procedure DeclareGlobalType(gt: tai_globaltype);
procedure DeclareFuncType(ft: tai_functype);
procedure DeclareExportName(en: tai_export_name);
procedure DeclareImportModule(aim: tai_import_module);
@ -637,6 +639,14 @@ implementation
FFuncTypes[result]:=TWasmFuncType.Create(wft);
end;
procedure TWasmObjData.DeclareGlobalType(gt: tai_globaltype);
var
ObjSymExtraData: TWasmObjSymbolExtraData;
begin
ObjSymExtraData:=AddOrCreateObjSymbolExtraData(gt.globalname);
ObjSymExtraData.GlobalType:=gt.gtype;
end;
procedure TWasmObjData.DeclareFuncType(ft: tai_functype);
var
i: Integer;
@ -816,8 +826,17 @@ implementation
end;
function TWasmObjOutput.IsExternalFunction(sym: TObjSymbol): Boolean;
var
ExtraData: TWasmObjSymbolExtraData;
begin
result:=(sym.bind=AB_EXTERNAL) and (TWasmObjData(sym.ObjData).FObjSymbolsExtraDataList.Find(sym.Name)<>nil);
if sym.bind=AB_EXTERNAL then
begin
ExtraData:=TWasmObjSymbolExtraData(TWasmObjData(sym.ObjData).FObjSymbolsExtraDataList.Find(sym.Name));
result:=(ExtraData<>nil) and (ExtraData.TypeIdx<>-1);
end
else
result:=false;
end;
function TWasmObjOutput.IsExportedFunction(sym: TWasmObjSymbol): Boolean;