From dc1e8a474f904419abaa27da4be5b0f735a87255 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 25 Feb 2020 15:34:46 +1030 Subject: Indent labels Labels don't go in the first column according to standard emacs C indent rules, and I got annoyed enough at seeing diff -p show a label rather than the function name to fix this. bfd/ * aoutx.h: Indent labels correctly. Format error strings. * archive.c: Likewise. * archive64.c: Likewise. * coff-arm.c: Likewise. * coff-rs6000.c: Likewise. * coff-stgo32.c: Likewise. * cpu-arm.c: Likewise. * dwarf2.c: Likewise. * elf-ifunc.c: Likewise. * elf-properties.c: Likewise. * elf-s390-common.c: Likewise. * elf-strtab.c: Likewise. * elf.c: Likewise. * elf32-arm.c: Likewise. * elf32-bfin.c: Likewise. * elf32-cr16.c: Likewise. * elf32-csky.c: Likewise. * elf32-i386.c: Likewise. * elf32-m68k.c: Likewise. * elf32-msp430.c: Likewise. * elf32-nds32.c: Likewise. * elf32-nios2.c: Likewise. * elf32-pru.c: Likewise. * elf32-xtensa.c: Likewise. * elf64-ia64-vms.c: Likewise. * elf64-x86-64.c: Likewise. * elfcode.h: Likewise. * elfcore.h: Likewise. * elflink.c: Likewise. * elfnn-aarch64.c: Likewise. * elfnn-ia64.c: Likewise. * elfnn-riscv.c: Likewise. * elfxx-mips.c: Likewise. * elfxx-sparc.c: Likewise. * elfxx-x86.c: Likewise. * i386lynx.c: Likewise. * merge.c: Likewise. * pdp11.c: Likewise. * plugin.c: Likewise. * reloc.c: Likewise. binutils/ * elfedit.c: Indent labels correctly. * readelf.c: Likewise. * resres.c: Likewise. gas/ * config/obj-elf.c: Indent labels correctly. * config/obj-macho.c: Likewise. * config/tc-aarch64.c: Likewise. * config/tc-alpha.c: Likewise. * config/tc-arm.c: Likewise. * config/tc-cr16.c: Likewise. * config/tc-crx.c: Likewise. * config/tc-frv.c: Likewise. * config/tc-i386-intel.c: Likewise. * config/tc-i386.c: Likewise. * config/tc-ia64.c: Likewise. * config/tc-mn10200.c: Likewise. * config/tc-mn10300.c: Likewise. * config/tc-nds32.c: Likewise. * config/tc-riscv.c: Likewise. * config/tc-s12z.c: Likewise. * config/tc-xtensa.c: Likewise. * config/tc-z80.c: Likewise. * read.c: Likewise. * symbols.c: Likewise. * write.c: Likewise. ld/ * emultempl/cskyelf.em: Indent labels correctly. * ldfile.c: Likewise. * ldlang.c: Likewise. * plugin.c: Likewise. opcodes/ * aarch64-asm.c: Indent labels correctly. * aarch64-dis.c: Likewise. * aarch64-gen.c: Likewise. * aarch64-opc.c: Likewise. * alpha-dis.c: Likewise. * i386-dis.c: Likewise. * nds32-asm.c: Likewise. * nfp-dis.c: Likewise. * visium-dis.c: Likewise. --- opcodes/ChangeLog | 12 ++++++++++++ opcodes/aarch64-asm.c | 4 ++-- opcodes/aarch64-dis.c | 2 +- opcodes/aarch64-gen.c | 4 ++-- opcodes/aarch64-opc.c | 2 +- opcodes/alpha-dis.c | 2 +- opcodes/i386-dis.c | 16 ++++++++-------- opcodes/nds32-asm.c | 8 ++++---- opcodes/nfp-dis.c | 2 +- opcodes/visium-dis.c | 8 ++++---- 10 files changed, 36 insertions(+), 24 deletions(-) (limited to 'opcodes') diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 5d83578..236e2d7 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,15 @@ +2020-02-26 Alan Modra + + * aarch64-asm.c: Indent labels correctly. + * aarch64-dis.c: Likewise. + * aarch64-gen.c: Likewise. + * aarch64-opc.c: Likewise. + * alpha-dis.c: Likewise. + * i386-dis.c: Likewise. + * nds32-asm.c: Likewise. + * nfp-dis.c: Likewise. + * visium-dis.c: Likewise. + 2020-02-25 Claudiu Zissulescu * arc-regs.h (int_vector_base): Make it available for all ARC diff --git a/opcodes/aarch64-asm.c b/opcodes/aarch64-asm.c index 36f84e8..fc70ffc 100644 --- a/opcodes/aarch64-asm.c +++ b/opcodes/aarch64-asm.c @@ -1967,7 +1967,7 @@ convert_to_real (aarch64_inst *inst, const aarch64_opcode *real) break; } -convert_to_real_return: + convert_to_real_return: aarch64_replace_opcode (inst, real); } @@ -2099,7 +2099,7 @@ aarch64_opcode_encode (const aarch64_opcode *opcode, } -encoding_exit: + encoding_exit: DEBUG_TRACE ("exit with %s", opcode->name); *code = inst->value; diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c index 7bd2c49..8b21307 100644 --- a/opcodes/aarch64-dis.c +++ b/opcodes/aarch64-dis.c @@ -2972,7 +2972,7 @@ aarch64_opcode_decode (const aarch64_opcode *opcode, const aarch64_insn code, DEBUG_TRACE ("constraint matching FAIL"); } -decode_fail: + decode_fail: return FALSE; } diff --git a/opcodes/aarch64-gen.c b/opcodes/aarch64-gen.c index f4a0f13..7cfa5d3 100644 --- a/opcodes/aarch64-gen.c +++ b/opcodes/aarch64-gen.c @@ -249,7 +249,7 @@ divide_table_1 (struct bittree *bittree, opcode_node *opcode) goto divide_table_1_finish; } -divide_table_1_try_again: + divide_table_1_try_again: mask_and = -1; ent = opcode; while (ent) @@ -339,7 +339,7 @@ divide_table_1_try_again: divide_table_1 (bittree->bits[0], list0.next); divide_table_1 (bittree->bits[1], list1.next); -divide_table_1_finish: + divide_table_1_finish: if (debug) printf ("Leave from depth %d\n", depth); --depth; diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index 4823de4..9080716 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -5109,7 +5109,7 @@ verify_constraints (const struct aarch64_inst *inst, } } -done: + done: /* Add the new instruction to the sequence. */ memcpy (insn_sequence->current_insns + insn_sequence->next_insn++, inst, sizeof (aarch64_inst)); diff --git a/opcodes/alpha-dis.c b/opcodes/alpha-dis.c index 92e2d8e..c348900 100644 --- a/opcodes/alpha-dis.c +++ b/opcodes/alpha-dis.c @@ -146,7 +146,7 @@ print_insn_alpha (bfd_vma memaddr, struct disassemble_info *info) return 4; -found: + found: (*info->fprintf_func) (info->stream, "%s", opcode->name); if (opcode->operands[0] != 0) (*info->fprintf_func) (info->stream, "\t"); diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 8e0a950..77813e1 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -12791,7 +12791,7 @@ putop (const char *in_template, int sizeflag) case 'B': if (l == 0 && len == 1) { -case_B: + case_B: if (intel_syntax) break; if (sizeflag & SUFFIX_ALWAYS) @@ -12956,7 +12956,7 @@ case_B: SAVE_LAST (*p); break; } -case_L: + case_L: if (intel_syntax) break; if (sizeflag & SUFFIX_ALWAYS) @@ -13005,7 +13005,7 @@ case_L: case 'P': if (l == 0 && len == 1) { -case_P: + case_P: if (intel_syntax) { if ((rex & REX_W) == 0 @@ -13075,7 +13075,7 @@ case_P: case 'Q': if (l == 0 && len == 1) { -case_Q: + case_Q: if (intel_syntax && !alt) break; USED_REX (REX_W); @@ -13166,7 +13166,7 @@ case_Q: case 'S': if (l == 0 && len == 1) { -case_S: + case_S: if (intel_syntax) break; if (sizeflag & SUFFIX_ALWAYS) @@ -15864,7 +15864,7 @@ CRC32_Fixup (int bytemode, int sizeflag) mnemonicendp = p; *p = '\0'; -skip: + skip: if (modrm.mod == 3) { int add; @@ -16587,7 +16587,7 @@ MOVBE_Fixup (int bytemode, int sizeflag) mnemonicendp = p; *p = '\0'; -skip: + skip: OP_M (bytemode, sizeflag); } @@ -16624,7 +16624,7 @@ MOVSXD_Fixup (int bytemode, int sizeflag) break; } -skip: + skip: mnemonicendp = p; *p = '\0'; OP_E (bytemode, sizeflag); diff --git a/opcodes/nds32-asm.c b/opcodes/nds32-asm.c index 2122e1b..1eadefb 100644 --- a/opcodes/nds32-asm.c +++ b/opcodes/nds32-asm.c @@ -2405,7 +2405,7 @@ parse_operand (nds32_asm_desc_t *pdesc, nds32_asm_insn_t *pinsn, abort (); } -done: + done: /* Don't silently discarding bits. */ if (value & __MASK (fld->shift)) { @@ -2533,7 +2533,7 @@ parse_insn (nds32_asm_desc_t *pdesc, nds32_asm_insn_t *pinsn, if (*plex == 0 && (*p == '\0' || *p == '!' || *p == '#')) return 1; -reject: + reject: /* If not accepted, try another combination. */ variant++; } @@ -2564,7 +2564,7 @@ nds32_assemble (nds32_asm_desc_t *pdesc, nds32_asm_insn_t *pinsn, *s++ = '\0'; dot = strchr (mnemoic, '.'); -retry_dot: + retry_dot: /* Lookup the opcode syntax. */ hash = htab_hash_string (mnemoic); opc = (struct nds32_opcode *) @@ -2615,6 +2615,6 @@ retry_dot: /* A matched opcode is found. Write the result to instruction buffer. */ pdesc->result = NASM_OK; -out: + out: free (str); } diff --git a/opcodes/nfp-dis.c b/opcodes/nfp-dis.c index 69bc198..aac3903 100644 --- a/opcodes/nfp-dis.c +++ b/opcodes/nfp-dis.c @@ -2958,7 +2958,7 @@ print_insn_nfp (bfd_vma addr, struct disassemble_info *dinfo) err = _print_instrs (addr, dinfo, &opts); -end: + end: if (err != 8) dinfo->fprintf_func (dinfo->stream, "\t # ERROR"); if (err == _NFP_ERR_CONT) diff --git a/opcodes/visium-dis.c b/opcodes/visium-dis.c index 5f706c8..851c546 100644 --- a/opcodes/visium-dis.c +++ b/opcodes/visium-dis.c @@ -166,7 +166,7 @@ disassem_class0 (disassemble_info *info, unsigned int ins) } return 0; -illegal_opcode: + illegal_opcode: return -1; } @@ -421,7 +421,7 @@ disassem_class1 (disassemble_info *info, unsigned int ins) return 0; -illegal_opcode: + illegal_opcode: return -1; } @@ -518,7 +518,7 @@ disassem_class2 (disassemble_info *info, unsigned int ins) return 0; -illegal_opcode: + illegal_opcode: return -1; } @@ -747,7 +747,7 @@ disassem_class3 (disassemble_info *info, unsigned int ins) return 0; -illegal_opcode: + illegal_opcode: return -1; } -- cgit v1.1