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

+ wasm resource writer: actually write the data relocation table

Browse Source 
+ add symbols for the data segments
+ use R_WASM_MEMORY_ADDR_I32 relocations instead of R_WASM_MEMORY_ADDR_I32 in
  R_WASM_MEMORY_ADDR_I32
This commit is contained in:
Nikolay Nikolov 2024-06-27 09:27:46 +03:00
parent 8b356c7f60
commit 1073729336
1 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ type
procedure PrescanResourceTree; procedure PrescanResourceTree;
function PrescanNode(aNode : TResourceTreeNode; aNodeSize : longword) : longword; function PrescanNode(aNode : TResourceTreeNode; aNodeSize : longword) : longword;
procedure AddDataRelocation(aTyp: TWasmRelocationType; aOffset: UInt32; aIndex: UInt32; aAddend: Int32 = 0); procedure AddDataRelocation(aTyp: TWasmRelocationType; aOffset: UInt32; aIndex: UInt32; aAddend: Int32 = 0);
procedure WriteRelocationDataTable(DataSectionIndex: Integer);
procedure WriteResHeader(aResources : TResources); procedure WriteResHeader(aResources : TResources);
procedure WriteWasmSection(aStream: TStream; wsid: TWasmSectionID); procedure WriteWasmSection(aStream: TStream; wsid: TWasmSectionID);
procedure WriteWasmSectionIfNotEmpty(aStream: TStream; wsid: TWasmSectionID); procedure WriteWasmSectionIfNotEmpty(aStream: TStream; wsid: TWasmSectionID);
@ -176,6 +177,30 @@ begin
end; end;
end; end;
procedure TWasmResourceWriter.WriteRelocationDataTable(DataSectionIndex: Integer);
var
i: Integer;
begin
WriteUleb(FWasmCustomSections[wcstRelocData],DataSectionIndex);
WriteUleb(FWasmCustomSections[wcstRelocData],Length(FDataRelocations));
for i:=0 to Length(FDataRelocations)-1 do
with FDataRelocations[i] do
begin
FWasmCustomSections[wcstRelocData].WriteByte(Ord(Typ));
WriteUleb(FWasmCustomSections[wcstRelocData],Offset);
WriteUleb(FWasmCustomSections[wcstRelocData],Index);
if Typ in [R_WASM_MEMORY_ADDR_I32,
R_WASM_MEMORY_ADDR_I64,
R_WASM_MEMORY_ADDR_LEB,
R_WASM_MEMORY_ADDR_LEB64,
R_WASM_MEMORY_ADDR_SLEB,
R_WASM_MEMORY_ADDR_SLEB64,
R_WASM_FUNCTION_OFFSET_I32,
R_WASM_SECTION_OFFSET_I32] then
WriteSleb(FWasmCustomSections[wcstRelocData],Addend);
end;
end;
procedure TWasmResourceWriter.WriteResHeader(aResources: TResources); procedure TWasmResourceWriter.WriteResHeader(aResources: TResources);
var hdr : TResHdr32; var hdr : TResHdr32;
begin begin
@ -192,9 +217,9 @@ begin
hdr.rootptr:=sizeof(hdr); hdr.rootptr:=sizeof(hdr);
//fRelocTable.Add(0,sizeof(hdr),RSRCSECT_IDX); //fRelocTable.Add(0,sizeof(hdr),RSRCSECT_IDX);
AddDataRelocation(R_WASM_SECTION_OFFSET_I32,0,Ord(wrdsResources),sizeof(hdr)); AddDataRelocation(R_WASM_MEMORY_ADDR_I32,0,Ord(wrdsResources),sizeof(hdr));
//fRelocTable.Add(sizeof(hdr.rootptr)+sizeof(hdr.count)+sizeof(hdr.usedhandles),0,HANDLESECT_IDX); //fRelocTable.Add(sizeof(hdr.rootptr)+sizeof(hdr.count)+sizeof(hdr.usedhandles),0,HANDLESECT_IDX);
AddDataRelocation(R_WASM_SECTION_OFFSET_I32,sizeof(hdr.rootptr)+sizeof(hdr.count)+sizeof(hdr.usedhandles),Ord(wrdsResHandles),0); AddDataRelocation(R_WASM_MEMORY_ADDR_I32,sizeof(hdr.rootptr)+sizeof(hdr.count)+sizeof(hdr.usedhandles),Ord(wrdsResHandles),0);
if fOppositeEndianess then if fOppositeEndianess then
begin begin
hdr.rootptr:=SwapEndian(hdr.rootptr); hdr.rootptr:=SwapEndian(hdr.rootptr);
@ -325,6 +350,22 @@ begin
WriteImportSection; WriteImportSection;
WriteDataSegments; WriteDataSegments;
Inc(FWasmSymbolTableEntriesCount);
FWasmSymbolTable.WriteByte(Ord(SYMTAB_DATA));
WriteUleb(FWasmSymbolTable,WASM_SYM_BINDING_LOCAL); { symbol flags }
WriteName(FWasmSymbolTable,WasmResourceDataSegmentNames[wrdsResources]);
WriteUleb(FWasmSymbolTable,0); { segment index }
WriteUleb(FWasmSymbolTable,0); { offset }
WriteUleb(FWasmSymbolTable,0); { size }
Inc(FWasmSymbolTableEntriesCount);
FWasmSymbolTable.WriteByte(Ord(SYMTAB_DATA));
WriteUleb(FWasmSymbolTable,WASM_SYM_BINDING_LOCAL); { symbol flags }
WriteName(FWasmSymbolTable,WasmResourceDataSegmentNames[wrdsResHandles]);
WriteUleb(FWasmSymbolTable,1); { segment index }
WriteUleb(FWasmSymbolTable,0); { offset }
WriteUleb(FWasmSymbolTable,0); { size }
Inc(FWasmSymbolTableEntriesCount); Inc(FWasmSymbolTableEntriesCount);
FWasmSymbolTable.WriteByte(Ord(SYMTAB_DATA)); FWasmSymbolTable.WriteByte(Ord(SYMTAB_DATA));
WriteUleb(FWasmSymbolTable,0); { symbol flags } WriteUleb(FWasmSymbolTable,0); { symbol flags }
@ -342,7 +383,9 @@ begin
WriteWasmSection(aStream,wsiImport); WriteWasmSection(aStream,wsiImport);
WriteWasmSection(aStream,wsiDataCount); WriteWasmSection(aStream,wsiDataCount);
WriteWasmSection(aStream,wsiData); WriteWasmSection(aStream,wsiData);
WriteRelocationDataTable(2);
WriteWasmCustomSection(aStream,wcstLinking); WriteWasmCustomSection(aStream,wcstLinking);
WriteWasmCustomSection(aStream,wcstRelocData);
end; end;
constructor TWasmResourceWriter.Create; constructor TWasmResourceWriter.Create;