[Haiku-commits] r31117 - haiku/trunk/src/apps/debugger

[bonefish at BerliOS]

Author: bonefish
Date: 2009-06-19 17:17:58 +0200 (Fri, 19 Jun 2009)
New Revision: 31117
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31117&view=rev

Modified:
   haiku/trunk/src/apps/debugger/TeamDebugModel.cpp
   haiku/trunk/src/apps/debugger/TeamDebugModel.h
   haiku/trunk/src/apps/debugger/TeamDebugger.cpp
Log:
Added Architecture and DebuggerInterface to the TeamDebugModel.


Modified: haiku/trunk/src/apps/debugger/TeamDebugModel.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/TeamDebugModel.cpp	2009-06-19 15:09:56 UTC (rev 31116)
+++ haiku/trunk/src/apps/debugger/TeamDebugModel.cpp	2009-06-19 15:17:58 UTC (rev 31117)
@@ -13,9 +13,12 @@
 // #pragma mark - TeamDebugModel
 
 
-TeamDebugModel::TeamDebugModel(Team* team)
+TeamDebugModel::TeamDebugModel(Team* team, DebuggerInterface* debuggerInterface,
+	Architecture* architecture)
 	:
-	fTeam(team)
+	fTeam(team),
+	fDebuggerInterface(debuggerInterface),
+	fArchitecture(architecture)
 {
 }
 

Modified: haiku/trunk/src/apps/debugger/TeamDebugModel.h
===================================================================
--- haiku/trunk/src/apps/debugger/TeamDebugModel.h	2009-06-19 15:09:56 UTC (rev 31116)
+++ haiku/trunk/src/apps/debugger/TeamDebugModel.h	2009-06-19 15:17:58 UTC (rev 31117)
@@ -14,13 +14,19 @@
 //};
 
 
+class Architecture;
+class DebuggerInterface;
+
+
 class TeamDebugModel {
 public:
 			class Event;
 			class Listener;
 
 public:
-								TeamDebugModel(Team* team);
+								TeamDebugModel(Team* team,
+									DebuggerInterface* debuggerInterface,
+									Architecture* architecture);
 								~TeamDebugModel();
 
 			status_t			Init();
@@ -29,6 +35,10 @@
 			void				Unlock()	{ fTeam->Unlock(); }
 
 			Team*				GetTeam() const	{ return fTeam; }
+			DebuggerInterface*	GetDebuggerInterface() const
+									{ return fDebuggerInterface; }
+			Architecture*		GetArchitecture() const
+									{ return fArchitecture; }
 
 			void				AddListener(Listener* listener);
 			void				RemoveListener(Listener* listener);
@@ -38,6 +48,8 @@
 
 private:
 			Team*				fTeam;
+			DebuggerInterface*	fDebuggerInterface;
+			Architecture*		fArchitecture;
 			ListenerList		fListeners;
 };
 

Modified: haiku/trunk/src/apps/debugger/TeamDebugger.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/TeamDebugger.cpp	2009-06-19 15:09:56 UTC (rev 31116)
+++ haiku/trunk/src/apps/debugger/TeamDebugger.cpp	2009-06-19 15:17:58 UTC (rev 31117)
@@ -81,15 +81,6 @@
 	fTeam->SetName(teamInfo.args);
 		// TODO: Set a better name!
 
-	// create the team debug model
-	fDebugModel = new(std::nothrow) TeamDebugModel(fTeam);
-	if (fDebugModel == NULL)
-		return B_NO_MEMORY;
-
-	error = fDebugModel->Init();
-	if (error != B_OK)
-		return error;
-
 	// create our worker
 	fWorker = new(std::nothrow) Worker;
 	if (fWorker == NULL)
@@ -108,6 +99,16 @@
 	if (error != B_OK)
 		return error;
 
+	// create the team debug model
+	fDebugModel = new(std::nothrow) TeamDebugModel(fTeam, fDebuggerInterface,
+		fDebuggerInterface->GetArchitecture());
+	if (fDebugModel == NULL)
+		return B_NO_MEMORY;
+
+	error = fDebugModel->Init();
+	if (error != B_OK)
+		return error;
+
 	// set team debugging flags
 	fDebuggerInterface->SetTeamDebuggingFlags(
 		B_TEAM_DEBUG_THREADS | B_TEAM_DEBUG_IMAGES);