christoph/fail
1
Fork 0
Code Releases Activity

The patch I announced on the mailing list regarding address space recognition.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1275 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-05-28 09:23:27 +00:00
parent ae1459e6fd
commit ebd62281c3
27 changed files with 642 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/SAL/SimulatorController.cc
View File

@ -42,7 +42,7 @@ void SimulatorController::initExperiments()
/* empty. */
}
void SimulatorController::onBreakpointEvent(address_t instrPtr)
void SimulatorController::onBreakpointEvent(address_t instrPtr, address_t address_space)
{
assert(false &&
"FIXME: SimulatorController::onBreakpointEvent() has not been tested before");
@ -54,8 +54,8 @@ void SimulatorController::onBreakpointEvent(address_t instrPtr)
while (it != m_EvList.end())
{
fi::BaseEvent* pev = *it;
fi::BPEvent* pbp; fi::BPRangeEvent* pbpr;
if((pbp = dynamic_cast<fi::BPEvent*>(pev)) && pbp->isMatching(instrPtr))
fi::BPSingleEvent* pbp; fi::BPRangeEvent* pbpr;
if((pbp = dynamic_cast<fi::BPSingleEvent*>(pev)) && pbp->isMatching(instrPtr, address_space))
{
pbp->setTriggerInstructionPointer(instrPtr);
it = m_EvList.makeActive(it);
@ -64,7 +64,7 @@ void SimulatorController::onBreakpointEvent(address_t instrPtr)
continue; // -> skip iterator increment
}
else if((pbpr = dynamic_cast<fi::BPRangeEvent*>(pev)) &&
pbpr->isMatching(instrPtr))
pbpr->isMatching(instrPtr, address_space))
{
pbpr->setTriggerInstructionPointer(instrPtr);
it = m_EvList.makeActive(it);