[PATCH 3/3] Use aarch64_decode_insn in aarch64_displaced_step_copy_insn

Yao Qi
2015-10-29T14:42:20Z

gdb:

2015-10-29 Yao Qi <yao.qi@linaro.org>

* aarch64-tdep.c (aarch64_displaced_step_copy_insn): Call
aarch64_decode_insn and decode instruction by aarch64_inst.
---
gdb/aarch64-tdep.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 4bdd227..bc282e9 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -2500,9 +2500,13 @@ aarch64_displaced_step_copy_insn (struct gdbarch *gdbarch,
enum bfd_endian byte_order_for_code = gdbarch_byte_order_for_code (gdbarch);
uint32_t insn = read_memory_unsigned_integer (from, 4, byte_order_for_code);
struct aarch64_displaced_step_data dsd;
+ aarch64_inst inst;
+
+ if (aarch64_decode_insn (insn, &inst, 1) != 0)
+ return NULL;

/* Look for a Load Exclusive instruction which begins the sequence. */
- if (decode_masked_match (insn, 0x3fc00000, 0x08400000))
+ if (inst.opcode->iclass == ldstexcl && bit (insn, 22))
{
/* We can't displaced step atomic sequences. */
return NULL;
--
1.9.1