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

* fixed several issues related to dumping jvm ppu files

Browse Source 
o don't use ifdefs related to symansistr or jvm, since these conditional
     defines are not set while compiling ppudump

git-svn-id: trunk@32234 -
This commit is contained in:
Jonas Maebe 2015-11-04 20:46:13 +00:00
parent 9914f02faa
commit d5aa498cf5
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compiler/utils/ppuutils/ppudump.pp
View File

@ -2563,6 +2563,8 @@ begin
def:=TPpuFieldDef.Create(ParentDef); def:=TPpuFieldDef.Create(ParentDef);
readabstractvarsym('Field Variable symbol ',varoptions,TPpuVarDef(def)); readabstractvarsym('Field Variable symbol ',varoptions,TPpuVarDef(def));
writeln([space,' Address : ',getaint]); writeln([space,' Address : ',getaint]);
if vo_has_mangledname in varoptions then
writeln([space,' Mangled name : ',getstring]);
end; end;
ibstaticvarsym : ibstaticvarsym :
@ -2572,11 +2574,10 @@ begin
write ([space,' DefaultConst : ']); write ([space,' DefaultConst : ']);
readderef(''); readderef('');
if (vo_has_mangledname in varoptions) then if (vo_has_mangledname in varoptions) then
{$ifdef symansistr} if tsystemcpu(ppufile.header.cpu)=cpu_jvm then
writeln([space,' Mangledname : ',getansistring]); writeln([space,'AMangledname : ',getansistring])
{$else symansistr} else
writeln([space,' Mangledname : ',getstring]); writeln([space,'SMangledname : ',getstring]);
{$endif symansistr}
if vo_has_section in varoptions then if vo_has_section in varoptions then
writeln(['Section name:',ppufile.getansistring]); writeln(['Section name:',ppufile.getansistring]);
write ([space,' FieldVarSymDeref: ']); write ([space,' FieldVarSymDeref: ']);
@ -2976,11 +2977,10 @@ begin
readcommondef('Procedure definition',defoptions,def); readcommondef('Procedure definition',defoptions,def);
read_abstract_proc_def(calloption,procoptions,TPpuProcDef(def)); read_abstract_proc_def(calloption,procoptions,TPpuProcDef(def));
if (po_has_mangledname in procoptions) then if (po_has_mangledname in procoptions) then
{$ifdef symansistr} if tsystemcpu(ppufile.header.cpu)=cpu_jvm then
writeln([space,' Mangled name : ',getansistring]); writeln([space,' Mangled name : ',getansistring])
{$else symansistr} else
writeln([space,' Mangled name : ',getstring]); writeln([space,' Mangled name : ',getstring]);
{$endif symansistr}
writeln([space,' Number : ',getword]); writeln([space,' Number : ',getword]);
writeln([space,' Level : ',getbyte]); writeln([space,' Level : ',getbyte]);
write ([space,' Class : ']); write ([space,' Class : ']);
@ -3063,6 +3063,8 @@ begin
{ parast } { parast }
readsymtable('parast',TPpuProcDef(def)); readsymtable('parast',TPpuProcDef(def));
delete(space,1,4); delete(space,1,4);
if tsystemcpu(ppufile.header.cpu)=cpu_jvm then
readderef('');
end; end;
ibshortstringdef : ibshortstringdef :
@ -3306,10 +3308,6 @@ begin
writeln([space,' Largest element : ',enumdef.ElHigh]); writeln([space,' Largest element : ',enumdef.ElHigh]);
enumdef.Size:=byte(getaint); enumdef.Size:=byte(getaint);
writeln([space,' Size : ',enumdef.Size]); writeln([space,' Size : ',enumdef.Size]);
{$ifdef jvm}
write([space,' Class def : ']);
readderef('');
{$endif}
if df_copied_def in defoptions then if df_copied_def in defoptions then
begin begin
write([space,'Base enumeration type : ']); write([space,'Base enumeration type : ']);
@ -3321,6 +3319,11 @@ begin
readsymtable('elements',enumdef); readsymtable('elements',enumdef);
delete(space,1,4); delete(space,1,4);
end; end;
if tsystemcpu(ppufile.header.cpu)=cpu_jvm then
begin
write([space,' Class def : ']);
readderef('');
end;
end; end;
ibclassrefdef : ibclassrefdef :