espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 14:49:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Arm/AArch64: Split DISPLACED_MODIFIED_INSNS name clash

Browse Source 
Both targets define DISPLACED_MODIFIED_INSNS, each with different values.
Add ARM_ and AARCH64_ to the start of the name to prevent confusion.

No functionality changes.

gdb/ChangeLog:

	* aarch64-linux-tdep.c (aarch64_linux_init_abi): Use
	AARCH64_DISPLACED_MODIFIED_INSNS.
	* aarch64-tdep.c (struct aarch64_displaced_step_data)
	(aarch64_displaced_step_copy_insn): Likewise.
	* aarch64-tdep.h (DISPLACED_MODIFIED_INSNS): Rename from..
	(AARCH64_DISPLACED_MODIFIED_INSNS): ...to this.
	* arm-linux-tdep.c (arm_linux_cleanup_svc): Use
	ARM_DISPLACED_MODIFIED_INSNS.
	* arm-tdep.c (arm_gdbarch_init): Likewise.
	* arm-tdep.h (DISPLACED_MODIFIED_INSNS): Rename from..
	(ARM_DISPLACED_MODIFIED_INSNS): ...to this.
	(struct arm_displaced_step_closure): Use
	ARM_DISPLACED_MODIFIED_INSNS.
This commit is contained in:
Alan Hayward
2019-07-04 12:41:20 +01:00
parent df0bb381e2
commit e935475cb6
7 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdb/ChangeLog
View File

@ -1,3 +1,19 @@
2019-07-04 Alan Hayward <alan.hayward@arm.com>
* aarch64-linux-tdep.c (aarch64_linux_init_abi): Use
AARCH64_DISPLACED_MODIFIED_INSNS.
* aarch64-tdep.c (struct aarch64_displaced_step_data)
(aarch64_displaced_step_copy_insn): Likewise.
* aarch64-tdep.h (DISPLACED_MODIFIED_INSNS): Rename from..
(AARCH64_DISPLACED_MODIFIED_INSNS): ...to this.
* arm-linux-tdep.c (arm_linux_cleanup_svc): Use
ARM_DISPLACED_MODIFIED_INSNS.
* arm-tdep.c (arm_gdbarch_init): Likewise.
* arm-tdep.h (DISPLACED_MODIFIED_INSNS): Rename from..
(ARM_DISPLACED_MODIFIED_INSNS): ...to this.
(struct arm_displaced_step_closure): Use
ARM_DISPLACED_MODIFIED_INSNS.
2019-07-04 Alan Hayward <alan.hayward@arm.com> 2019-07-04 Alan Hayward <alan.hayward@arm.com>
* features/Makefile: Remove unused xml files. * features/Makefile: Remove unused xml files.

2
gdb/aarch64-linux-tdep.c
View File

@ -1658,7 +1658,7 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_gdbarch_get_syscall_number (gdbarch, aarch64_linux_get_syscall_number); set_gdbarch_get_syscall_number (gdbarch, aarch64_linux_get_syscall_number);
/* Displaced stepping. */ /* Displaced stepping. */
set_gdbarch_max_insn_length (gdbarch, 4 * DISPLACED_MODIFIED_INSNS); set_gdbarch_max_insn_length (gdbarch, 4 * AARCH64_DISPLACED_MODIFIED_INSNS);
set_gdbarch_displaced_step_copy_insn (gdbarch, set_gdbarch_displaced_step_copy_insn (gdbarch,
aarch64_displaced_step_copy_insn); aarch64_displaced_step_copy_insn);
set_gdbarch_displaced_step_fixup (gdbarch, aarch64_displaced_step_fixup); set_gdbarch_displaced_step_fixup (gdbarch, aarch64_displaced_step_fixup);

4
gdb/aarch64-tdep.c
View File

