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

* move write_param_flag() from local to class scope

Browse Source 
git-svn-id: trunk@35280 -
This commit is contained in:
svenbarth 2017-01-13 13:58:55 +00:00
parent 78a7710192
commit 854a82b58b
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
compiler/ncgrtti.pas
View File

@ -61,6 +61,7 @@ interface
function write_methodkind(tcb:ttai_typedconstbuilder;def:tabstractprocdef):byte; function write_methodkind(tcb:ttai_typedconstbuilder;def:tabstractprocdef):byte;
procedure write_callconv(tcb:ttai_typedconstbuilder;def:tabstractprocdef); procedure write_callconv(tcb:ttai_typedconstbuilder;def:tabstractprocdef);
procedure write_paralocs(tcb:ttai_typedconstbuilder;parasym:tparavarsym); procedure write_paralocs(tcb:ttai_typedconstbuilder;parasym:tparavarsym);
procedure write_param_flag(tcb:ttai_typedconstbuilder;parasym:tparavarsym);
public public
constructor create; constructor create;
procedure write_rtti(def:tdef;rt:trttitype); procedure write_rtti(def:tdef;rt:trttitype);
@ -266,6 +267,48 @@ implementation
end; end;
procedure TRTTIWriter.write_param_flag(tcb:ttai_typedconstbuilder;parasym:tparavarsym);
var
paraspec : word;
begin
case parasym.varspez of
vs_value : paraspec := 0;
vs_const : paraspec := pfConst;
vs_var : paraspec := pfVar;
vs_out : paraspec := pfOut;
vs_constref: paraspec := pfConstRef;
else
internalerror(2013112904);
end;
{ Kylix also seems to always add both pfArray and pfReference
in this case
}
if is_open_array(parasym.vardef) then
paraspec:=paraspec or pfArray or pfReference;
{ and these for classes and interfaces (maybe because they
are themselves addresses?)
}
if is_class_or_interface(parasym.vardef) then
paraspec:=paraspec or pfAddress;
{ flags for the hidden parameters }
if vo_is_hidden_para in parasym.varoptions then
paraspec:=paraspec or pfHidden;
if vo_is_high_para in parasym.varoptions then
paraspec:=paraspec or pfHigh;
if vo_is_self in parasym.varoptions then
paraspec:=paraspec or pfSelf;
if vo_is_vmt in parasym.varoptions then
paraspec:=paraspec or pfVmt;
{ set bits run from the highest to the lowest bit on
big endian systems
}
if (target_info.endian = endian_big) then
paraspec:=reverse_word(paraspec);
{ write flags for current parameter }
tcb.emit_ord_const(paraspec,u16inttype);
end;
procedure TRTTIWriter.write_rtti_name(tcb: ttai_typedconstbuilder; def: tdef); procedure TRTTIWriter.write_rtti_name(tcb: ttai_typedconstbuilder; def: tdef);
begin begin
if is_open_array(def) then if is_open_array(def) then
@ -993,54 +1036,13 @@ implementation
procedure procvardef_rtti(def:tprocvardef); procedure procvardef_rtti(def:tprocvardef);
procedure write_param_flag(parasym:tparavarsym);
var
paraspec : word;
begin
case parasym.varspez of
vs_value : paraspec := 0;
vs_const : paraspec := pfConst;
vs_var : paraspec := pfVar;
vs_out : paraspec := pfOut;
vs_constref: paraspec := pfConstRef;
else
internalerror(2013112904);
end;
{ Kylix also seems to always add both pfArray and pfReference
in this case
}
if is_open_array(parasym.vardef) then
paraspec:=paraspec or pfArray or pfReference;
{ and these for classes and interfaces (maybe because they
are themselves addresses?)
}
if is_class_or_interface(parasym.vardef) then
paraspec:=paraspec or pfAddress;
{ flags for the hidden parameters }
if vo_is_hidden_para in parasym.varoptions then
paraspec:=paraspec or pfHidden;
if vo_is_high_para in parasym.varoptions then
paraspec:=paraspec or pfHigh;
if vo_is_self in parasym.varoptions then
paraspec:=paraspec or pfSelf;
if vo_is_vmt in parasym.varoptions then
paraspec:=paraspec or pfVmt;
{ set bits run from the highest to the lowest bit on
big endian systems
}
if (target_info.endian = endian_big) then
paraspec:=reverse_word(paraspec);
{ write flags for current parameter }
tcb.emit_ord_const(paraspec,u16inttype);
end;
procedure write_para(parasym:tparavarsym); procedure write_para(parasym:tparavarsym);
begin begin
{ only store user visible parameters } { only store user visible parameters }
if not(vo_is_hidden_para in parasym.varoptions) then if not(vo_is_hidden_para in parasym.varoptions) then
begin begin
{ write flags for current parameter } { write flags for current parameter }
write_param_flag(parasym); write_param_flag(tcb,parasym);
{ write name of current parameter } { write name of current parameter }
tcb.emit_shortstring_const(parasym.realname); tcb.emit_shortstring_const(parasym.realname);
{ write name of type of current parameter } { write name of type of current parameter }
@ -1060,7 +1062,7 @@ implementation
targetinfos[target_info.system]^.alignment.recordalignmin, targetinfos[target_info.system]^.alignment.recordalignmin,
targetinfos[target_info.system]^.alignment.maxCrecordalign); targetinfos[target_info.system]^.alignment.maxCrecordalign);
{ write flags for current parameter } { write flags for current parameter }
write_param_flag(parasym); write_param_flag(tcb,parasym);
{ write param type } { write param type }
write_rtti_reference(tcb,parasym.vardef,fullrtti); write_rtti_reference(tcb,parasym.vardef,fullrtti);
{ write name of current parameter } { write name of current parameter }