arm-tdep.c: Change type of insn parameters
Commit Message
Almost obvious... change the type of some insn parameters, so that it
matches the rest of the code.
gdb/ChangeLog:
* arm-tdep.c (thumb_copy_unmodified_16bit): Change type of insn.
(thumb_copy_b): Likewise.
(arm_decode_b_bl_ldmstm): Likewise.
(thumb_copy_16bit_ldr_literal): Likewise.
(thumb_copy_pop_pc_16bit): Likewise.
---
gdb/arm-tdep.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Comments
Simon Marchi <simon.marchi@ericsson.com> writes:
> /* Copy 16-bit Thumb(Thumb and 16-bit Thumb-2) instruction without any
> modification. */
> static int
> -thumb_copy_unmodified_16bit (struct gdbarch *gdbarch, unsigned int insn,
> +thumb_copy_unmodified_16bit (struct gdbarch *gdbarch, uint32_t insn,
> const char *iname,
> struct displaced_step_closure *dsc)
The instruction here is 16-bit, so we should use "uint16_t".
OK with the change.
On 16-02-11 05:58 AM, Yao Qi wrote:
> Simon Marchi <simon.marchi@ericsson.com> writes:
>
>> /* Copy 16-bit Thumb(Thumb and 16-bit Thumb-2) instruction without any
>> modification. */
>> static int
>> -thumb_copy_unmodified_16bit (struct gdbarch *gdbarch, unsigned int insn,
>> +thumb_copy_unmodified_16bit (struct gdbarch *gdbarch, uint32_t insn,
>> const char *iname,
>> struct displaced_step_closure *dsc)
>
> The instruction here is 16-bit, so we should use "uint16_t".
>
> OK with the change.
>
Thanks, pushed with that changed.
@@ -4569,7 +4569,7 @@ thumb_copy_unmodified_32bit (struct gdbarch *gdbarch, uint16_t insn1,
/* Copy 16-bit Thumb(Thumb and 16-bit Thumb-2) instruction without any
modification. */
static int
-thumb_copy_unmodified_16bit (struct gdbarch *gdbarch, unsigned int insn,
+thumb_copy_unmodified_16bit (struct gdbarch *gdbarch, uint32_t insn,
const char *iname,
struct displaced_step_closure *dsc)
{
@@ -4967,7 +4967,7 @@ thumb2_copy_b_bl_blx (struct gdbarch *gdbarch, uint16_t insn1,
/* Copy B Thumb instructions. */
static int
-thumb_copy_b (struct gdbarch *gdbarch, unsigned short insn,
+thumb_copy_b (struct gdbarch *gdbarch, uint16_t insn,
struct displaced_step_closure *dsc)
{
unsigned int cond = 0;
@@ -6653,7 +6653,7 @@ arm_decode_media (struct gdbarch *gdbarch, uint32_t insn,
}
static int
-arm_decode_b_bl_ldmstm (struct gdbarch *gdbarch, int32_t insn,
+arm_decode_b_bl_ldmstm (struct gdbarch *gdbarch, uint32_t insn,
struct regcache *regs,
struct displaced_step_closure *dsc)
{
@@ -6928,7 +6928,7 @@ thumb_copy_pc_relative_32bit (struct gdbarch *gdbarch, uint16_t insn1,
}
static int
-thumb_copy_16bit_ldr_literal (struct gdbarch *gdbarch, unsigned short insn1,
+thumb_copy_16bit_ldr_literal (struct gdbarch *gdbarch, uint16_t insn1,
struct regcache *regs,
struct displaced_step_closure *dsc)
{
@@ -7078,7 +7078,7 @@ cleanup_pop_pc_16bit_all (struct gdbarch *gdbarch, struct regcache *regs,
}
static int
-thumb_copy_pop_pc_16bit (struct gdbarch *gdbarch, unsigned short insn1,
+thumb_copy_pop_pc_16bit (struct gdbarch *gdbarch, uint16_t insn1,
struct regcache *regs,
struct displaced_step_closure *dsc)
{