From 615234c107e5dcdefff78596971266e9346b3f76 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 11 Feb 2016 13:21:32 -0500 Subject: [PATCH] arm-tdep.c: Change type of insn parameters 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/ChangeLog | 8 ++++++++ gdb/arm-tdep.c | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 31d01cb780e..9a7399254ed 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2016-02-11 Simon Marchi + + * 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. + 2016-02-11 Antoine Tremblay * tracepoint.c (encode_actions_1): Use target_gdbarch () rather diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 6ac05f076b8..6ddc4bd9941 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -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, uint16_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) { -- 2.30.2