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

* WebAssembly internal linker: add the data segment names to the name section

Browse Source
This commit is contained in:
Nikolay Nikolov 2024-09-20 16:28:14 +03:00
parent 083ac5c114
commit 33a389dfb7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/ogwasm.pas
View File

@ -298,9 +298,11 @@ interface
{ use for the Name section } { use for the Name section }
FFunctionNameMap: TCustomSectionNameMap; FFunctionNameMap: TCustomSectionNameMap;
FGlobalNameMap: TCustomSectionNameMap; FGlobalNameMap: TCustomSectionNameMap;
FDataNameMap: TCustomSectionNameMap;
procedure AddToNameMap(var nm: TCustomSectionNameMap; aidx: UInt32; const aname: string); procedure AddToNameMap(var nm: TCustomSectionNameMap; aidx: UInt32; const aname: string);
procedure AddToFunctionNameMap(aidx: UInt32; const aname: string); procedure AddToFunctionNameMap(aidx: UInt32; const aname: string);
procedure AddToGlobalNameMap(aidx: UInt32; const aname: string); procedure AddToGlobalNameMap(aidx: UInt32; const aname: string);
procedure AddToDataNameMap(aidx: UInt32; const aname: string);
procedure WriteWasmSection(wsid: TWasmSectionID); procedure WriteWasmSection(wsid: TWasmSectionID);
procedure WriteWasmSectionIfNotEmpty(wsid: TWasmSectionID); procedure WriteWasmSectionIfNotEmpty(wsid: TWasmSectionID);
procedure WriteWasmCustomSection(wcst: TWasmCustomSectionType); procedure WriteWasmCustomSection(wcst: TWasmCustomSectionType);
@ -4798,6 +4800,11 @@ implementation
AddToNameMap(FGlobalNameMap,aidx,aname); AddToNameMap(FGlobalNameMap,aidx,aname);
end; end;
procedure TWasmExeOutput.AddToDataNameMap(aidx: UInt32; const aname: string);
begin
AddToNameMap(FDataNameMap,aidx,aname);
end;
procedure TWasmExeOutput.WriteWasmSection(wsid: TWasmSectionID); procedure TWasmExeOutput.WriteWasmSection(wsid: TWasmSectionID);
var var
b: byte; b: byte;
@ -4895,6 +4902,7 @@ implementation
exesecdatapos: LongWord; exesecdatapos: LongWord;
dpos, pad: QWord; dpos, pad: QWord;
begin begin
AddToDataNameMap(Length(FDataNameMap),exesec.Name);
if ts_wasm_threads in current_settings.targetswitches then if ts_wasm_threads in current_settings.targetswitches then
WriteByte(FWasmSections[wsiData],1) { mode passive } WriteByte(FWasmSections[wsiData],1) { mode passive }
else else
@ -5150,10 +5158,12 @@ implementation
WriteNameMap(FFunctionNameMap,FWasmNameSubsections[wnstFunctionNames]); WriteNameMap(FFunctionNameMap,FWasmNameSubsections[wnstFunctionNames]);
WriteNameMap(FGlobalNameMap,FWasmNameSubsections[wnstGlobalNames]); WriteNameMap(FGlobalNameMap,FWasmNameSubsections[wnstGlobalNames]);
WriteNameMap(FDataNameMap,FWasmNameSubsections[wnstDataNames]);
WriteNameSubsection(wnstModuleName); WriteNameSubsection(wnstModuleName);
WriteNameSubsection(wnstFunctionNames); WriteNameSubsection(wnstFunctionNames);
WriteNameSubsection(wnstGlobalNames); WriteNameSubsection(wnstGlobalNames);
WriteNameSubsection(wnstDataNames);
end; end;
var var