mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2026-01-04 18:50:43 +01:00
* Display hexadecimal values of wide strings
* Set has_errors on more locations + Add has_more_infos boolean * Add -M option to set ExitCode to 2 if more info is available. * Support constnil type. git-svn-id: trunk@17953 -
This commit is contained in:
pierre
parent
dd96bfb3dd
commit
eb4798238d
@ -32,6 +32,7 @@ uses
|
||||
ppu,
|
||||
globals,
|
||||
globtype,
|
||||
widestr,
|
||||
tokens;
|
||||
|
||||
const
|
||||
@ -147,6 +148,13 @@ const
|
||||
{ 70 } 'Wii-powerpc'
|
||||
);
|
||||
|
||||
const
|
||||
{ in widestr, we have the following definition
|
||||
type
|
||||
tcompilerwidechar = word;
|
||||
thus widecharsize seems to always be 2 bytes }
|
||||
|
||||
widecharsize : longint = 2;
|
||||
type
|
||||
|
||||
tspecialgenerictoken = (ST_LOADSETTINGS,ST_LINE,ST_COLUMN,ST_FILEINDEX);
|
||||
@ -165,7 +173,15 @@ var
|
||||
****************************************************************************}
|
||||
|
||||
const has_errors : boolean = false;
|
||||
Procedure Error(const S : string);
|
||||
has_more_infos : boolean = false;
|
||||
|
||||
Procedure HasMoreInfos;
|
||||
begin
|
||||
Writeln('!! Entry has more information stored');
|
||||
has_more_infos:=true;
|
||||
end;
|
||||
|
||||
Procedure WriteError(const S : string);
|
||||
Begin
|
||||
Writeln(S);
|
||||
has_errors:=true;
|
||||
@ -335,6 +351,7 @@ end;
|
||||
if t=-1 then
|
||||
begin
|
||||
Result := 'Not Found';
|
||||
has_errors:=true;
|
||||
exit;
|
||||
end;
|
||||
DT := FileDateToDateTime(t);
|
||||
@ -365,7 +382,10 @@ var
|
||||
i : integer;
|
||||
begin
|
||||
if ppufile.readentry<>ibsymtableoptions then
|
||||
exit;
|
||||
begin
|
||||
has_errors:=true;
|
||||
exit;
|
||||
end;
|
||||
ppufile.getsmallset(options);
|
||||
if space<>'' then
|
||||
writeln(space,'------ ',s,' ------');
|
||||
@ -502,7 +522,7 @@ begin
|
||||
derefdatalen:=ppufile.entrysize;
|
||||
if derefdatalen=0 then
|
||||
begin
|
||||
writeln('!! Error: derefdatalen=0');
|
||||
WriteError('!! Error: derefdatalen=0');
|
||||
exit;
|
||||
end;
|
||||
Writeln('Derefdata length: ',derefdatalen);
|
||||
@ -563,7 +583,10 @@ begin
|
||||
AB_IMPORT :
|
||||
bindstr:='Import';
|
||||
else
|
||||
bindstr:='<Error !!>'
|
||||
begin
|
||||
bindstr:='<Error !!>';
|
||||
has_errors:=true;
|
||||
end;
|
||||
end;
|
||||
case tasmsymtype(ppufile.getbyte) of
|
||||
AT_FUNCTION :
|
||||
@ -577,7 +600,10 @@ begin
|
||||
AT_ADDR :
|
||||
typestr:='Label (with address taken)';
|
||||
else
|
||||
typestr:='<Error !!>'
|
||||
begin
|
||||
typestr:='<Error !!>';
|
||||
has_errors:=true;
|
||||
end;
|
||||
end;
|
||||
Writeln(space,' ',i,' : ',s,' [',bindstr,',',typestr,']');
|
||||
inc(i);
|
||||
@ -650,6 +676,7 @@ begin
|
||||
if (idx>derefdatalen) then
|
||||
begin
|
||||
writeln('!! Error: Deref idx ',idx,' > ',derefdatalen);
|
||||
has_errors:=true;
|
||||
exit;
|
||||
end;
|
||||
write(derefspace,'(',idx,') ');
|
||||
@ -659,7 +686,7 @@ begin
|
||||
inc(i);
|
||||
if n<1 then
|
||||
begin
|
||||
writeln('!! Error: Deref len < 1');
|
||||
WriteError('!! Error: Deref len < 1');
|
||||
exit;
|
||||
end;
|
||||
while (i<=n) do
|
||||
@ -694,6 +721,7 @@ begin
|
||||
else
|
||||
begin
|
||||
writeln('!! unsupported dereftyp: ',ord(b));
|
||||
has_errors:=true;
|
||||
break;
|
||||
end;
|
||||
end;
|
||||
@ -1330,7 +1358,7 @@ begin
|
||||
end
|
||||
else
|
||||
begin
|
||||
Writeln('!! ibnodetree not found');
|
||||
WriteError('!! ibnodetree not found');
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
@ -1347,6 +1375,7 @@ begin
|
||||
begin
|
||||
writeln('!! ibcreatedobjtypes entry not found');
|
||||
ppufile.skipdata(ppufile.entrysize);
|
||||
has_errors:=true;
|
||||
exit
|
||||
end;
|
||||
writeln;
|
||||
@ -1408,18 +1437,15 @@ type
|
||||
D4: array[0..7] of Byte;
|
||||
end;
|
||||
|
||||
absolutetyp = (tovar,toasm,toaddr);
|
||||
tconsttyp = (constnone,
|
||||
constord,conststring,constreal,
|
||||
constset,constpointer,constnil,
|
||||
constresourcestring,constwstring,constguid
|
||||
);
|
||||
var
|
||||
b : byte;
|
||||
pc : pchar;
|
||||
ch : dword;
|
||||
startnewline : boolean;
|
||||
i,j,len : longint;
|
||||
guid : tguid;
|
||||
tempbuf : array[0..127] of char;
|
||||
pw : pcompilerwidestring;
|
||||
varoptions : tvaroptions;
|
||||
begin
|
||||
with ppufile do
|
||||
@ -1507,8 +1533,49 @@ begin
|
||||
writeln;
|
||||
end;
|
||||
end;
|
||||
constwstring:
|
||||
constnil:
|
||||
writeln(space,' NIL pointer.');
|
||||
constwstring :
|
||||
begin
|
||||
initwidestring(pw);
|
||||
setlengthwidestring(pw,getlongint);
|
||||
if widecharsize=2 then
|
||||
{ don't use getdata, because the compilerwidechars may have to
|
||||
be byteswapped
|
||||
}
|
||||
begin
|
||||
for i:=0 to pw^.len-1 do
|
||||
pw^.data[i]:=ppufile.getword;
|
||||
end
|
||||
else if widecharsize=4 then
|
||||
begin
|
||||
for i:=0 to pw^.len-1 do
|
||||
pw^.data[i]:=cardinal(ppufile.getlongint);
|
||||
end
|
||||
else
|
||||
begin
|
||||
WriteError('Unsupported tcompilerwidechar size');
|
||||
end;
|
||||
Writeln(space,'Wide string type');
|
||||
startnewline:=true;
|
||||
for i:=0 to pw^.len-1 do
|
||||
begin
|
||||
if startnewline then
|
||||
begin
|
||||
write(space);
|
||||
startnewline:=false;
|
||||
end;
|
||||
ch:=pw^.data[i];
|
||||
if widecharsize=2 then
|
||||
write(hexstr(ch,4))
|
||||
else
|
||||
write(hexstr(ch,8));
|
||||
if (i mod 8)= 0 then
|
||||
startnewline:=true
|
||||
else
|
||||
write(', ');
|
||||
end;
|
||||
donewidestring(pw);
|
||||
end;
|
||||
constguid:
|
||||
begin
|
||||
@ -1641,7 +1708,7 @@ begin
|
||||
|
||||
iberror :
|
||||
begin
|
||||
Writeln('!! Error in PPU');
|
||||
WriteError('!! Error in PPU');
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -1649,10 +1716,13 @@ begin
|
||||
break;
|
||||
|
||||
else
|
||||
WriteLn('!! Skipping unsupported PPU Entry in Symbols: ',b);
|
||||
begin
|
||||
WriteLn('!! Skipping unsupported PPU Entry in Symbols: ',b);
|
||||
has_errors:=true;
|
||||
end;
|
||||
end;
|
||||
if not EndOfEntry then
|
||||
Writeln('!! Entry has more information stored');
|
||||
HasMoreInfos;
|
||||
until false;
|
||||
end;
|
||||
end;
|
||||
@ -1803,7 +1873,7 @@ begin
|
||||
writeln;
|
||||
end;
|
||||
if not EndOfEntry then
|
||||
Writeln('!! Entry has more information stored');
|
||||
HasMoreInfos;
|
||||
space:=' '+space;
|
||||
{ parast }
|
||||
readsymtableoptions('parast');
|
||||
@ -1827,7 +1897,7 @@ begin
|
||||
read_abstract_proc_def(calloption,procoptions);
|
||||
writeln(space,' Symtable level :',ppufile.getbyte);
|
||||
if not EndOfEntry then
|
||||
Writeln('!! Entry has more information stored');
|
||||
HasMoreInfos;
|
||||
space:=' '+space;
|
||||
{ parast }
|
||||
readsymtableoptions('parast');
|
||||
@ -1878,7 +1948,7 @@ begin
|
||||
writeln(space,'UseFieldAlignment : ',getbyte);
|
||||
writeln(space,' DataSize : ',getaint);
|
||||
if not EndOfEntry then
|
||||
Writeln('!! Entry has more information stored');
|
||||
HasMoreInfos;
|
||||
{read the record definitions and symbols}
|
||||
space:=' '+space;
|
||||
readsymtableoptions('fields');
|
||||
@ -1959,7 +2029,7 @@ begin
|
||||
end;
|
||||
|
||||
if not EndOfEntry then
|
||||
Writeln('!! Entry has more information stored');
|
||||
HasMoreInfos;
|
||||
if not(df_copied_def in current_defoptions) then
|
||||
begin
|
||||
{read the record definitions and symbols}
|
||||
@ -2051,7 +2121,7 @@ begin
|
||||
|
||||
iberror :
|
||||
begin
|
||||
Writeln('!! Error in PPU');
|
||||
WriteError('!! Error in PPU');
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -2059,10 +2129,13 @@ begin
|
||||
break;
|
||||
|
||||
else
|
||||
WriteLn('!! Skipping unsupported PPU Entry in definitions: ',b);
|
||||
begin
|
||||
WriteLn('!! Skipping unsupported PPU Entry in definitions: ',b);
|
||||
has_errors:=true;
|
||||
end;
|
||||
end;
|
||||
if not EndOfEntry then
|
||||
Writeln('!! Entry has more information stored');
|
||||
HasMoreInfos;
|
||||
until false;
|
||||
end;
|
||||
end;
|
||||
@ -2210,7 +2283,7 @@ begin
|
||||
|
||||
iberror :
|
||||
begin
|
||||
Writeln('Error in PPU');
|
||||
WriteError('Error in PPU');
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -2218,7 +2291,10 @@ begin
|
||||
break;
|
||||
|
||||
else
|
||||
WriteLn('!! Skipping unsupported PPU Entry in General Part: ',b);
|
||||
begin
|
||||
WriteLn('!! Skipping unsupported PPU Entry in General Part: ',b);
|
||||
has_errors:=true;
|
||||
end;
|
||||
end;
|
||||
until false;
|
||||
end;
|
||||
@ -2247,13 +2323,16 @@ begin
|
||||
|
||||
iberror :
|
||||
begin
|
||||
Writeln('Error in PPU');
|
||||
WriteError('Error in PPU');
|
||||
exit;
|
||||
end;
|
||||
ibendimplementation :
|
||||
break;
|
||||
else
|
||||
WriteLn('!! Skipping unsupported PPU Entry in Implementation: ',b);
|
||||
begin
|
||||
WriteLn('!! Skipping unsupported PPU Entry in Implementation: ',b);
|
||||
has_errors:=true;
|
||||
end;
|
||||
end;
|
||||
until false;
|
||||
end;
|
||||
@ -2270,13 +2349,14 @@ begin
|
||||
ppufile:=tppufile.create(filename);
|
||||
if not ppufile.openfile then
|
||||
begin
|
||||
writeln ('IO-Error when opening : ',filename,', Skipping');
|
||||
WriteError('IO-Error when opening : '+filename+', Skipping');
|
||||
exit;
|
||||
end;
|
||||
{ PPU File is open, check for PPU Id }
|
||||
if not ppufile.CheckPPUID then
|
||||
begin
|
||||
writeln(Filename,' : Not a valid PPU file, Skipping');
|
||||
has_errors:=true;
|
||||
exit;
|
||||
end;
|
||||
{ Check PPU Version }
|
||||
@ -2286,6 +2366,7 @@ begin
|
||||
if PPUVersion<16 then
|
||||
begin
|
||||
writeln(Filename,' : Old PPU Formats (<v16) are not supported, Skipping');
|
||||
has_errors:=true;
|
||||
exit;
|
||||
end;
|
||||
{ Write PPU Header Information }
|
||||
@ -2354,7 +2435,7 @@ begin
|
||||
end;
|
||||
if ppufile.readentry<>ibexportedmacros then
|
||||
begin
|
||||
Writeln('!! Error in PPU');
|
||||
WriteError('!! Error in PPU');
|
||||
exit;
|
||||
end;
|
||||
if boolean(ppufile.getbyte) then
|
||||
@ -2422,6 +2503,7 @@ begin
|
||||
writeln('usage: ppudump [options] <filename1> <filename2>...');
|
||||
writeln;
|
||||
writeln('[options] can be:');
|
||||
writeln(' -M Exit with ExitCode=2 if more information is available');
|
||||
writeln(' -V<verbose> Set verbosity to <verbose>');
|
||||
writeln(' H - Show header info');
|
||||
writeln(' I - Show interface');
|
||||
@ -2438,6 +2520,8 @@ var
|
||||
startpara,
|
||||
nrfile,i : longint;
|
||||
para : string;
|
||||
const
|
||||
error_on_more : boolean = false;
|
||||
begin
|
||||
writeln(Title+' '+Version);
|
||||
writeln(Copyright);
|
||||
@ -2455,6 +2539,7 @@ begin
|
||||
begin
|
||||
para:=paramstr(startpara);
|
||||
case upcase(para[2]) of
|
||||
'M' : error_on_more:=true;
|
||||
'V' : begin
|
||||
verbose:=0;
|
||||
for i:=3 to length(para) do
|
||||
@ -2477,4 +2562,6 @@ begin
|
||||
dofile (paramstr(nrfile));
|
||||
if has_errors then
|
||||
Halt(1);
|
||||
if error_on_more and has_more_infos then
|
||||
Halt(2);
|
||||
end.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user