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

* support specifying the name of an internal data section

Browse Source 
git-svn-id: branches/hlcgllvm@30341 -
This commit is contained in:
Jonas Maebe 2015-03-27 21:25:50 +00:00
parent a76aba4a20
commit 6ed273eec5
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/aasmcnst.pas
View File

@ -243,8 +243,9 @@ type
{ returns a builder for generating data that is only referrenced by the
typed constant date we are currently generating (e.g. string data for a
pchar constant). Also returns the label that will be placed at the start
of that data. list is the tasmlist to which the data will be }
procedure start_internal_data_builder(list: tasmlist; sectype: TAsmSectiontype; out tcb: ttai_typedconstbuilder; out l: tasmlabel);
of that data. list is the tasmlist to which the data will be added.
secname can be empty to use a default }
procedure start_internal_data_builder(list: tasmlist; sectype: TAsmSectiontype; const secname: TSymStr; out tcb: ttai_typedconstbuilder; out l: tasmlabel);
{ finish a previously started internal data builder, including
concatenating all generated data to the provided list and freeing the
builder }
@ -836,7 +837,7 @@ implementation
end;
procedure ttai_typedconstbuilder.start_internal_data_builder(list: tasmlist; sectype: TAsmSectiontype; out tcb: ttai_typedconstbuilder; out l: tasmlabel);
procedure ttai_typedconstbuilder.start_internal_data_builder(list: tasmlist; sectype: TAsmSectiontype; const secname: TSymStr; out tcb: ttai_typedconstbuilder; out l: tasmlabel);
var
options: ttcasmlistoptions;
foundsec: longint;
@ -913,7 +914,14 @@ implementation
current_asmdata.getlocaldatalabel(l);
{ first section of this kind -> set name }
if finternal_data_section_info[foundsec].secname='' then
finternal_data_section_info[foundsec].secname:=l.Name;
if secname='' then
finternal_data_section_info[foundsec].secname:=l.Name
else
finternal_data_section_info[foundsec].secname:=secname
{ if the name is specified multiple times, it must match }
else if (secname<>'') and
(finternal_data_section_info[foundsec].secname<>secname) then
internalerror(2015032401);
tcb:=ttai_typedconstbuilderclass(classtype).create(options);
end;

4
compiler/ngtcon.pas
View File

@ -804,7 +804,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
begin
{ create a tcb for the string data (it's placed in a separate
asmlist) }
ftcb.start_internal_data_builder(fdatalist,sec_rodata,datatcb,ll);
ftcb.start_internal_data_builder(fdatalist,sec_rodata,'',datatcb,ll);
if node.nodetype=stringconstn then
varalign:=size_2_align(tstringconstnode(node).len)
else
@ -862,7 +862,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
begin
{ create a tcb for the string data (it's placed in a separate
asmlist) }
ftcb.start_internal_data_builder(fdatalist,sec_rodata,datatcb,ll);
ftcb.start_internal_data_builder(fdatalist,sec_rodata,'',datatcb,ll);
datatcb:=ctai_typedconstbuilder.create([tcalo_is_lab,tcalo_make_dead_strippable]);
pw:=pcompilerwidestring(tstringconstnode(node).value_str);
{ include terminating #0 }