diff options
| author | Yao Qi <yao.qi@linaro.org> | 2016-01-06 15:03:41 +0000 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2016-01-06 15:03:41 +0000 |
| commit | f5aa306929127aacf9890a949f9a21b38a0e0e7e (patch) | |
| tree | 4fdc7a71696d9d4a934442c03f5d95470e6cfe0c /gdb/arch | |
| parent | b2ca446f682854c2b187178358b97174bf313fa7 (diff) | |
| download | gdb-f5aa306929127aacf9890a949f9a21b38a0e0e7e.zip gdb-f5aa306929127aacf9890a949f9a21b38a0e0e7e.tar.gz gdb-f5aa306929127aacf9890a949f9a21b38a0e0e7e.tar.bz2 | |
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.
Diffstat (limited to 'gdb/arch')
| -rw-r--r-- | gdb/arch/arm-get-next-pcs.c | 58 | ||||
| -rw-r--r-- | gdb/arch/arm-get-next-pcs.h | 8 |
2 files changed, 28 insertions, 38 deletions
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 */ |