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

* use an incrementing counter variable to determine the numbers for the code

Browse Source 
and data section, so they can be used in the relocation section, without
  hardcoding them as constants. This will automatically adjust the numbers
  when we add more sections, or when we make writing some of the sections
  optional.
This commit is contained in:
Nikolay Nikolov 2021-09-26 23:10:55 +03:00
parent 77b898fe45
commit d37117c460
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/ogwasm.pas
View File

@ -1092,7 +1092,8 @@ implementation
segment_count: Integer = 0;
cur_seg_ofs: qword = 0;
types_count,
imports_count, NextImportFunctionIndex, NextFunctionIndex: Integer;
imports_count, NextImportFunctionIndex, NextFunctionIndex,
section_nr, code_section_nr, data_section_nr: Integer;
import_functions_count: Integer = 0;
export_functions_count: Integer = 0;
functions_count: Integer = 0;
@ -1319,22 +1320,39 @@ implementation
WriteLinkingSubsection(WASM_SYMBOL_TABLE);
WriteLinkingSubsection(WASM_SEGMENT_INFO);
WriteRelocationCodeTable(5); { code section is section #4 }
WriteRelocationDataTable(6); { code section is section #5 }
Writer.write(WasmModuleMagic,SizeOf(WasmModuleMagic));
Writer.write(WasmVersion,SizeOf(WasmVersion));
WriteWasmSection(wsiType); { section #0 }
WriteWasmSection(wsiImport); { section #1 }
WriteWasmSection(wsiFunction); { section #2 }
WriteWasmSection(wsiExport); { section #3 }
WriteWasmSection(wsiDataCount); { section #4 }
WriteWasmSection(wsiCode); { section #5 }
WriteWasmSection(wsiData); { section #6 }
WriteWasmCustomSection(wcstLinking); { section #7 }
WriteWasmCustomSection(wcstRelocCode); { section #8 }
WriteWasmCustomSection(wcstRelocData); { section #9 }
code_section_nr:=-1;
data_section_nr:=-1;
section_nr:=0;
WriteWasmSection(wsiType);
Inc(section_nr);
WriteWasmSection(wsiImport);
Inc(section_nr);
WriteWasmSection(wsiFunction);
Inc(section_nr);
WriteWasmSection(wsiExport);
Inc(section_nr);
WriteWasmSection(wsiDataCount);
Inc(section_nr);
WriteWasmSection(wsiCode);
code_section_nr:=section_nr;
Inc(section_nr);
WriteWasmSection(wsiData);
data_section_nr:=section_nr;
Inc(section_nr);
WriteRelocationCodeTable(code_section_nr);
WriteRelocationDataTable(data_section_nr);
WriteWasmCustomSection(wcstLinking);
Inc(section_nr);
WriteWasmCustomSection(wcstRelocCode);
Inc(section_nr);
WriteWasmCustomSection(wcstRelocData);
Inc(section_nr);
result:=true;
end;