paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 06:39:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

debugger: - fix previously introduced error with space trimming (not everything was trimmed)

Browse Source 
- better variant type support:
  - null, unassigned
  - support barByRef

git-svn-id: trunk@22959 -
This commit is contained in:
paul 2009-12-04 14:08:35 +00:00
parent ec4f806eb0
commit 9d023d97f7
1 changed files with 102 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
debugger/gdbmidebugger.pp
View File

@ -890,8 +890,11 @@ procedure TGDBMINameValueList.Init(AResultValues: PChar; ALength: Integer);
end; end;
// trim value spaces // trim value spaces
if UseTrim then if UseTrim then
while (Item^.ValueLen > 0) and (Item^.ValuePtr[Item^.ValueLen - 1] = #32) do while (Item^.ValueLen > 0) and (Item^.ValuePtr[0] = #32) do
begin
inc(Item^.ValuePtr);
dec(Item^.ValueLen); dec(Item^.ValueLen);
end;
end; end;
Inc(FCount); Inc(FCount);
@ -2061,6 +2064,7 @@ function TGDBMIDebugger.GDBEvaluate(const AExpression: String; var AResult: Stri
VarList: TGDBMINameValueList; VarList: TGDBMINameValueList;
VType: Integer; VType: Integer;
Addr: TDbgPtr; Addr: TDbgPtr;
dt: TDateTime;
e: Integer; e: Integer;
begin begin
VarList := TGDBMINameValueList.Create(''); VarList := TGDBMINameValueList.Create('');
@ -2070,44 +2074,109 @@ function TGDBMIDebugger.GDBEvaluate(const AExpression: String; var AResult: Stri
VType := StrToIntDef(VarList.Values['VTYPE'], -1); VType := StrToIntDef(VarList.Values['VTYPE'], -1);
if VType = -1 then // can never happen if no error since varType is word if VType = -1 then // can never happen if no error since varType is word
Exit('variant: unknown type'); Exit('variant: unknown type');
case VType and varTypeMask of case VType and not varTypeMask of
varsmallint: Result := VarList.Values['VSMALLINT']; 0:
varinteger: Result := VarList.Values['VINTEGER'];
varsingle: Result := VarList.Values['VSINGLE'];
vardouble: Result := VarList.Values['VDOUBLE'];
vardate: Result := VarList.Values['VDATE'];
varcurrency: Result := VarList.Values['VCURRENCY'];
varolestr: Result := VarList.Values['VOLESTR'];
vardispatch: Result := VarList.Values['VDISPATCH'];
varerror: Result := VarList.Values['VERROR'];
varboolean: Result := VarList.Values['VBOOLEAN'];
varunknown: Result := VarList.Values['VUNKNOWN'];
varshortint: Result := VarList.Values['VSHORTINT'];
varbyte: Result := VarList.Values['VBYTE'];
varword: Result := VarList.Values['VWORD'];
varlongword: Result := VarList.Values['VLONGWORD'];
varint64: Result := VarList.Values['VINT64'];
varqword: Result := VarList.Values['VQWORD'];
varstring:
begin begin
// address of string case VType of
Result := VarList.Values['VSTRING']; varEmpty: Result := 'UnAssigned';
varNull: Result := 'Null';
varsmallint: Result := VarList.Values['VSMALLINT'];
varinteger: Result := VarList.Values['VINTEGER'];
varsingle: Result := VarList.Values['VSINGLE'];
vardouble: Result := VarList.Values['VDOUBLE'];
vardate:
begin
// float number
Result := VarList.Values['VDATE'];
val(Result, dt, e);
if e = 0 then
Result := DateTimeToStr(dt);
end;
varcurrency: Result := VarList.Values['VCURRENCY'];
varolestr: Result := VarList.Values['VOLESTR'];
vardispatch: Result := VarList.Values['VDISPATCH'];
varerror: Result := VarList.Values['VERROR'];
varboolean: Result := VarList.Values['VBOOLEAN'];
varunknown: Result := VarList.Values['VUNKNOWN'];
varshortint: Result := VarList.Values['VSHORTINT'];
varbyte: Result := VarList.Values['VBYTE'];
varword: Result := VarList.Values['VWORD'];
varlongword: Result := VarList.Values['VLONGWORD'];
varint64: Result := VarList.Values['VINT64'];
varqword: Result := VarList.Values['VQWORD'];
varstring:
begin
// address of string
Result := VarList.Values['VSTRING'];
Val(Result, Addr, e);
if e = 0 then
begin
if Addr = 0 then
Result := ''''''
else
Result := MakePrintable(GetText(Addr));
end;
end;
varany: Result := VarList.Values['VANY'];
else
Result := 'unsupported variant type: ' + IntToStr(VType);
end;
end;
varArray:
begin
Result := VarList.Values['VARRAY'];
Result := 'variant array ' + Result + ': no debugger support yet'
end;
varByRef:
begin
Result := VarList.Values['VPOINTER'];
Val(Result, Addr, e); Val(Result, Addr, e);
if e = 0 then if e = 0 then
begin begin
if Addr = 0 then if Addr = 0 then
Result := '''''' Result := '???'
else else
Result := MakePrintable(GetText(Addr)); begin
// Result contains a valid address
case VType xor varByRef of
varEmpty: Result := 'UnAssigned';
varNull: Result := 'Null';
varsmallint: Result := GetStrValue('psmallint(%s)^', [Result]);
varinteger: Result := GetStrValue('pinteger(%s)^', [Result]);
varsingle: Result := GetStrValue('psingle(%s)^', [Result]);
vardouble: Result := GetStrValue('pdouble(%s)^', [Result]);
vardate:
begin
// float number
Result := GetStrValue('pdatetime(%s)^', [Result]);
val(Result, dt, e);
if e = 0 then
Result := DateTimeToStr(dt);
end;
varcurrency: Result := GetStrValue('pcurrency(%s)^', [Result]);
varolestr:
begin
Result := GetStrValue('^pointer(%s)^', [Result]);
val(Result, Addr, e);
if e = 0 then
Result := MakePrintable(GetWideText(Addr));
end;
varboolean: Result := GetStrValue('pwordbool(%s)^', [Result]);
varshortint: Result := GetStrValue('pshortint(%s)^', [Result]);
varbyte: Result := GetStrValue('pbyte(%s)^', [Result]);
varword: Result := GetStrValue('pword(%s)^', [Result]);
varlongword: Result := GetStrValue('plongword(%s)^', [Result]);
varint64: Result := GetStrValue('pint64(%s)^', [Result]);
varqword: Result := GetStrValue('pqword(%s)^', [Result]);
varstring: Result := MakePrintable(GetText('pansistring(%s)^', [Result]));
else
Result := 'unsupported variant type: ' + IntToStr(VType);
end;
end;
end; end;
end; end;
varany: Result := VarList.Values['VANY']; else
vararray: Result := VarList.Values['VARRAY']; Result := 'unsupported variant type: ' + IntToStr(VType);
varbyref: Result := VarList.Values['VPOINTER'];
varrecord: Result := VarList.Values['VRECORD'];
else
// complex variant type
Result := 'variant: no debugger support yet';
end; end;
finally finally
VarList.Free; VarList.Free;