maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Foe x86_64/i386, piggyback the hardware index of the fired watchpoint in the exception 

data sent back to the debugger.  On the debugger side, use the opportunity during the
StopInfoMachException::CreateStopReasonWithMachException() method to set the hardware index
for the very watchpoint location.

llvm-svn: 139975
This commit is contained in:
Johnny Chen 2011-09-17 01:05:03 +00:00
parent 2fd3d401f9
commit 236888d026
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp
View File

@ -245,7 +245,8 @@ StopInfoMachException::CreateStopReasonWithMachException
uint32_t exc_type,
uint32_t exc_data_count,
uint64_t exc_code,
uint64_t exc_sub_code
uint64_t exc_sub_code,
uint64_t exc_sub_sub_code
)
{
if (exc_type != 0)
@ -303,10 +304,17 @@ StopInfoMachException::CreateStopReasonWithMachException
return StopInfo::CreateStopReasonToTrace(thread);
// It's a watchpoint, then.
// The exc_sub_code indicates the data break address.
lldb::WatchpointLocationSP wp_loc_sp =
thread.GetProcess().GetTarget().GetWatchpointLocationList().FindByAddress((lldb::addr_t)exc_sub_code);
if (wp_loc_sp)
{
// Debugserver may piggyback the hardware index of the fired watchpoint in the exception data.
// Set the hardware index if that's the case.
if (exc_data_count >=3)
wp_loc_sp->SetHardwareIndex((uint32_t)exc_sub_sub_code);
return StopInfo::CreateStopReasonWithWatchpointID(thread, wp_loc_sp->GetID());
}
}
else if (exc_code == 2) // EXC_I386_BPT
{

3
lldb/source/Plugins/Process/Utility/StopInfoMachException.h
View File

@ -60,7 +60,8 @@ public:
uint32_t exc_type,
uint32_t exc_data_count,
uint64_t exc_code,
uint64_t exc_subcode);
uint64_t exc_sub_code,
uint64_t exc_sub_sub_code);
protected:
uint32_t m_exc_data_count;

3
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
View File

@ -1228,7 +1228,8 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
exc_type,
exc_data_size,
exc_data_size >= 1 ? exc_data[0] : 0,
exc_data_size >= 2 ? exc_data[1] : 0));
exc_data_size >= 2 ? exc_data[1] : 0,
exc_data_size >= 3 ? exc_data[2] : 0));
}
else
{

4
lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
View File

@ -645,7 +645,11 @@ DNBArchImplI386::NotifyException(MachException::Data& exc)
nub_addr_t addr = 0;
uint32_t hw_index = GetHardwareWatchpointHit(addr);
if (hw_index != INVALID_NUB_HW_INDEX)
{
exc.exc_data[1] = addr;
// Piggyback the hw_index in the exc.data.
exc.exc_data.push_back(hw_index);
}
return true;
}

4
lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
View File

@ -574,7 +574,11 @@ DNBArchImplX86_64::NotifyException(MachException::Data& exc)
nub_addr_t addr = 0;
uint32_t hw_index = GetHardwareWatchpointHit(addr);
if (hw_index != INVALID_NUB_HW_INDEX)
{
exc.exc_data[1] = addr;
// Piggyback the hw_index in the exc.data.
exc.exc_data.push_back(hw_index);
}
return true;
}