mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-15 04:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make hardware breakpoints work for process repord.

Browse Source 
* record.c (record_wait): Only adjust PC on software breakpoints
	hits.
This commit is contained in:
Pedro Alves 2009-11-22 15:47:31 +00:00
parent 9093389c0f
commit a9840291c6
2 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2009-11-22 Pedro Alves <pedro@codesourcery.com>
Make hardware breakpoints work for process repord.
* record.c (record_wait): Only adjust PC on software breakpoints
hits.
2009-11-22 Pedro Alves <pedro@codesourcery.com>
Michael Snyder <msnyder@vmware.com>

54
gdb/record.c
View File

@ -1097,6 +1097,7 @@ record_wait (struct target_ops *ops,
&& status->value.sig == TARGET_SIGNAL_TRAP)
{
struct regcache *regcache;
struct address_space *aspace;
/* Yes -- this is likely our single-step finishing,
but check if there's any reason the core would be
@ -1105,22 +1106,25 @@ record_wait (struct target_ops *ops,
registers_changed ();
regcache = get_current_regcache ();
tmp_pc = regcache_read_pc (regcache);
aspace = get_regcache_aspace (regcache);
if (target_stopped_by_watchpoint ())
{
/* Always interested in watchpoints. */
}
else if (breakpoint_inserted_here_p (get_regcache_aspace (regcache),
tmp_pc))
else if (breakpoint_inserted_here_p (aspace, tmp_pc))
{
/* There is a breakpoint here. Let the core
handle it. */
struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR decr_pc_after_break
= gdbarch_decr_pc_after_break (gdbarch);
if (decr_pc_after_break)
regcache_write_pc (regcache,
tmp_pc + decr_pc_after_break);
if (software_breakpoint_inserted_here_p (aspace, tmp_pc))
{
struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR decr_pc_after_break
= gdbarch_decr_pc_after_break (gdbarch);
if (decr_pc_after_break)
regcache_write_pc (regcache,
tmp_pc + decr_pc_after_break);
}
}
else
{
@ -1147,6 +1151,7 @@ record_wait (struct target_ops *ops,
{
struct regcache *regcache = get_current_regcache ();
struct gdbarch *gdbarch = get_regcache_arch (regcache);
struct address_space *aspace = get_regcache_aspace (regcache);
int continue_flag = 1;
int first_record_end = 1;
struct cleanup *old_cleanups = make_cleanup (record_wait_cleanups, 0);
@ -1159,18 +1164,20 @@ record_wait (struct target_ops *ops,
if (execution_direction == EXEC_FORWARD)
{
tmp_pc = regcache_read_pc (regcache);
if (breakpoint_inserted_here_p (get_regcache_aspace (regcache),
tmp_pc))
if (breakpoint_inserted_here_p (aspace, tmp_pc))
{
int decr_pc_after_break = gdbarch_decr_pc_after_break (gdbarch);
if (record_debug)
fprintf_unfiltered (gdb_stdlog,
"Process record: break at %s.\n",
paddress (gdbarch, tmp_pc));
if (gdbarch_decr_pc_after_break (gdbarch)
&& !record_resume_step)
if (decr_pc_after_break
&& !record_resume_step
&& software_breakpoint_inserted_here_p (aspace, tmp_pc))
regcache_write_pc (regcache,
tmp_pc +
gdbarch_decr_pc_after_break (gdbarch));
tmp_pc + decr_pc_after_break);
goto replay_out;
}
}
@ -1240,28 +1247,31 @@ record_wait (struct target_ops *ops,
/* check breakpoint */
tmp_pc = regcache_read_pc (regcache);
if (breakpoint_inserted_here_p (get_regcache_aspace (regcache),
tmp_pc))
if (breakpoint_inserted_here_p (aspace, tmp_pc))
{
int decr_pc_after_break
= gdbarch_decr_pc_after_break (gdbarch);
if (record_debug)
fprintf_unfiltered (gdb_stdlog,
"Process record: break "
"at %s.\n",
paddress (gdbarch, tmp_pc));
if (gdbarch_decr_pc_after_break (gdbarch)
if (decr_pc_after_break
&& execution_direction == EXEC_FORWARD
&& !record_resume_step)
&& !record_resume_step
&& software_breakpoint_inserted_here_p (aspace,
tmp_pc))
regcache_write_pc (regcache,
tmp_pc +
gdbarch_decr_pc_after_break (gdbarch));
tmp_pc + decr_pc_after_break);
continue_flag = 0;
}
if (record_hw_watchpoint)
{
if (record_debug)
fprintf_unfiltered (gdb_stdlog,
"Process record: hit hw watchpoint.\n");
fprintf_unfiltered (gdb_stdlog, "\
Process record: hit hw watchpoint.\n");
continue_flag = 0;
}
/* Check target signal */