debugger: use fullname if available

git-svn-id: trunk@22956 -
This commit is contained in:
paul 2009-12-04 11:34:47 +00:00
parent c5f7e33856
commit f437016542
2 changed files with 14 additions and 4 deletions

View File

@ -47,6 +47,7 @@ type
Address: TDBGPtr;
FuncName: String;
SrcFile: String;
SrcFullName: String;
SrcLine: Integer;
end;
@ -912,6 +913,7 @@ type
FLine: Integer;
FArguments: TStrings;
FSource: String;
FFullFileName: String;
function GetArgumentCount: Integer;
function GetArgumentName(const AnIndex: Integer): String;
function GetArgumentValue(const AnIndex: Integer): String;
@ -920,7 +922,8 @@ type
public
constructor Create(const AIndex:Integer; const AnAdress: TDbgPtr;
const AnArguments: TStrings; const AFunctionName: String;
const ASource: String; const ALine: Integer);
const ASource: String; const AFullFileName: String;
const ALine: Integer);
constructor CreateCopy(const ASource: TCallStackEntry);
destructor Destroy; override;
property Adress: TDbgPtr read FAdress;
@ -932,6 +935,7 @@ type
property Index: Integer read FIndex;
property Line: Integer read FLine;
property Source: String read FSource;
property FullFileName: String read FFullFileName;
end;
{ TBaseCallStack }
@ -3641,7 +3645,8 @@ end;
constructor TCallStackEntry.Create(const AIndex: Integer;
const AnAdress: TDbgPtr; const AnArguments: TStrings;
const AFunctionName: String; const ASource: String; const ALine: Integer);
const AFunctionName: String; const ASource: String; const AFullFileName: String;
const ALine: Integer);
begin
inherited Create;
FIndex := AIndex;
@ -3650,13 +3655,14 @@ begin
FArguments.Assign(AnArguments);
FFunctionName := AFunctionName;
FSource := ASource;
FFullFileName := AFullFileName;
FLine := ALine;
end;
constructor TCallStackEntry.CreateCopy(const ASource: TCallStackEntry);
begin
Create(ASource.FIndex, ASource.FAdress, ASource.FArguments,
ASource.FunctionName, ASource.FSource, ASource.FLine);
ASource.FunctionName, ASource.FSource, ASource.FFullFileName, ASource.FLine);
end;
destructor TCallStackEntry.Destroy;

View File

@ -2916,6 +2916,7 @@ begin
if e=0 then ;
Location.FuncName := Frame.Values['func'];
Location.SrcFile := ConvertPathDelims(Frame.Values['file']);
Location.SrcFullName := ConvertPathDelims(Frame.Values['fullname']);
Location.SrcLine := StrToIntDef(Frame.Values['line'], -1);
Frame.Free;
@ -4360,7 +4361,7 @@ var
List: TGDBMINameValueList;
Arg: PGDBMINameValue;
addr: TDbgPtr;
func, filename, line : String;
func, filename, fullname, line : String;
begin
Arguments := TStringList.Create;
@ -4379,6 +4380,7 @@ begin
addr := 0;
func := '';
filename := '';
fullname := '';
line := '';
if AFrameInfo <> nil
then begin
@ -4386,6 +4388,7 @@ begin
if e=0 then ;
func := AFrameInfo.Values['func'];
filename := ConvertPathDelims(AFrameInfo.Values['file']);
fullname := ConvertPathDelims(AFrameInfo.Values['fullname']);
line := AFrameInfo.Values['line'];
end;
@ -4395,6 +4398,7 @@ begin
Arguments,
func,
filename,
fullname,
StrToIntDef(line, 0)
);