* Since disassembled code is actually function instance specific,

FunctionInstance does now also have a (DisassembledCode) source code
  attribute. Function keeps its attribute, but it explicitly is a
  FileSourceCode now.
* SourceCode:
  - Removed GetStatementAtLocation(). Instead DisassembledCode has a
    StatementAtLocation() now. As well as a StatementAtAddress() and
    StatementAddressRange(). Rather cast to the subclass (in two instances)
    instead of having those methods in the base class. In most cases we already
    have the subclasses now, anyway.
  - Added Lock()/Unlock(), which are implemented in FileSourceCode. The
    statement ranges are no longer immutable, so we have to lock.
* TeamDebugModel:
  - Revived GetBreakpointsInAddressRange().
  - GetBreakpointsForSourceCode(): Optimized for DisassembledCode and fixed
    in the FileSourceCode case. We need to compare with the functions' source
    file instead of their source code, since they might not have the source
    code set yet. Fixed two instances of the same problem in SourceView. Setting
    breakpoints in functions that have no associated source code yet, works now.
* Team:
  - GetStatementAtAddress(): Optimized by using the DisassembledCode, if
    available.
  - GetStatementAtSourceLocation(): If the supplied source code is
    DisassembledCode, we have to get the statement from it directly, since
    we can't get that information from the image debug info.
* TeamDebugInfo: Added LoadSourceCode() and DisassembleFunction(), the new way
  to get FileSourceCode respectively DisassembledCode. SpecificTeamDebugInfo
  has lost LoadSourceCode() and gained service methods AddSourceCodeInfo() and
  ReadCode(). This avoids unnecessary code duplication in the subclasses.
  Moreover it allows for joining source location info source files from
  different images (and compilation units) -- interesting for inline functions
  in headers.
* Adjusted LoadSourceCodeJob and TeamDebugger::FunctionSourceCodeRequested()
  accordingly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31514 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/debugger/debug_info/TeamDebugInfo.h

@@ -6,6 +6,8 @@
 #define TEAM_DEBUG_INFO_H
 
 
+#include <Locker.h>
+
 #include <ObjectList.h>
 #include <Referenceable.h>
 #include <util/OpenHashTable.h>
@@ -15,12 +17,15 @@
 
 class Architecture;
 class DebuggerInterface;
+class DisassembledCode;
 class FileManager;
+class FileSourceCode;
 class Function;
 class FunctionInstance;
 class ImageDebugInfo;
 class ImageInfo;
 class LocatableFile;
+class SourceCode;
 class SourceLocation;
 class SpecificTeamDebugInfo;
 
@@ -39,6 +44,15 @@ public:
 									LocatableFile* imageFile,
 									ImageDebugInfo*& _imageDebugInfo);
 
+			status_t			LoadSourceCode(LocatableFile* file,
+									FileSourceCode*& _sourceCode);
+										// returns reference
+			status_t			DisassembleFunction(
+									FunctionInstance* functionInstance,
+									DisassembledCode*& _sourceCode);
+										// returns reference
+
+
 			// team is locked
 			status_t			AddImageDebugInfo(
 									ImageDebugInfo* imageDebugInfo);
@@ -54,6 +68,7 @@ private:
 			struct SourceFileHashDefinition;
 
 			typedef BObjectList<SpecificTeamDebugInfo> SpecificInfoList;
+			typedef BObjectList<ImageDebugInfo> ImageList;
 			typedef OpenHashTable<FunctionHashDefinition> FunctionTable;
 			typedef OpenHashTable<SourceFileHashDefinition> SourceFileTable;
 
@@ -62,10 +77,12 @@ private:
 			void				_RemoveFunction(Function* function);
 
 private:
+			BLocker				fLock;
 			DebuggerInterface*	fDebuggerInterface;
 			Architecture*		fArchitecture;
 			FileManager*		fFileManager;
 			SpecificInfoList	fSpecificInfos;
+			ImageList			fImages;
 			FunctionTable*		fFunctions;
 			SourceFileTable*	fSourceFiles;
 };