paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 20:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: Fix Mac-ImageReader. Deal with Symbols of type N_PEXT. And fix, for entries where N_SECT is encountered before N_GSYM. Issue #39696

Browse Source
This commit is contained in:
Martin 2022-09-04 10:20:33 +02:00
parent 762b5bea38
commit a0b19ffcf9
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
components/fpdebug/fpimgreadermacho.pas
View File

@ -10,7 +10,7 @@ uses
LazFglHash, {$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif}, LazFileUtils, LazUTF8, LazFglHash, {$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif}, LazFileUtils, LazUTF8,
DbgIntfBaseTypes, DbgIntfBaseTypes,
// FpDebug // FpDebug
macho, FpImgReaderMachoFile, FpImgReaderBase, fpDbgSymTable, FpDbgUtil; macho, FpImgReaderMachoFile, FpImgReaderBase, fpDbgSymTable, FpDbgUtil, FpDbgLoader, FpDbgCommon;
type type
@ -43,7 +43,7 @@ type
public public
class function isValid(ASource: TDbgFileLoader): Boolean; override; class function isValid(ASource: TDbgFileLoader): Boolean; override;
class function UserName: AnsiString; override; class function UserName: AnsiString; override;
class procedure LoadSubFiles(ASubFiles: TStrings; ALoaderList: TFPObjectList); class procedure LoadSubFiles(ASubFiles: TStrings; ALoaderList: TDbgImageLoaderList);
procedure AddSubFilesToLoaderList(ALoaderList: TObject; PrimaryLoader: TObject); override; procedure AddSubFilesToLoaderList(ALoaderList: TObject; PrimaryLoader: TObject); override;
procedure ParseSymbolTable(AfpSymbolInfo: TfpSymbolList); override; procedure ParseSymbolTable(AfpSymbolInfo: TfpSymbolList); override;
public public
@ -53,9 +53,6 @@ type
implementation implementation
uses
FpDbgLoader, FpDbgCommon;
var var
DBG_VERBOSE, DBG_WARNINGS: PLazLoggerLogGroup; DBG_VERBOSE, DBG_WARNINGS: PLazLoggerLogGroup;
@ -170,7 +167,7 @@ begin
Result:='mach-o file'; Result:='mach-o file';
end; end;
class procedure TDbgMachoDataSource.LoadSubFiles(ASubFiles: TStrings; ALoaderList: TFPObjectList); class procedure TDbgMachoDataSource.LoadSubFiles(ASubFiles: TStrings; ALoaderList: TDbgImageLoaderList);
var var
DwarfDebugMap: TAppleDwarfDebugMap; DwarfDebugMap: TAppleDwarfDebugMap;
Loader: TDbgImageLoader; Loader: TDbgImageLoader;
@ -633,14 +630,16 @@ var
StringOffset: uint32_t; StringOffset: uint32_t;
SymbolValue: QWord; SymbolValue: QWord;
State: TDebugTableState; State: TDebugTableState;
AddressMap: TDbgAddressMap; AddressMap, AddressMapTmp: TDbgAddressMap;
ProcName: string; ProcName: string;
DwarfDebugMap: TAppleDwarfDebugMap; DwarfDebugMap: TAppleDwarfDebugMap;
FullDwarfDebugMap: TDbgAddressMapPointerHashList; FullDwarfDebugMap: TDbgAddressMapPointerHashList;
TmpAddressMapList: TDbgAddressMapHashList;
ind: THTCustomNode; ind: THTCustomNode;
begin begin
DwarfDebugMap:=nil; DwarfDebugMap:=nil;
FullDwarfDebugMap := TDbgAddressMapPointerHashList.Create; FullDwarfDebugMap := TDbgAddressMapPointerHashList.Create;
TmpAddressMapList := TDbgAddressMapHashList.Create;
p := Section[_symbol]; p := Section[_symbol];
ps := Section[_symbolstrings]; ps := Section[_symbolstrings];
if assigned(p) and assigned(ps) then if assigned(p) and assigned(ps) then
@ -685,9 +684,21 @@ begin
DwarfDebugMap.Dir := pchar(SymbolStr+StringOffset); DwarfDebugMap.Dir := pchar(SymbolStr+StringOffset);
state := dtsDir; state := dtsDir;
end end
else if (SymbolType in [14,15]) then begin else if (SymbolType and not uint8_t(N_EXT or N_PEXT) = N_SECT) and (SymbolValue <> 0) then begin
ind := FullDwarfDebugMap.Find(pchar(SymbolStr+StringOffset)); ind := FullDwarfDebugMap.Find(pchar(SymbolStr+StringOffset));
if (ind <> nil) and (FullDwarfDebugMap.ItemPointerFromNode(ind)^.NewAddr = 0) then begin if (ind = nil) then begin
ind := TmpAddressMapList.Find(pchar(SymbolStr+StringOffset));
if (ind = nil) then begin
AddressMapTmp.NewAddr:=SymbolValue;
AddressMapTmp.OrgAddr:=0;
AddressMapTmp.Length:=0;
TmpAddressMapList.Add(pchar(SymbolStr+StringOffset), AddressMapTmp);
end
else
TmpAddressMapList.ItemPointerFromNode(ind)^.NewAddr := SymbolValue;
end
else
if (FullDwarfDebugMap.ItemPointerFromNode(ind)^.NewAddr = 0) then begin
FullDwarfDebugMap.ItemPointerFromNode(ind)^.NewAddr := SymbolValue; FullDwarfDebugMap.ItemPointerFromNode(ind)^.NewAddr := SymbolValue;
end; end;
end; end;
@ -722,8 +733,14 @@ begin
AddressMap.NewAddr:=SymbolValue; AddressMap.NewAddr:=SymbolValue;
AddressMap.OrgAddr:=0; AddressMap.OrgAddr:=0;
AddressMap.Length:=0; AddressMap.Length:=0;
DwarfDebugMap.GlobalList.Add(pchar(SymbolStr+StringOffset), AddressMap);
if (SymbolType = N_GSYM) and (SymbolValue = 0) then begin if (SymbolType = N_GSYM) and (SymbolValue = 0) then begin
ind := TmpAddressMapList.Find(pchar(SymbolStr+StringOffset));
if (ind <> nil) then begin
AddressMap.NewAddr:=TmpAddressMapList.ItemPointerFromNode(ind)^.NewAddr ;
end;
end;
DwarfDebugMap.GlobalList.Add(pchar(SymbolStr+StringOffset), AddressMap);
if (SymbolType = N_GSYM) and (AddressMap.NewAddr = 0) then begin
ind := DwarfDebugMap.GlobalList.Find(pchar(SymbolStr+StringOffset)); ind := DwarfDebugMap.GlobalList.Find(pchar(SymbolStr+StringOffset));
FullDwarfDebugMap.Add(pchar(SymbolStr+StringOffset), FullDwarfDebugMap.Add(pchar(SymbolStr+StringOffset),
DwarfDebugMap.GlobalList.ItemPointerFromNode(ind)); DwarfDebugMap.GlobalList.ItemPointerFromNode(ind));
@ -765,6 +782,7 @@ begin
end; end;
end; end;
FullDwarfDebugMap.Free; FullDwarfDebugMap.Free;
TmpAddressMapList.Free
end; end;
procedure TDbgMachoDataSource.ParseSubAppleDwarfDataMap(ADebugMap: TObject); procedure TDbgMachoDataSource.ParseSubAppleDwarfDataMap(ADebugMap: TObject);
@ -814,18 +832,7 @@ begin
StringOffset := SymbolArr[i].n_un.n_strx; StringOffset := SymbolArr[i].n_un.n_strx;
SymbolValue := SymbolArr[i].n_value; SymbolValue := SymbolArr[i].n_value;
end; end;
if SymbolType = N_SECT then if SymbolType and not uint8_t(N_EXT or N_PEXT) = N_SECT then
begin
s := pchar(SymbolStr+StringOffset);
ind := MainDwarfDebugMap.GlobalList.Find(s);
if assigned(ind) then
begin
AddressMap:=MainDwarfDebugMap.GlobalList.ItemFromNode(ind);
AddressMap.OrgAddr:=SymbolValue;
AddressMapList.Add(AddressMap);
end;
end;
if SymbolType = N_SECT+N_EXT then
begin begin
s := pchar(SymbolStr+StringOffset); s := pchar(SymbolStr+StringOffset);
ind := MainDwarfDebugMap.GlobalList.Find(s); ind := MainDwarfDebugMap.GlobalList.Find(s);