From 9a32e6f3a15f4373c9bec8acf5f5436822184247 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 22 Mar 2016 08:31:33 +0100 Subject: disas/microblaze: Add missing 'const' attributes Making the opcode list 'const' saves memory. Some function arguments and local variables needed 'const', too. Add also 'static' to two local functions. Reviewed-by: Edgar E. Iglesias Signed-off-by: Stefan Weil [EI: Removed old prototypes to fix the build] Signed-off-by: Edgar E. Iglesias --- disas/microblaze.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'disas') diff --git a/disas/microblaze.c b/disas/microblaze.c index 7795a0bdb9..598ecbc89d 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -272,7 +272,7 @@ enum microblaze_instr_type { #define MAX_OPCODES 280 -static struct op_code_struct { +static const struct op_code_struct { const char *name; short inst_type; /* registers and immediate values involved */ short inst_offset_type; /* immediate vals offset from PC? (= 1 for branches) */ @@ -596,10 +596,6 @@ static char * get_field_imm15 (long instr); #if 0 static char * get_field_unsigned_imm (long instr); #endif -char * get_field_special (long instr, struct op_code_struct * op); -unsigned long read_insn_microblaze (bfd_vma memaddr, - struct disassemble_info *info, - struct op_code_struct **opr); static char * get_field (long instr, long mask, unsigned short low) @@ -664,8 +660,8 @@ get_field_unsigned_imm (long instr) } */ -char * -get_field_special (long instr, struct op_code_struct * op) +static char * +get_field_special(long instr, const struct op_code_struct *op) { char tmpstr[25]; char spr[6]; @@ -729,14 +725,14 @@ get_field_special (long instr, struct op_code_struct * op) return(strdup(tmpstr)); } -unsigned long +static unsigned long read_insn_microblaze (bfd_vma memaddr, struct disassemble_info *info, - struct op_code_struct **opr) + const struct op_code_struct **opr) { unsigned char ibytes[4]; int status; - struct op_code_struct * op; + const struct op_code_struct *op; unsigned long inst; status = info->read_memory_func (memaddr, ibytes, 4, info); @@ -772,7 +768,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) fprintf_function fprintf_func = info->fprintf_func; void * stream = info->stream; unsigned long inst, prev_inst; - struct op_code_struct * op, *pop; + const struct op_code_struct *op, *pop; int immval = 0; bfd_boolean immfound = FALSE; static bfd_vma prev_insn_addr = -1; /*init the prev insn addr */ -- cgit v1.2.1