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

FpDebug: "UnicodeString" workaround for wrong dwarf-highbound fpc issue #0035359, see also issue #0035340

Browse Source 
git-svn-id: trunk@60946 -
This commit is contained in:
martin 2019-04-12 23:39:24 +00:00
parent f9435a7947
commit bd2040ec55
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/fpdebug/fpdbgdwarffreepascal.pas
View File

@ -5,7 +5,7 @@ unit FpDbgDwarfFreePascal;
interface interface
uses uses
Classes, SysUtils, Types, FpDbgDwarfDataClasses, FpDbgDwarf, FpDbgInfo, Classes, SysUtils, Types, math, FpDbgDwarfDataClasses, FpDbgDwarf, FpDbgInfo,
FpDbgUtil, FpDbgDwarfConst, FpErrorMessages, FpdMemoryTools, DbgIntfBaseTypes, FpDbgUtil, FpDbgDwarfConst, FpErrorMessages, FpdMemoryTools, DbgIntfBaseTypes,
LazLoggerBase; LazLoggerBase;
@ -604,6 +604,8 @@ begin
if (t2 = nil) or (t2.Kind <> skChar) then if (t2 = nil) or (t2.Kind <> skChar) then
exit; exit;
// TODO: check lowbound = 1 (const)
while Info.HasValidScope do begin while Info.HasValidScope do begin
t := Info.AbbrevTag; t := Info.AbbrevTag;
if (t = DW_TAG_enumeration_type) then if (t = DW_TAG_enumeration_type) then
@ -704,8 +706,10 @@ function TFpDwarfV3ValueFreePascalString.GetAsString: AnsiString;
var var
t, t2: TFpDbgSymbol; t, t2: TFpDbgSymbol;
LowBound, HighBound: Int64; LowBound, HighBound: Int64;
Addr: TFpDbgMemLocation; Addr, Addr2: TFpDbgMemLocation;
WResult: UnicodeString; WResult: UnicodeString;
i: Int64;
dummy: pointer;
begin begin
if FValueDone then if FValueDone then
exit(FValue); exit(FValue);
@ -729,6 +733,25 @@ begin
if not IsReadableLoc(Addr) then if not IsReadableLoc(Addr) then
exit; exit;
if t.Kind = skWideString then begin
if (t2 is TFpDwarfSymbolTypeSubRange) and (LowBound = 1) then begin
i := TFpDwarfSymbolTypeSubRange(t2).InformationEntry.AttribIdx(DW_AT_upper_bound, dummy);
if (i >=0) and
(TFpDwarfSymbolTypeSubRange(t2).InformationEntry.AttribForm[i] = DW_FORM_block1) and
(IsReadableMem(Addr) and (LocToAddr(Addr) > AddressSize))
then begin
// fpc issue 0035359
// read data and check for DW_OP_shr ?
Addr2 := Addr;
Addr2.Address := Addr2.Address - AddressSize;
if MemManager.ReadSignedInt(Addr2, AddressSize, i) then begin
if (i shr 1) = HighBound then
HighBound := i;
end
end;
end;
end;
if HighBound < LowBound then if HighBound < LowBound then
exit; // empty string exit; // empty string