Ingo Weinhold
a4b0c19209
- Replaced StatementAtLine() by GetStatementLocationRange(), which doesn't
return a statement (i.e. also target addresses), but just a range in the
source code. This can also be implemented by FileSourceCode, which can
therefore be used for more than one instance of a function.
- Added GetStatementAtLocation() which kind of is also a replacement for
StatementAtLine(), but is optional and only provided by
DisassembledSourceCode.
- Added GetSourceFile(), which has to be provided when
GetStatementAtLocation() is not implemented.
- Kicked the statement stuff out of FileSourceCode. It only knows source
ranges, now.
* Team: Added GetStatementAtSourceLocation(), which is the real replacement for
SourceCode::StatementAtLine() in cases where a statement is actually
needed. It uses SourceCode::GetStatementAtLocation(), if available and
otherwise finds a function at the source location, and gets a statement for
one of its instances.
* TeamDebugInfo: Does now manage a source file -> functions map allowing to
look up functions at source file locations.
* DwarfImageDebugInfo:
- Switched the path in the source code hash table key for a LocatableFile,
which is cheaper to hash and to compare.
- Fixed bugs where the relocation delta was ignored.
- Replace a -1 in the SourceLocation column component by 0 to avoid
mismatches.
* SourceLocation: Changed component types from uint32 to int32. Otherwise -1 is
not representable.
Things mostly work as before starting the refactoring to support function
instances. All is not well yet, though. E.g. we don't merge the source code
information for common source files (like headers) provided by different
compilation units (or even images) yet. We need to do that, since the debug
info for a compilation unit only contains line number information for inline
functions (in headers) that are actually used.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31495 a95241bf-73f2-0310-859d-f6bbb57e9c96
75 lines
1.8 KiB
C++
75 lines
1.8 KiB
C++
/*
|
|
* Copyright 2009, Ingo Weinhold, [email protected].
|
|
* Distributed under the terms of the MIT License.
|
|
*/
|
|
#ifndef TEAM_DEBUG_INFO_H
|
|
#define TEAM_DEBUG_INFO_H
|
|
|
|
|
|
#include <ObjectList.h>
|
|
#include <Referenceable.h>
|
|
#include <util/OpenHashTable.h>
|
|
|
|
#include "ImageInfo.h"
|
|
|
|
|
|
class Architecture;
|
|
class DebuggerInterface;
|
|
class FileManager;
|
|
class Function;
|
|
class FunctionInstance;
|
|
class ImageDebugInfo;
|
|
class ImageInfo;
|
|
class LocatableFile;
|
|
class SourceLocation;
|
|
class SpecificTeamDebugInfo;
|
|
|
|
|
|
class TeamDebugInfo : public Referenceable {
|
|
public:
|
|
TeamDebugInfo(
|
|
DebuggerInterface* debuggerInterface,
|
|
Architecture* architecture,
|
|
FileManager* fileManager);
|
|
~TeamDebugInfo();
|
|
|
|
status_t Init();
|
|
|
|
status_t LoadImageDebugInfo(const ImageInfo& imageInfo,
|
|
LocatableFile* imageFile,
|
|
ImageDebugInfo*& _imageDebugInfo);
|
|
|
|
// team is locked
|
|
status_t AddImageDebugInfo(
|
|
ImageDebugInfo* imageDebugInfo);
|
|
void RemoveImageDebugInfo(
|
|
ImageDebugInfo* imageDebugInfo);
|
|
|
|
Function* FunctionAtSourceLocation(LocatableFile* file,
|
|
const SourceLocation& location);
|
|
|
|
private:
|
|
struct FunctionHashDefinition;
|
|
struct SourceFileEntry;
|
|
struct SourceFileHashDefinition;
|
|
|
|
typedef BObjectList<SpecificTeamDebugInfo> SpecificInfoList;
|
|
typedef OpenHashTable<FunctionHashDefinition> FunctionTable;
|
|
typedef OpenHashTable<SourceFileHashDefinition> SourceFileTable;
|
|
|
|
private:
|
|
status_t _AddFunction(Function* function);
|
|
void _RemoveFunction(Function* function);
|
|
|
|
private:
|
|
DebuggerInterface* fDebuggerInterface;
|
|
Architecture* fArchitecture;
|
|
FileManager* fFileManager;
|
|
SpecificInfoList fSpecificInfos;
|
|
FunctionTable* fFunctions;
|
|
SourceFileTable* fSourceFiles;
|
|
};
|
|
|
|
|
|
#endif // TEAM_DEBUG_INFO_H
|