Debugger: Cleanups, no functional change.

- Add virtual hook to TeamMemory for retrieving area information from the target team. - Implement said hook in DebuggerInterface. - Adjust RetrieveMemoryBlockJob to use said hook to retrieve the writable state of the target block rather than calling get_memory_properties() directly.
haiku · May 26, 2015 · d281548 · d281548
1 parent 444a32d
commit d281548
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/apps/debugger/debugger_interface/DebuggerInterface.cpp b/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
@@ -13,6 +13,7 @@
 #include <Locker.h>
 
 #include <AutoLocker.h>
+#include <memory_private.h>
 #include <OS.h>
 #include <system_info.h>
 #include <util/DoublyLinkedList.h>
@@ -708,6 +709,15 @@ DebuggerInterface::GetCpuFeatures(uint32& flags)
 }
 
 
+status_t
+DebuggerInterface::GetMemoryProperties(target_addr_t address,
+	uint32& protection, uint32& locking)
+{
+	return get_memory_properties(fTeamID, (const void *)address,
+		&protection, &locking);
+}
+
+
 ssize_t
 DebuggerInterface::ReadMemory(target_addr_t address, void* buffer, size_t size)
 {

diff --git a/src/apps/debugger/debugger_interface/DebuggerInterface.h b/src/apps/debugger/debugger_interface/DebuggerInterface.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
- * Copyright 2010-2013, Rene Gollent, rene@gollent.com.
+ * Copyright 2010-2015, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 #ifndef DEBUGGER_INTERFACE_H
@@ -83,6 +83,9 @@ class DebuggerInterface : public TeamMemory {
 	virtual	status_t			GetCpuFeatures(uint32& flags);
 
 	// TeamMemory
+	virtual	status_t			GetMemoryProperties(target_addr_t address,
+									uint32& protection, uint32& locking);
+
 	virtual	ssize_t				ReadMemory(target_addr_t address, void* buffer,
 									size_t size);
 	virtual	ssize_t				WriteMemory(target_addr_t address,

diff --git a/src/apps/debugger/jobs/RetrieveMemoryBlockJob.cpp b/src/apps/debugger/jobs/RetrieveMemoryBlockJob.cpp
@@ -7,7 +7,6 @@
 #include "Jobs.h"
 
 #include <AutoLocker.h>
-#include <memory_private.h>
 
 #include "Team.h"
 #include "TeamMemory.h"
@@ -53,8 +52,8 @@ RetrieveMemoryBlockJob::Do()
 
 	uint32 protection = 0;
 	uint32 locking = 0;
-	status_t error = get_memory_properties(fTeam->ID(),
-		(const void *)fMemoryBlock->BaseAddress(), &protection, &locking);
+	status_t error = fTeamMemory->GetMemoryProperties(
+		fMemoryBlock->BaseAddress(), protection, locking);
 	if (error != B_OK) {
 		fMemoryBlock->NotifyDataRetrieved(error);
 		return error;

diff --git a/src/apps/debugger/model/TeamMemory.h b/src/apps/debugger/model/TeamMemory.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2015, Rene Gollent, rene@gollent.com.
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
@@ -19,6 +20,9 @@ class TeamMemory : public BReferenceable {
 	virtual						~TeamMemory();
 
 
+	virtual	status_t			GetMemoryProperties(target_addr_t baseAddress,
+									uint32& protection, uint32& locking) = 0;
+
 	virtual	ssize_t				ReadMemory(target_addr_t address, void* buffer,
 									size_t size) = 0;
 	virtual	status_t			ReadMemoryString(target_addr_t address,