Re: [PATCH v8 5/7] Support software single step on ARM in GDBServer

Yao Qi
2016-01-06T14:42:21Z

Antoine Tremblay <antoine.tremblay@ericsson.com> writes:

Hi Antoine,

> +/* Find the next possible PCs for thumb mode. */
> +VEC (CORE_ADDR) *thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
> + CORE_ADDR pc);
> +
> +/* Find the next possible PCs for arm mode. */
> +VEC (CORE_ADDR) *arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
> + CORE_ADDR pc);
> +
> +#endif /* ARM_GET_NEXT_PCS_H */

Is there any reason to make them extern? I have a patch below to make
them static. What do you think?

--
Yao (齐尧)
From 69e090308baae43f6d5ee80188c935cd701448ea Mon Sep 17 00:00:00 2001
From: Yao Qi <yao.qi@linaro.org>
Date: Wed, 6 Jan 2016 13:41:35 +0000
Subject: [PATCH] Make {arm,thumb}_get_next_pcs_raw static

This patch makes arm_get_next_pcs_raw and thumb_get_next_pcs_raw
static.

gdb:

2016-01-06 Yao Qi <yao.qi@linaro.org>

* arch/arm-get-next-pcs.c (arm_get_next_pcs): Move it to some
lines below.
(thumb_get_next_pcs_raw): Make it static.
(arm_get_next_pcs_raw): Likewise.
* arch/arm-get-next-pcs.h (thumb_get_next_pcs_raw): Remove the
declaration.
(arm_get_next_pcs_raw): Likewise.

diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c
index 4db74e7..aba45e3 100644
--- a/gdb/arch/arm-get-next-pcs.c
+++ b/gdb/arch/arm-get-next-pcs.c
@@ -258,34 +258,10 @@ arm_deal_with_atomic_sequence_raw (struct arm_get_next_pcs *self,
return next_pcs;
}

-/* See arm-get-next-pcs.h. */
-
-VEC (CORE_ADDR) *
-arm_get_next_pcs (struct arm_get_next_pcs *self, CORE_ADDR pc)
-{
- VEC (CORE_ADDR) *next_pcs = NULL;
-
- if (self->ops->is_thumb (self))
- {
- next_pcs = thumb_deal_with_atomic_sequence_raw (self, pc);
- if (next_pcs == NULL)
- next_pcs = thumb_get_next_pcs_raw (self, pc);
- }
- else
- {
- next_pcs = arm_deal_with_atomic_sequence_raw (self, pc);
- if (next_pcs == NULL)
- next_pcs = arm_get_next_pcs_raw (self, pc);
- }
+/* Find the next possible PCs for thumb mode. */

- return next_pcs;
-}
-
-/* See arm-get-next-pcs.h. */
-
-VEC (CORE_ADDR) *
-thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
- CORE_ADDR pc)
+static VEC (CORE_ADDR) *
+thumb_get_next_pcs_raw (struct arm_get_next_pcs *self, CORE_ADDR pc)
{
int byte_order = self->byte_order;
int byte_order_for_code = self->byte_order_for_code;
@@ -664,9 +640,8 @@ thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
in Thumb-State, and gdbarch_addr_bits_remove () to get the plain memory
address in GDB and arm_addr_bits_remove in GDBServer. */

-VEC (CORE_ADDR) *
-arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
- CORE_ADDR pc)
+static VEC (CORE_ADDR) *
+arm_get_next_pcs_raw (struct arm_get_next_pcs *self, CORE_ADDR pc)
{
int byte_order = self->byte_order;
unsigned long pc_val;
@@ -924,3 +899,26 @@ arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
VEC_safe_push (CORE_ADDR, next_pcs, nextpc);
return next_pcs;
}
+
+/* See arm-get-next-pcs.h. */
+
+VEC (CORE_ADDR) *
+arm_get_next_pcs (struct arm_get_next_pcs *self, CORE_ADDR pc)
+{
+ VEC (CORE_ADDR) *next_pcs = NULL;
+
+ if (self->ops->is_thumb (self))
+ {
+ next_pcs = thumb_deal_with_atomic_sequence_raw (self, pc);
+ if (next_pcs == NULL)
+ next_pcs = thumb_get_next_pcs_raw (self, pc);
+ }
+ else
+ {
+ next_pcs = arm_deal_with_atomic_sequence_raw (self, pc);
+ if (next_pcs == NULL)
+ next_pcs = arm_get_next_pcs_raw (self, pc);
+ }
+
+ return next_pcs;
+}
diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h
index fdbc9bc..895e866 100644
--- a/gdb/arch/arm-get-next-pcs.h
+++ b/gdb/arch/arm-get-next-pcs.h
@@ -59,12 +59,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
VEC (CORE_ADDR) *arm_get_next_pcs (struct arm_get_next_pcs *self,
CORE_ADDR pc);

-/* Find the next possible PCs for thumb mode. */
-VEC (CORE_ADDR) *thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
- CORE_ADDR pc);
-
-/* Find the next possible PCs for arm mode. */
-VEC (CORE_ADDR) *arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
- CORE_ADDR pc);
-
#endif /* ARM_GET_NEXT_PCS_H */