aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Qi <yao.qi@linaro.org>2016-10-10 11:11:25 +0100
committerYao Qi <yao.qi@linaro.org>2016-10-10 11:11:25 +0100
commita1078bea751d48e8846b91542d91647f1e0aed8d (patch)
treebdcb7d3f091fec0c7e039ce9922d9e40b913eec8
parent97ce08cb8071bf9a8df6c99cdf8e9fbf1911f3f5 (diff)
downloadgdb-a1078bea751d48e8846b91542d91647f1e0aed8d.zip
gdb-a1078bea751d48e8846b91542d91647f1e0aed8d.tar.gz
gdb-a1078bea751d48e8846b91542d91647f1e0aed8d.tar.bz2
Share enum arm_breakpoint_kinds
This patch shares "enum arm_breakpoint_kinds", and use ARM_BP_KIND_THUMB2 in GDB. gdb: 2016-10-10 Yao Qi <yao.qi@linaro.org> * arch/arm.h (enum arm_breakpoint_kinds): New. * arm-tdep.c (arm_remote_breakpoint_from_pc): Use ARM_BP_KIND_THUMB2. gdb/gdbserver: 2016-10-10 Yao Qi <yao.qi@linaro.org> * linux-aarch32-low.c (enum arm_breakpoint_kinds): Remove.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/arch/arm.h8
-rw-r--r--gdb/arm-tdep.c2
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/gdbserver/linux-aarch32-low.c8
5 files changed, 19 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aac2b4b..5664a50 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2016-10-10 Yao Qi <yao.qi@linaro.org>
+ * arch/arm.h (enum arm_breakpoint_kinds): New.
+ * arm-tdep.c (arm_remote_breakpoint_from_pc): Use
+ ARM_BP_KIND_THUMB2.
+
+2016-10-10 Yao Qi <yao.qi@linaro.org>
+
* m32c-tdep.c (m32c_gdbarch_init): Rename local 'arch' by
'gdbarch'.
diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h
index fcde3d0..8d9c34e 100644
--- a/gdb/arch/arm.h
+++ b/gdb/arch/arm.h
@@ -58,6 +58,14 @@ enum gdb_regnum {
ARM_LAST_FP_ARG_REGNUM = ARM_F3_REGNUM
};
+/* Enum describing the different kinds of breakpoints. */
+enum arm_breakpoint_kinds
+{
+ ARM_BP_KIND_THUMB = 2,
+ ARM_BP_KIND_THUMB2 = 3,
+ ARM_BP_KIND_ARM = 4,
+};
+
/* Instruction condition field values. */
#define INST_EQ 0x0
#define INST_NE 0x1
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 4211cd5..27a3ebe 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -7900,7 +7900,7 @@ arm_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr,
if (arm_pc_is_thumb (gdbarch, *pcptr) && *kindptr == 4)
/* The documented magic value for a 32-bit Thumb-2 breakpoint, so
that this is not confused with a 32-bit ARM breakpoint. */
- *kindptr = 3;
+ *kindptr = ARM_BP_KIND_THUMB2;
}
/* Extract from an array REGBUF containing the (raw) register state a
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 371431b..1064fcf 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-10 Yao Qi <yao.qi@linaro.org>
+
+ * linux-aarch32-low.c (enum arm_breakpoint_kinds): Remove.
+
2016-10-06 Sergio Durigan Junior <sergiodj@redhat.com>
* target.c (target_supports_multi_process): New function, moved
diff --git a/gdb/gdbserver/linux-aarch32-low.c b/gdb/gdbserver/linux-aarch32-low.c
index 463bce6..5547cf6 100644
--- a/gdb/gdbserver/linux-aarch32-low.c
+++ b/gdb/gdbserver/linux-aarch32-low.c
@@ -219,14 +219,6 @@ arm_breakpoint_at (CORE_ADDR where)
return 0;
}
-/* Enum describing the different kinds of breakpoints. */
-enum arm_breakpoint_kinds
-{
- ARM_BP_KIND_THUMB = 2,
- ARM_BP_KIND_THUMB2 = 3,
- ARM_BP_KIND_ARM = 4,
-};
-
/* Implementation of linux_target_ops method "breakpoint_kind_from_pc".
Determine the type and size of breakpoint to insert at PCPTR. Uses the