i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also return the "commpage" image as one of the team's images.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31171 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-06-22 00:07:13 +00:00
parent ede842bb1d
commit faa04e8d93
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/debugger_interface/DebuggerInterface.cpp
+20
View File
@@ -12,6 +12,7 @@
#include <Locker.h> #include <Locker.h>
#include <AutoLocker.h> #include <AutoLocker.h>
#include <commpage_defs.h>
#include <util/DoublyLinkedList.h> #include <util/DoublyLinkedList.h>
#include "debug_utils.h" #include "debug_utils.h"
@@ -383,6 +384,7 @@ DebuggerInterface::GetThreadInfos(BObjectList<ThreadInfo>& infos)
status_t status_t
DebuggerInterface::GetImageInfos(BObjectList<ImageInfo>& infos) DebuggerInterface::GetImageInfos(BObjectList<ImageInfo>& infos)
{ {
// get the team's images
image_info imageInfo; image_info imageInfo;
int32 cookie = 0; int32 cookie = 0;
while (get_next_image_info(fTeamID, &cookie, &imageInfo) == B_OK) { while (get_next_image_info(fTeamID, &cookie, &imageInfo) == B_OK) {
@@ -395,6 +397,24 @@ DebuggerInterface::GetImageInfos(BObjectList<ImageInfo>& infos)
} }
} }
// Also add the "commpage" image, which belongs to the kernel, but is used
// by userland teams.
cookie = 0;
while (get_next_image_info(B_SYSTEM_TEAM, &cookie, &imageInfo) == B_OK) {
if ((addr_t)imageInfo.text >= USER_COMMPAGE_ADDR
&& (addr_t)imageInfo.text < USER_COMMPAGE_ADDR + COMMPAGE_SIZE) {
ImageInfo* info = new(std::nothrow) ImageInfo(B_SYSTEM_TEAM,
imageInfo.id, imageInfo.name, (addr_t)imageInfo.text,
imageInfo.text_size, (addr_t)imageInfo.data,
imageInfo.data_size);
if (info == NULL || !infos.AddItem(info)) {
delete info;
return B_NO_MEMORY;
}
break;
}
}
return B_OK; return B_OK;
} }