diff options
| author | Alan Hayward <alan.hayward@arm.com> | 2019-07-04 12:41:20 +0100 |
|---|---|---|
| committer | Alan Hayward <alan.hayward@arm.com> | 2019-07-04 12:47:26 +0100 |
| commit | e935475cb6bcd8146717896e88824ae93a0897c7 (patch) | |
| tree | eb5596ff723475a39bb57d980124b635063720ef /gdb/arm-tdep.h | |
| parent | df0bb381e27a8b1594c492a34c48ff6e6bbd29d1 (diff) | |
| download | gdb-e935475cb6bcd8146717896e88824ae93a0897c7.zip gdb-e935475cb6bcd8146717896e88824ae93a0897c7.tar.gz gdb-e935475cb6bcd8146717896e88824ae93a0897c7.tar.bz2 | |
Arm/AArch64: Split DISPLACED_MODIFIED_INSNS name clash
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.
Diffstat (limited to 'gdb/arm-tdep.h')
| -rw-r--r-- | gdb/arm-tdep.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h index 23dd40e..7da1165 100644 --- a/gdb/arm-tdep.h +++ b/gdb/arm-tdep.h @@ -152,7 +152,7 @@ struct gdbarch_tdep /* The maximum number of modified instructions generated for one single-stepped instruction, including the breakpoint (usually at the end of the instruction 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 { @@ -215,7 +215,7 @@ struct arm_displaced_step_closure : public displaced_step_closure - ARM instruction occupies one slot, - Thumb 16 bit instruction occupies one slot, - 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; CORE_ADDR insn_addr; CORE_ADDR scratch_base; |