@ -2756,7 +2756,7 @@ struct aarch64_displaced_step_data
/* The address where the instruction will be executed at. */ /* The address where the instruction will be executed at. */
CORE_ADDR new_addr; CORE_ADDR new_addr;
/* Buffer of instructions to be copied to NEW_ADDR to execute. */ /* Buffer of instructions to be copied to NEW_ADDR to execute. */
uint32_t insn_buf[DISPLACED_MODIFIED_INSNS]; uint32_t insn_buf[AARCH64_DISPLACED_MODIFIED_INSNS];
/* Number of instructions in INSN_BUF. */ /* Number of instructions in INSN_BUF. */
unsigned insn_count; unsigned insn_count;
/* Registers when doing displaced stepping. */ /* Registers when doing displaced stepping. */
@ -3000,7 +3000,7 @@ aarch64_displaced_step_copy_insn (struct gdbarch *gdbarch,
dsd.insn_count = 0; dsd.insn_count = 0;
aarch64_relocate_instruction (insn, &visitor, aarch64_relocate_instruction (insn, &visitor,
(struct aarch64_insn_data *) &dsd); (struct aarch64_insn_data *) &dsd);
gdb_assert (dsd.insn_count <= DISPLACED_MODIFIED_INSNS); gdb_assert (dsd.insn_count <= AARCH64_DISPLACED_MODIFIED_INSNS);
if (dsd.insn_count != 0) if (dsd.insn_count != 0)
{ {

2
gdb/aarch64-tdep.h
View File

@ -56,7 +56,7 @@ struct regset;
/* The maximum number of modified instructions generated for one /* The maximum number of modified instructions generated for one
single-stepped instruction. */ single-stepped instruction. */
#define DISPLACED_MODIFIED_INSNS 1 #define AARCH64_DISPLACED_MODIFIED_INSNS 1
/* Target-dependent structure in gdbarch. */ /* Target-dependent structure in gdbarch. */
struct gdbarch_tdep struct gdbarch_tdep

2
gdb/arm-linux-tdep.c
View File

@ -954,7 +954,7 @@ arm_linux_cleanup_svc (struct gdbarch *gdbarch,
within_scratch = (apparent_pc >= dsc->scratch_base within_scratch = (apparent_pc >= dsc->scratch_base
&& apparent_pc < (dsc->scratch_base && apparent_pc < (dsc->scratch_base
+ DISPLACED_MODIFIED_INSNS * 4 + 4)); + ARM_DISPLACED_MODIFIED_INSNS * 4 + 4));
if (debug_displaced) if (debug_displaced)
{ {

2
gdb/arm-tdep.c
View File

@ -9268,7 +9268,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Note: for displaced stepping, this includes the breakpoint, and one word /* Note: for displaced stepping, this includes the breakpoint, and one word
of additional scratch space. This setting isn't used for anything beside of additional scratch space. This setting isn't used for anything beside
displaced stepping at present. */ displaced stepping at present. */
set_gdbarch_max_insn_length (gdbarch, 4 * DISPLACED_MODIFIED_INSNS); set_gdbarch_max_insn_length (gdbarch, 4 * ARM_DISPLACED_MODIFIED_INSNS);
/* This should be low enough for everything. */ /* This should be low enough for everything. */
tdep->lowest_pc = 0x20; tdep->lowest_pc = 0x20;

4
gdb/arm-tdep.h
View File

@ -152,7 +152,7 @@ struct gdbarch_tdep
/* The maximum number of modified instructions generated for one single-stepped /* The maximum number of modified instructions generated for one single-stepped
instruction, including the breakpoint (usually at the end of the instruction instruction, including the breakpoint (usually at the end of the instruction
sequence) and any scratch words, etc. */ sequence) and any scratch words, etc. */
#define DISPLACED_MODIFIED_INSNS 8 #define ARM_DISPLACED_MODIFIED_INSNS 8
struct arm_displaced_step_closure : public displaced_step_closure struct arm_displaced_step_closure : public displaced_step_closure
{ {
@ -215,7 +215,7 @@ struct arm_displaced_step_closure : public displaced_step_closure
- ARM instruction occupies one slot, - ARM instruction occupies one slot,
- Thumb 16 bit instruction occupies one slot, - Thumb 16 bit instruction occupies one slot,
- Thumb 32-bit instruction occupies *two* slots, one part for each. */ - Thumb 32-bit instruction occupies *two* slots, one part for each. */
unsigned long modinsn[DISPLACED_MODIFIED_INSNS]; unsigned long modinsn[ARM_DISPLACED_MODIFIED_INSNS];
int numinsns; int numinsns;
CORE_ADDR insn_addr; CORE_ADDR insn_addr;
CORE_ADDR scratch_base; CORE_ADDR scratch_base;