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

+ wasm resource writer: add the file data segment offset when writing relocations

Browse Source
This commit is contained in:
Nikolay Nikolov 2024-06-27 09:39:56 +03:00
parent 1073729336
commit f2717b8dc0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fcl-res/src/wasmwriter.pp
View File

@ -45,6 +45,7 @@ type
fDataCurOfs : longword;
FWasmSections: array [TWasmSectionID] of TMemoryStream;
FDataSegments: array [TWasmResourceDataSegment] of TMemoryStream;
FDataSegmentFileSectionOfs: array [TWasmResourceDataSegment] of Int64;
FDataRelocations: array of TWasmRelocationEntry;
FWasmCustomSections: array [TWasmCustomSectionType] of TMemoryStream;
FWasmLinkingSubsections: array [low(TWasmLinkingSubsectionType)..high(TWasmLinkingSubsectionType)] of TMemoryStream;
@ -180,14 +181,19 @@ end;
procedure TWasmResourceWriter.WriteRelocationDataTable(DataSectionIndex: Integer);
var
i: Integer;
s: TWasmResourceDataSegment;
begin
WriteUleb(FWasmCustomSections[wcstRelocData],DataSectionIndex);
WriteUleb(FWasmCustomSections[wcstRelocData],Length(FDataRelocations));
for i:=0 to Length(FDataRelocations)-1 do
with FDataRelocations[i] do
begin
if Offset<FDataSegments[wrdsResources].Size then
s:=wrdsResources
else
s:=wrdsResHandles;
FWasmCustomSections[wcstRelocData].WriteByte(Ord(Typ));
WriteUleb(FWasmCustomSections[wcstRelocData],Offset);
WriteUleb(FWasmCustomSections[wcstRelocData],Offset+FDataSegmentFileSectionOfs[s]);
WriteUleb(FWasmCustomSections[wcstRelocData],Index);
if Typ in [R_WASM_MEMORY_ADDR_I32,
R_WASM_MEMORY_ADDR_I64,
@ -313,6 +319,7 @@ begin
WriteSleb(FWasmSections[wsiData],ofs);
FWasmSections[wsiData].WriteByte($0b);
WriteUleb(FWasmSections[wsiData],FDataSegments[ds].Size);
FDataSegmentFileSectionOfs[ds]:=FWasmSections[wsiData].size;
if FDataSegments[ds].Size>0 then
begin
FWasmSections[wsiData].CopyFrom(FDataSegments[ds], 0);