diff options
author | Alan Modra <amodra@gmail.com> | 2017-12-06 09:26:00 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2017-12-06 17:51:43 +1030 |
commit | 07d6d2b8345ef3dc82eab49635acac9ee67dbb18 (patch) | |
tree | 380d1e08ae32b2a37d5f9610f1811bb98299ac09 /bfd/mach-o-i386.c | |
parent | 65281396861dfcfa993eb5af4769d6837104890d (diff) | |
download | fsf-binutils-gdb-07d6d2b8345ef3dc82eab49635acac9ee67dbb18.zip fsf-binutils-gdb-07d6d2b8345ef3dc82eab49635acac9ee67dbb18.tar.gz fsf-binutils-gdb-07d6d2b8345ef3dc82eab49635acac9ee67dbb18.tar.bz2 |
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
Diffstat (limited to 'bfd/mach-o-i386.c')
-rw-r--r-- | bfd/mach-o-i386.c | 194 |
1 files changed, 97 insertions, 97 deletions
diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c index 803af98..370afe6 100644 --- a/bfd/mach-o-i386.c +++ b/bfd/mach-o-i386.c @@ -39,7 +39,7 @@ static const bfd_target * bfd_mach_o_i386_core_p (bfd *abfd) { return bfd_mach_o_header_p (abfd, 0, - BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_I386); + BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_I386); } static bfd_boolean @@ -113,7 +113,7 @@ static reloc_howto_type i386_howto_table[]= static bfd_boolean bfd_mach_o_i386_canonicalize_one_reloc (bfd * abfd, - struct mach_o_reloc_info_external * raw, + struct mach_o_reloc_info_external * raw, arelent * res, asymbol ** syms, arelent * res_base) @@ -126,80 +126,80 @@ bfd_mach_o_i386_canonicalize_one_reloc (bfd * abfd, if (reloc.r_scattered) { switch (reloc.r_type) - { - case BFD_MACH_O_GENERIC_RELOC_PAIR: + { + case BFD_MACH_O_GENERIC_RELOC_PAIR: /* PR 21813: Check for a corrupt PAIR reloc at the start. */ if (res == res_base) return FALSE; - if (reloc.r_length == 2) - { + if (reloc.r_length == 2) + { res->howto = &i386_howto_table[7]; res->address = res[-1].address; return TRUE; - } - else if (reloc.r_length == 1) + } + else if (reloc.r_length == 1) { res->howto = &i386_howto_table[10]; res->address = res[-1].address; return TRUE; } - return FALSE; - case BFD_MACH_O_GENERIC_RELOC_SECTDIFF: - if (reloc.r_length == 2) - { + return FALSE; + case BFD_MACH_O_GENERIC_RELOC_SECTDIFF: + if (reloc.r_length == 2) + { res->howto = &i386_howto_table[5]; return TRUE; - } - else if (reloc.r_length == 1) - { + } + else if (reloc.r_length == 1) + { res->howto = &i386_howto_table[8]; return TRUE; - } - return FALSE; - case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF: - if (reloc.r_length == 2) - { + } + return FALSE; + case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF: + if (reloc.r_length == 2) + { res->howto = &i386_howto_table[6]; return TRUE; - } - else if (reloc.r_length == 1) - { + } + else if (reloc.r_length == 1) + { res->howto = &i386_howto_table[9]; return TRUE; - } - return FALSE; - default: + } + return FALSE; + default: break; - } + } } else { switch (reloc.r_type) - { - case BFD_MACH_O_GENERIC_RELOC_VANILLA: - switch ((reloc.r_length << 1) | reloc.r_pcrel) - { - case 0: /* len = 0, pcrel = 0 */ - res->howto = &i386_howto_table[2]; - return TRUE; - case 2: /* len = 1, pcrel = 0 */ - res->howto = &i386_howto_table[1]; - return TRUE; - case 3: /* len = 1, pcrel = 1 */ - res->howto = &i386_howto_table[4]; - return TRUE; - case 4: /* len = 2, pcrel = 0 */ - res->howto = &i386_howto_table[0]; - return TRUE; - case 5: /* len = 2, pcrel = 1 */ - res->howto = &i386_howto_table[3]; - return TRUE; - default: - return FALSE; - } - default: - break; - } + { + case BFD_MACH_O_GENERIC_RELOC_VANILLA: + switch ((reloc.r_length << 1) | reloc.r_pcrel) + { + case 0: /* len = 0, pcrel = 0 */ + res->howto = &i386_howto_table[2]; + return TRUE; + case 2: /* len = 1, pcrel = 0 */ + res->howto = &i386_howto_table[1]; + return TRUE; + case 3: /* len = 1, pcrel = 1 */ + res->howto = &i386_howto_table[4]; + return TRUE; + case 4: /* len = 2, pcrel = 0 */ + res->howto = &i386_howto_table[0]; + return TRUE; + case 5: /* len = 2, pcrel = 1 */ + res->howto = &i386_howto_table[3]; + return TRUE; + default: + return FALSE; + } + default: + break; + } } return FALSE; } @@ -220,16 +220,16 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) rinfo->r_pcrel = rel->howto->pc_relative; rinfo->r_length = rel->howto->size; /* Correct in practice. */ if ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM) - { - rinfo->r_extern = 0; - rinfo->r_value = + { + rinfo->r_extern = 0; + rinfo->r_value = (*rel->sym_ptr_ptr)->section->output_section->target_index; - } + } else - { - rinfo->r_extern = 1; - rinfo->r_value = (*rel->sym_ptr_ptr)->udata.i; - } + { + rinfo->r_extern = 1; + rinfo->r_value = (*rel->sym_ptr_ptr)->udata.i; + } break; case BFD_RELOC_MACH_O_SECTDIFF: rinfo->r_scattered = 1; @@ -264,7 +264,7 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) static reloc_howto_type * bfd_mach_o_i386_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - bfd_reloc_code_real_type code) + bfd_reloc_code_real_type code) { unsigned int i; @@ -276,14 +276,14 @@ bfd_mach_o_i386_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, static reloc_howto_type * bfd_mach_o_i386_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED) + const char *name ATTRIBUTE_UNUSED) { return NULL; } static bfd_boolean bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread, - void *vfile, char *buf) + void *vfile, char *buf) { FILE *file = (FILE *)vfile; @@ -291,51 +291,51 @@ bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread, { case BFD_MACH_O_x86_THREAD_STATE: if (thread->size < (8 + 16 * 4)) - return FALSE; + return FALSE; fprintf (file, " x86_THREAD_STATE:\n"); fprintf (file, " flavor: 0x%08lx count: 0x%08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 0), - (unsigned long)bfd_get_32 (abfd, buf + 4)); + (unsigned long)bfd_get_32 (abfd, buf + 0), + (unsigned long)bfd_get_32 (abfd, buf + 4)); fprintf (file, " eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 8), - (unsigned long)bfd_get_32 (abfd, buf + 12), - (unsigned long)bfd_get_32 (abfd, buf + 16), - (unsigned long)bfd_get_32 (abfd, buf + 20)); + (unsigned long)bfd_get_32 (abfd, buf + 8), + (unsigned long)bfd_get_32 (abfd, buf + 12), + (unsigned long)bfd_get_32 (abfd, buf + 16), + (unsigned long)bfd_get_32 (abfd, buf + 20)); fprintf (file, " edi: %08lx esi: %08lx ebp: %08lx esp: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 24), - (unsigned long)bfd_get_32 (abfd, buf + 28), - (unsigned long)bfd_get_32 (abfd, buf + 32), - (unsigned long)bfd_get_32 (abfd, buf + 36)); + (unsigned long)bfd_get_32 (abfd, buf + 24), + (unsigned long)bfd_get_32 (abfd, buf + 28), + (unsigned long)bfd_get_32 (abfd, buf + 32), + (unsigned long)bfd_get_32 (abfd, buf + 36)); fprintf (file, " ss: %08lx flg: %08lx eip: %08lx cs: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 40), - (unsigned long)bfd_get_32 (abfd, buf + 44), - (unsigned long)bfd_get_32 (abfd, buf + 48), - (unsigned long)bfd_get_32 (abfd, buf + 52)); + (unsigned long)bfd_get_32 (abfd, buf + 40), + (unsigned long)bfd_get_32 (abfd, buf + 44), + (unsigned long)bfd_get_32 (abfd, buf + 48), + (unsigned long)bfd_get_32 (abfd, buf + 52)); fprintf (file, " ds: %08lx es: %08lx fs: %08lx gs: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 56), - (unsigned long)bfd_get_32 (abfd, buf + 60), - (unsigned long)bfd_get_32 (abfd, buf + 64), - (unsigned long)bfd_get_32 (abfd, buf + 68)); + (unsigned long)bfd_get_32 (abfd, buf + 56), + (unsigned long)bfd_get_32 (abfd, buf + 60), + (unsigned long)bfd_get_32 (abfd, buf + 64), + (unsigned long)bfd_get_32 (abfd, buf + 68)); return TRUE; case BFD_MACH_O_x86_FLOAT_STATE: if (thread->size < 8) - return FALSE; + return FALSE; fprintf (file, " x86_FLOAT_STATE:\n"); fprintf (file, " flavor: 0x%08lx count: 0x%08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 0), - (unsigned long)bfd_get_32 (abfd, buf + 4)); + (unsigned long)bfd_get_32 (abfd, buf + 0), + (unsigned long)bfd_get_32 (abfd, buf + 4)); return TRUE; case BFD_MACH_O_x86_EXCEPTION_STATE: if (thread->size < 8 + 3 * 4) - return FALSE; + return FALSE; fprintf (file, " x86_EXCEPTION_STATE:\n"); fprintf (file, " flavor: 0x%08lx count: 0x%08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 0), - (unsigned long)bfd_get_32 (abfd, buf + 4)); + (unsigned long)bfd_get_32 (abfd, buf + 0), + (unsigned long)bfd_get_32 (abfd, buf + 4)); fprintf (file, " trapno: %08lx err: %08lx faultaddr: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 8), - (unsigned long)bfd_get_32 (abfd, buf + 12), - (unsigned long)bfd_get_32 (abfd, buf + 16)); + (unsigned long)bfd_get_32 (abfd, buf + 8), + (unsigned long)bfd_get_32 (abfd, buf + 12), + (unsigned long)bfd_get_32 (abfd, buf + 16)); return TRUE; default: break; @@ -397,8 +397,8 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] = }; #define bfd_mach_o_canonicalize_one_reloc bfd_mach_o_i386_canonicalize_one_reloc -#define bfd_mach_o_swap_reloc_out bfd_mach_o_i386_swap_reloc_out -#define bfd_mach_o_print_thread bfd_mach_o_i386_print_thread +#define bfd_mach_o_swap_reloc_out bfd_mach_o_i386_swap_reloc_out +#define bfd_mach_o_print_thread bfd_mach_o_i386_print_thread #define bfd_mach_o_tgt_seg_table mach_o_i386_segsec_names_xlat #define bfd_mach_o_section_type_valid_for_tgt NULL @@ -406,11 +406,11 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] = #define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_i386_bfd_reloc_type_lookup #define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_i386_bfd_reloc_name_lookup -#define TARGET_NAME i386_mach_o_vec -#define TARGET_STRING "mach-o-i386" +#define TARGET_NAME i386_mach_o_vec +#define TARGET_STRING "mach-o-i386" #define TARGET_ARCHITECTURE bfd_arch_i386 #define TARGET_PAGESIZE 4096 -#define TARGET_BIG_ENDIAN 0 -#define TARGET_ARCHIVE 0 +#define TARGET_BIG_ENDIAN 0 +#define TARGET_ARCHIVE 0 #define TARGET_PRIORITY 0 #include "mach-o-target.c" |