diff options
| author | Pedro Alves <palves@redhat.com> | 2015-08-06 18:23:00 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-08-07 17:26:21 +0100 |
| commit | 7f03bd92e389a32da490bb55037881cf374d0f69 (patch) | |
| tree | 606d5caefa48369c6193bc6c4e568ae74cd9adf7 /gdb/infrun.c | |
| parent | 3fc8eb30a95df3fd07a63e9bd0a9d309b86a0357 (diff) | |
| download | gdb-7f03bd92e389a32da490bb55037881cf374d0f69.zip gdb-7f03bd92e389a32da490bb55037881cf374d0f69.tar.gz gdb-7f03bd92e389a32da490bb55037881cf374d0f69.tar.bz2 | |
PPC64: Fix gdb.arch/ppc64-atomic-inst.exp with displaced stepping
The ppc64 displaced step code can't handle atomic sequences. Fallback
to stepping over the breakpoint in-line if we detect one.
gdb/ChangeLog:
2015-08-07 Pedro Alves <palves@redhat.com>
* infrun.c (displaced_step_prepare_throw): Return -1 if
gdbarch_displaced_step_copy_insn returns NULL. Update intro
comment.
* rs6000-tdep.c (LWARX_MASK, LWARX_INSTRUCTION, LDARX_INSTRUCTION)
(STWCX_MASK, STWCX_INSTRUCTION, STDCX_INSTRUCTION): Move higher up
in file.
(ppc_displaced_step_copy_insn): New function.
(ppc_displaced_step_fixup): Update comment.
(rs6000_gdbarch_init): Install ppc_displaced_step_copy_insn as
gdbarch_displaced_step_copy_insn hook.
* gdbarch.sh (displaced_step_copy_insn): Document what happens on
NULL return.
* gdbarch.h: Regenerate.
gdb/testsuite/ChangeLog:
2015-08-07 Pedro Alves <palves@redhat.com>
* gdb.arch/ppc64-atomic-inst.exp (do_test): New procedure, move
tests here.
(top level): Run do_test with and without displaced stepping.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 157c12c..21aa8cf 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1711,7 +1711,9 @@ displaced_step_dump_bytes (struct ui_file *file, explain how we handle this case instead. Returns 1 if preparing was successful -- this thread is going to be - stepped now; or 0 if displaced stepping this thread got queued. */ + stepped now; 0 if displaced stepping this thread got queued; or -1 + if this instruction can't be displaced stepped. */ + static int displaced_step_prepare_throw (ptid_t ptid) { @@ -1795,9 +1797,14 @@ displaced_step_prepare_throw (ptid_t ptid) closure = gdbarch_displaced_step_copy_insn (gdbarch, original, copy, regcache); - - /* We don't support the fully-simulated case at present. */ - gdb_assert (closure); + if (closure == NULL) + { + /* The architecture doesn't know how or want to displaced step + this instruction or instruction sequence. Fallback to + stepping over the breakpoint in-line. */ + do_cleanups (old_cleanups); + return -1; + } /* Save the information we need to fix things up if the step succeeds. */ |