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

* factored out emitting a shortstring constant via the typed constant builder

Browse Source 
git-svn-id: branches/hlcgllvm@28771 -
This commit is contained in:
Jonas Maebe 2014-10-06 20:54:07 +00:00
parent f8cda69446
commit 984491e435
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/aasmcnst.pas
View File

@ -226,6 +226,8 @@ type
will be created/destroyed internally by these methods) } will be created/destroyed internally by these methods) }
class function emit_ansistring_const(list: TAsmList; data: pchar; len: asizeint; encoding: tstringencoding; newsection: boolean): tasmlabofs; class function emit_ansistring_const(list: TAsmList; data: pchar; len: asizeint; encoding: tstringencoding; newsection: boolean): tasmlabofs;
class function emit_unicodestring_const(list: TAsmList; data: pointer; encoding: tstringencoding; winlike: boolean):tasmlabofs; class function emit_unicodestring_const(list: TAsmList; data: pointer; encoding: tstringencoding; winlike: boolean):tasmlabofs;
{ emit a shortstring constant, and return its def }
function emit_shortstring_const(const str: shortstring): tdef;
{ begin a potential aggregate type. Must be called for any type { begin a potential aggregate type. Must be called for any type
that consists of multiple tai constant data entries, or that that consists of multiple tai constant data entries, or that
@ -1010,6 +1012,21 @@ implementation
end; end;
function ttai_typedconstbuilder.emit_shortstring_const(const str: shortstring): tdef;
begin
{ we use an arraydef instead of a shortstringdef, because we don't have
functionality in place yet to reuse shortstringdefs of the same length
and neither the lowlevel nor the llvm typedconst builder cares about
this difference }
result:=getarraydef(cansichartype,length(str)+1);
maybe_begin_aggregate(result);
emit_tai(Tai_const.Create_8bit(length(str)),u8inttype);
if str<>'' then
emit_tai(Tai_string.Create(str),getarraydef(cansichartype,length(str)));
maybe_end_aggregate(result);
end;
procedure ttai_typedconstbuilder.maybe_begin_aggregate(def: tdef); procedure ttai_typedconstbuilder.maybe_begin_aggregate(def: tdef);
begin begin
begin_aggregate_internal(def,false); begin_aggregate_internal(def,false);

13
compiler/ncgvmt.pas
View File

@ -515,11 +515,8 @@ implementation
current_asmdata.getlabel(l,alt_data); current_asmdata.getlabel(l,alt_data);
{ l: name_of_method } { l: name_of_method }
tcb:=ctai_typedconstbuilder.create; tcb:=ctai_typedconstbuilder.create;
namedef:=getarraydef(cansichartype,length(tsym(p).realname)+1);
tcb.maybe_begin_aggregate(namedef); namedef:=tcb.emit_shortstring_const(tsym(p).realname);
tcb.emit_tai(Tai_const.Create_8bit(length(tsym(p).realname)),u8inttype);
tcb.emit_tai(Tai_string.Create(tsym(p).realname),getarraydef(cansichartype,length(tsym(p).realname)));
tcb.maybe_end_aggregate(namedef);
lists^.list.concatList(tcb.get_final_asmlist(l,namedef,sec_rodata_norel,'',sizeof(pint),[tcalo_is_lab])); lists^.list.concatList(tcb.get_final_asmlist(l,namedef,sec_rodata_norel,'',sizeof(pint),[tcalo_is_lab]));
tcb.free; tcb.free;
{ the tmethodnamerec } { the tmethodnamerec }
@ -992,11 +989,7 @@ implementation
current_asmdata.getlabel(classnamelabel,alt_data); current_asmdata.getlabel(classnamelabel,alt_data);
tcb:=ctai_typedconstbuilder.create; tcb:=ctai_typedconstbuilder.create;
hs:=_class.RttiName; hs:=_class.RttiName;
classnamedef:=cstringdef.createshort(length(hs)); classnamedef:=tcb.emit_shortstring_const(_class.RttiName);
tcb.maybe_begin_aggregate(classnamedef);
tcb.emit_tai(Tai_const.Create_8bit(length(hs)),u8inttype);
tcb.emit_tai(Tai_string.Create(hs),getarraydef(cansichartype,length(hs)));
tcb.maybe_end_aggregate(classnamedef);
templist.concatlist(tcb.get_final_asmlist(classnamelabel,classnamedef,sec_rodata_norel,'',sizeof(pint),[tcalo_is_lab])); templist.concatlist(tcb.get_final_asmlist(classnamelabel,classnamedef,sec_rodata_norel,'',sizeof(pint),[tcalo_is_lab]));
tcb.free; tcb.free;