This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH 1/3] Arm/AArch64: Split DISPLACED_MODIFIED_INSNS name clash


I pushed this set.

> On 26 Jun 2019, at 14:19, Alan Hayward <Alan.Hayward@arm.com> wrote:
> 
> 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:
> 
> 2019-06-26  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.
> ---
> gdb/aarch64-linux-tdep.c | 2 +-
> gdb/aarch64-tdep.c       | 4 ++--
> gdb/aarch64-tdep.h       | 2 +-
> gdb/arm-linux-tdep.c     | 2 +-
> gdb/arm-tdep.c           | 2 +-
> gdb/arm-tdep.h           | 4 ++--
> 6 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
> index 7f2193f2fa..831e62fb86 100644
> --- a/gdb/aarch64-linux-tdep.c
> +++ b/gdb/aarch64-linux-tdep.c
> @@ -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);
> 
>   /* 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,
> 					aarch64_displaced_step_copy_insn);
>   set_gdbarch_displaced_step_fixup (gdbarch, aarch64_displaced_step_fixup);
> diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
> index 96ebce4c35..f33cee6622 100644
> --- a/gdb/aarch64-tdep.c
> +++ b/gdb/aarch64-tdep.c
> @@ -2756,7 +2756,7 @@ struct aarch64_displaced_step_data
>   /* The address where the instruction will be executed at.  */
>   CORE_ADDR new_addr;
>   /* 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.  */
>   unsigned insn_count;
>   /* Registers when doing displaced stepping.  */
> @@ -3000,7 +3000,7 @@ aarch64_displaced_step_copy_insn (struct gdbarch *gdbarch,
>   dsd.insn_count = 0;
>   aarch64_relocate_instruction (insn, &visitor,
> 				(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)
>     {
> diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h
> index f73392d59b..e4b045b599 100644
> --- a/gdb/aarch64-tdep.h
> +++ b/gdb/aarch64-tdep.h
> @@ -56,7 +56,7 @@ struct regset;
> 
> /* The maximum number of modified instructions generated for one
>    single-stepped instruction.  */
> -#define DISPLACED_MODIFIED_INSNS 1
> +#define AARCH64_DISPLACED_MODIFIED_INSNS 1
> 
> /* Target-dependent structure in gdbarch.  */
> struct gdbarch_tdep
> diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
> index a5ad06434c..8c0c0585d7 100644
> --- a/gdb/arm-linux-tdep.c
> +++ b/gdb/arm-linux-tdep.c
> @@ -954,7 +954,7 @@ arm_linux_cleanup_svc (struct gdbarch *gdbarch,
> 
>   within_scratch = (apparent_pc >= dsc->scratch_base
> 		    && apparent_pc < (dsc->scratch_base
> -				      + DISPLACED_MODIFIED_INSNS * 4 + 4));
> +				      + ARM_DISPLACED_MODIFIED_INSNS * 4 + 4));
> 
>   if (debug_displaced)
>     {
> diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
> index 2ba77e207d..5b1f360f9f 100644
> --- a/gdb/arm-tdep.c
> +++ b/gdb/arm-tdep.c
> @@ -9271,7 +9271,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
>   /* Note: for displaced stepping, this includes the breakpoint, and one word
>      of additional scratch space.  This setting isn't used for anything beside
>      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.  */
>   tdep->lowest_pc = 0x20;
> diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h
> index 23dd40ea8b..7da11656c2 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;
> -- 
> 2.20.1 (Apple Git-117)
> 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]