[PATCH 05/13] Share enum arm_breakpoint_kinds

Yao Qi
2016-08-31T15:06:34Z

This patch shares "enum arm_breakpoint_kinds", and use ARM_BP_KIND_THUMB2
in GDB.

gdb:

2016-08-31 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-08-31 Yao Qi <yao.qi@linaro.org>

* linux-aarch32-low.c (enum arm_breakpoint_kinds): Remove.
---
gdb/arch/arm.h | 8 ++++++++
gdb/arm-tdep.c | 2 +-
gdb/gdbserver/linux-aarch32-low.c | 8 --------
3 files changed, 9 insertions(+), 9 deletions(-)

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 d2661cb..16dc574 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -7849,7 +7849,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/linux-aarch32-low.c b/gdb/gdbserver/linux-aarch32-low.c
index e6971d5..ffc7ace 100644
--- a/gdb/gdbserver/linux-aarch32-low.c
+++ b/gdb/gdbserver/linux-aarch32-low.c
@@ -215,14 +215,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
--
1.9.1