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

+ emit a size directive for the internal dynarray const label. This fixes

Browse Source 
WebAssembly dynarray consts with the llvm-mc external asm.
This commit is contained in:
Nikolay Nikolov 2024-09-01 22:18:03 +03:00
parent ed07cd14b2
commit 28b080d9bc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/aasmcnst.pas
View File

@ -360,7 +360,7 @@ type
{ starts a dynamic array constant so that its data can be emitted directly afterwards } { starts a dynamic array constant so that its data can be emitted directly afterwards }
function begin_dynarray_const(arrdef:tdef;var startlab:tasmlabel;out arrlengthloc:ttypedconstplaceholder):tasmlabofs;virtual; function begin_dynarray_const(arrdef:tdef;var startlab:tasmlabel;out arrlengthloc:ttypedconstplaceholder):tasmlabofs;virtual;
{ ends a dynamic array constant by updating the count field; the arrlengthloc will be freed } { ends a dynamic array constant by updating the count field; the arrlengthloc will be freed }
function end_dynarray_const(arrdef:tdef;arrlength:asizeint;arrlengthloc:ttypedconstplaceholder):tdef;virtual; function end_dynarray_const(arrdef:tdef;arrlength:asizeint;arrlengthloc:ttypedconstplaceholder;llofs:tasmlabofs):tdef;virtual;
{ emit a shortstring constant, and return its def } { emit a shortstring constant, and return its def }
function emit_shortstring_const(const str: shortstring): tdef; function emit_shortstring_const(const str: shortstring): tdef;
@ -1817,11 +1817,13 @@ implementation
end; end;
function ttai_typedconstbuilder.end_dynarray_const(arrdef:tdef;arrlength:asizeint;arrlengthloc:ttypedconstplaceholder):tdef; function ttai_typedconstbuilder.end_dynarray_const(arrdef:tdef;arrlength:asizeint;arrlengthloc:ttypedconstplaceholder;llofs:tasmlabofs):tdef;
begin begin
{ we emit the high value, not the count } { we emit the high value, not the count }
arrlengthloc.replace(tai_const.Create_sizeint(arrlength-1),sizesinttype); arrlengthloc.replace(tai_const.Create_sizeint(arrlength-1),sizesinttype);
arrlengthloc.free; arrlengthloc.free;
if get_dynarray_symofs=0 then
emit_tai(tai_symbol_end.create(llofs.lab),arrdef);
result:=end_anonymous_record; result:=end_anonymous_record;
end; end;

2
compiler/ngtcon.pas
View File

@ -1298,7 +1298,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
end; end;
ftcb:=oldtcb; ftcb:=oldtcb;
dynarrdef:=datatcb.end_dynarray_const(def,dyncount,dyncountloc); dynarrdef:=datatcb.end_dynarray_const(def,dyncount,dyncountloc,llofs);
ftcb.finish_internal_data_builder(datatcb,ll,dynarrdef,sizeof(pint)); ftcb.finish_internal_data_builder(datatcb,ll,dynarrdef,sizeof(pint));