OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Yao Qi 2016-01-06 15:03:41 +00:00
parent b2ca446f68
commit f5aa306929
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
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.
2016-01-05 Mike Frysinger <vapier@gentoo.org>
* version.in: Change cvs to git.

58
gdb/arch/arm-get-next-pcs.c
View File

@ -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. */
/* Find the next possible PCs for thumb mode. */
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;
}
/* 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;
}

8
gdb/arch/arm-get-next-pcs.h
View File

@ -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 */