Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ExceptionConfigWindow: detect current exception status...

Browse Source 
...on startup by seeing if the breakpoints for the exception functions
are already installed or not.
This commit is contained in:
Rene Gollent 2013-06-15 14:49:25 -04:00
parent 7287380095
commit 607d59a103
2 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/apps/debugger/user_interface/gui/team_window/ExceptionConfigWindow.cpp
View File

@ -118,6 +118,24 @@ ExceptionConfigWindow::_Init()
fExceptionCaught->SetEnabled(false);
fCloseButton->SetTarget(this);
// check if the exception breakpoints are already installed
AutoLocker< ::Team> teamLocker(fTeam);
for (ImageList::ConstIterator it = fTeam->Images().GetIterator();
it.HasNext();) {
Image* image = it.Next();
ImageDebugInfo* info = image->GetImageDebugInfo();
target_addr_t address;
if (_FindExceptionFunction(info, address) != B_OK)
continue;
if (fTeam->BreakpointAtAddress(address) != NULL) {
fExceptionThrown->SetValue(B_CONTROL_ON);
break;
}
}
}
@ -125,25 +143,38 @@ void
ExceptionConfigWindow::_UpdateThrownBreakpoints(bool enable)
{
AutoLocker< ::Team> teamLocker(fTeam);
for (ImageList::ConstIterator it = fTeam->Images().GetIterator();
it.HasNext();) {
Image* image = it.Next();
ImageDebugInfo* info = image->GetImageDebugInfo();
if (info != NULL) {
FunctionInstance* instance = info->FunctionByName(
"__cxa_allocate_exception");
if (instance == NULL)
instance = info->FunctionByName("__throw(void)");
target_addr_t address;
if (_FindExceptionFunction(info, address) != B_OK)
continue;
if (instance != NULL) {
target_addr_t address = instance->Address();
if (enable)
fListener->SetBreakpointRequested(address, true);
else
fListener->ClearBreakpointRequested(address);
}
}
if (enable)
fListener->SetBreakpointRequested(address, true, true);
else
fListener->ClearBreakpointRequested(address);
}
}
status_t
ExceptionConfigWindow::_FindExceptionFunction(ImageDebugInfo* info,
target_addr_t& _foundAddress) const
{
if (info != NULL) {
FunctionInstance* instance = info->FunctionByName(
"__cxa_allocate_exception");
if (instance == NULL)
instance = info->FunctionByName("__throw(void)");
if (instance != NULL) {
_foundAddress = instance->Address();
return B_OK;
}
}
return B_NAME_NOT_FOUND;
}

5
src/apps/debugger/user_interface/gui/team_window/ExceptionConfigWindow.h
View File

@ -8,9 +8,12 @@
#include <Window.h>
#include "types/Types.h"
class BButton;
class BCheckBox;
class ImageDebugInfo;
class Team;
class UserInterfaceListener;
@ -36,6 +39,8 @@ public:
private:
void _Init();
void _UpdateThrownBreakpoints(bool enable);
status_t _FindExceptionFunction(ImageDebugInfo* info,
target_addr_t& _foundAddress) const;
private: