paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 20:09:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed sets in rtti for big endian systems

Browse Source 
* changed set sizes in rtti to 1 byte for Delphi compatibility
  * fixed tests/webtbs/tw12038 for the new set sizes
  * documented at http://wiki.freepascal.org/User_Changes_Trunk#Sets_in_RTTI_.28run-time_type_information.29

git-svn-id: trunk@12894 -
This commit is contained in:
Jonas Maebe 2009-03-15 12:06:30 +00:00
parent 2c94fca8e1
commit f2ce99029b
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compiler/ncgrtti.pas
View File

@ -630,6 +630,11 @@ implementation
}
if is_open_array(parasym.vardef) then
paraspec:=paraspec or pfArray or pfReference;
{ set bits run from the highest to the lowest bit on
big endian systems
}
if (target_info.endian = endian_big) then
paraspec:=reverse_byte(paraspec);
{ write flags for current parameter }
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_8bit(paraspec));
{ write name of current parameter }
@ -742,6 +747,10 @@ implementation
var
i : longint;
propnamelist : TFPHashObjectList;
{ if changed to a set, make sure it's still a byte large, and
swap appropriately when cross-compiling
}
IntfFlags: byte;
begin
{ Collect unique property names with nameindex }
propnamelist:=TFPHashObjectList.Create;
@ -754,20 +763,18 @@ implementation
current_asmdata.asmlists[al_rtti].concat(Tai_const.create_sym(nil));
{ interface: write flags, iid and iidstr }
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_32bit(
{ ugly, but working }
{$ifdef USE_PACKSET1}
byte([
{$else USE_PACKSET1}
longint([
{$endif USE_PACKSET1}
TCompilerIntfFlag(ord(ifHasGuid)*ord(assigned(def.iidguid))),
TCompilerIntfFlag(ord(ifHasStrGUID)*ord(assigned(def.iidstr))),
TCompilerIntfFlag(ord(ifDispInterface)*ord(def.objecttype=odt_dispinterface))
])
IntfFlags:=0;
if assigned(def.iidguid) then
IntfFlags:=IntfFlags or (1 shl ord(ifHasGuid));
if assigned(def.iidstr) then
IntfFlags:=IntfFlags or (1 shl ord(ifHasStrGUID));
if (def.objecttype=odt_dispinterface) then
IntfFlags:=IntfFlags or (1 shl ord(ifDispInterface));
if (target_info.endian=endian_big) then
IntfFlags:=reverse_byte(IntfFlags);
{
ifDispatch, }
));
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_8bit(IntfFlags));
if (tf_requires_proper_alignment in target_info.flags) then
current_asmdata.asmlists[al_rtti].concat(cai_align.Create(sizeof(TConstPtrUInt)));
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_32bit(longint(def.iidguid^.D1)));

11
compiler/options.pas
View File

@ -2209,10 +2209,14 @@ begin
set_target_asm(target_info.assemextern);
end;
{ smart linking does not yet work with DWARF debug info }
{ smart linking does not yet work with DWARF debug info on most targets }
if (paratargetdbg in [dbg_dwarf2,dbg_dwarf3]) and
(cs_link_smart in init_settings.globalswitches) then
ForceStaticLinking;
(cs_link_smart in init_settings.globalswitches) and
not(target_info.system in systems_darwin) then
begin
Message(option_dwarf_smart_linking);
ForceStaticLinking;
end;
end;
@ -2372,6 +2376,7 @@ begin
def_system_macro('FPC_HAS_INTERNAL_ABS_LONG');
{$endif}
def_system_macro('FPC_HAS_UNICODESTRING');
def_system_macro('FPC_RTTI_PACKSET1');
{ these cpus have an inline rol/ror implementaion }
{$if defined(x86) or defined(arm) or defined(powerpc) or defined(powerpc64)}

4
rtl/objpas/typinfo.pp
View File

@ -32,6 +32,10 @@ unit typinfo;
type
{$MINENUMSIZE 1 this saves a lot of memory }
{$ifdef FPC_RTTI_PACKSET1}
{ for Delphi compatibility }
{$packset 1}
{$endif}
// if you change one of the following enumeration types
// you have also to change the compiler in an appropriate way !
TTypeKind = (tkUnknown,tkInteger,tkChar,tkEnumeration,tkFloat,

6
tests/webtbs/tw12038.pp
View File

@ -167,11 +167,7 @@ var
ProcessThisProperty : boolean;
Fu_ResultType: String;
Flags: TParamFlags;
{$ifdef fpc}
Flag:integer;
{$else}
Flag:byte;
{$endif}
Definition: String;
begin
// Finding property type
@ -236,7 +232,7 @@ begin
for i:= 1 to DTypeData^.ParamCount do
begin
{ First Handle the ParamFlag }
Flag:=integer(DTypeData^.ParamList[CurrentParamPosition]);
Flag:=byte(DTypeData^.ParamList[CurrentParamPosition]);
Flags:=TParamFlags(Flag);
writeln('ord(Flags):',ord(DTypeData^.ParamList[CurrentParamPosition]));
// For i:= 1 to NumI do