paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-08 11:21:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: handle PWideChar (and WideString, if represented as PWideChar)

Browse Source 
git-svn-id: trunk@59778 -
This commit is contained in:
martin 2018-12-10 21:08:22 +00:00
parent 7463fc15a6
commit 739388038a
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
components/fpdebug/fpdbgdwarf.pas
View File

@ -285,6 +285,7 @@ type
function GetFieldFlags: TFpDbgValueFieldFlags; override;
function GetDataAddress: TFpDbgMemLocation; override;
function GetAsString: AnsiString; override;
function GetAsWideString: WideString; override;
function GetMember(AIndex: Int64): TFpDbgValue; override;
public
destructor Destroy; override;
@ -1012,7 +1013,7 @@ begin
if ASym.SymbolType = stValue then begin
Result := ASym.Value;
Result.AddReference{$IFDEF WITH_REFCOUNT_DEBUG}(@FlastResult, 'FindSymbol'){$ENDIF};
Result.AddReference{$IFDEF WITH_REFCOUNT_DEBUG}(@FlastResult, 'FindSymbol'){$ENDIF};
end
else begin
Result := TFpDwarfValueTypeDefinition.Create(ASym);
@ -1945,22 +1946,43 @@ var
begin
t := TypeInfo;
if (t <> nil) then t := t.TypeInfo;
if t.Size = 2 then
Result := GetAsWideString
else
if (MemManager <> nil) and (t <> nil) and (t.Kind = skChar) and IsReadableMem(DataAddress) then begin // pchar
SetLength(Result, 2000);
i := 2000;
while (i > 0) and (not MemManager.ReadMemory(DataAddress, 2000, @Result[1])) do
while (i > 0) and (not MemManager.ReadMemory(DataAddress, i, @Result[1])) do
i := i div 2;
SetLength(Result,i);
if t.Size = 2 then // widestring // should be in GetAsWideString;
i := pos(#0#0, Result)
else
i := pos(#0, Result);
i := pos(#0, Result);
if i > 0 then
SetLength(Result,i-1);
exit;
end;
end
else
Result := inherited GetAsString;
end;
Result := inherited GetAsString;
function TFpDwarfValuePointer.GetAsWideString: WideString;
var
t: TFpDbgSymbol;
i: Integer;
begin
t := TypeInfo;
if (t <> nil) then t := t.TypeInfo;
// skWideChar ???
if (MemManager <> nil) and (t <> nil) and (t.Kind = skChar) and IsReadableMem(DataAddress) then begin // pchar
SetLength(Result, 2000);
i := 4000; // 2000 * 16 bit
while (i > 0) and (not MemManager.ReadMemory(DataAddress, i, @Result[1])) do
i := i div 2;
SetLength(Result, i);
i := pos(#0, Result);
if i > 0 then
SetLength(Result, i-1);
end
else
Result := inherited GetAsWideString;
end;
function TFpDwarfValuePointer.GetMember(AIndex: Int64): TFpDbgValue;