From 07d6d2b8345ef3dc82eab49635acac9ee67dbb18 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 6 Dec 2017 09:26:00 +1030 Subject: 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. --- bfd/peicode.h | 158 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 79 insertions(+), 79 deletions(-) (limited to 'bfd/peicode.h') diff --git a/bfd/peicode.h b/bfd/peicode.h index e5cacbd..9231ec8 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -24,7 +24,7 @@ sac@cygnus.com PE/PEI rearrangement (and code added): Donn Terry - Softway Systems, Inc. */ + Softway Systems, Inc. */ /* Hey look, some documentation [and in a place you expect to find it]! @@ -64,7 +64,7 @@ static bfd_boolean (*pe_saved_coff_bfd_print_private_bfd_data) (bfd *, void *) = #undef coff_bfd_print_private_bfd_data #endif -static bfd_boolean pe_print_private_bfd_data (bfd *, void *); +static bfd_boolean pe_print_private_bfd_data (bfd *, void *); #define coff_bfd_print_private_bfd_data pe_print_private_bfd_data static bfd_boolean (*pe_saved_coff_bfd_copy_private_bfd_data) (bfd *, bfd *) = @@ -75,10 +75,10 @@ static bfd_boolean (*pe_saved_coff_bfd_copy_private_bfd_data) (bfd *, bfd *) = #undef coff_bfd_copy_private_bfd_data #endif -static bfd_boolean pe_bfd_copy_private_bfd_data (bfd *, bfd *); +static bfd_boolean pe_bfd_copy_private_bfd_data (bfd *, bfd *); #define coff_bfd_copy_private_bfd_data pe_bfd_copy_private_bfd_data -#define coff_mkobject pe_mkobject +#define coff_mkobject pe_mkobject #define coff_mkobject_hook pe_mkobject_hook #ifdef COFF_IMAGE_WITH_PE @@ -90,17 +90,17 @@ typedef struct bfd * abfd; bfd_byte * data; struct bfd_in_memory * bim; - unsigned short magic; + unsigned short magic; arelent * reltab; - unsigned int relcount; + unsigned int relcount; - coff_symbol_type * sym_cache; - coff_symbol_type * sym_ptr; - unsigned int sym_index; + coff_symbol_type * sym_cache; + coff_symbol_type * sym_ptr; + unsigned int sym_index; - unsigned int * sym_table; - unsigned int * table_ptr; + unsigned int * sym_table; + unsigned int * table_ptr; combined_entry_type * native_syms; combined_entry_type * native_ptr; @@ -110,12 +110,12 @@ typedef struct unsigned int sec_index; - char * string_table; - char * string_ptr; + char * string_table; + char * string_ptr; char * end_string_ptr; - SYMENT * esym_table; - SYMENT * esym_ptr; + SYMENT * esym_table; + SYMENT * esym_ptr; struct internal_reloc * int_reltab; } @@ -244,7 +244,7 @@ coff_swap_scnhdr_in (bfd * abfd, void * ext, void * in) if (scnhdr_int->s_paddr > 0 && (((scnhdr_int->s_flags & IMAGE_SCN_CNT_UNINITIALIZED_DATA) != 0 && (! bfd_pei_p (abfd) || scnhdr_int->s_size == 0)) - || (bfd_pei_p (abfd) && (scnhdr_int->s_size > scnhdr_int->s_paddr)))) + || (bfd_pei_p (abfd) && (scnhdr_int->s_size > scnhdr_int->s_paddr)))) /* This code used to set scnhdr_int->s_paddr to 0. However, coff_set_alignment_hook stores s_paddr in virt_size, which only works if it correctly holds the virtual size of the @@ -400,8 +400,8 @@ pe_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) the table in order to for the string lookup code in coffgen/coffcode to work. */ #define NUM_ILF_RELOCS 8 -#define NUM_ILF_SECTIONS 6 -#define NUM_ILF_SYMS (2 + NUM_ILF_SECTIONS) +#define NUM_ILF_SECTIONS 6 +#define NUM_ILF_SYMS (2 + NUM_ILF_SECTIONS) #define SIZEOF_ILF_SYMS (NUM_ILF_SYMS * sizeof (* vars.sym_cache)) #define SIZEOF_ILF_SYM_TABLE (NUM_ILF_SYMS * sizeof (* vars.sym_table)) @@ -427,7 +427,7 @@ pe_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) #define SIZEOF_IDATA6 (2 + strlen (symbol_name) + 1 + 1) #define SIZEOF_IDATA7 (strlen (source_dll) + 1 + 1) -#define SIZEOF_ILF_SECTIONS (NUM_ILF_SECTIONS * sizeof (struct coff_section_tdata)) +#define SIZEOF_ILF_SECTIONS (NUM_ILF_SECTIONS * sizeof (struct coff_section_tdata)) #define ILF_DATA_SIZE \ + SIZEOF_ILF_SYMS \ @@ -449,11 +449,11 @@ pe_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) /* Create an empty relocation against the given symbol. */ static void -pe_ILF_make_a_symbol_reloc (pe_ILF_vars * vars, - bfd_vma address, - bfd_reloc_code_real_type reloc, - struct bfd_symbol ** sym, - unsigned int sym_index) +pe_ILF_make_a_symbol_reloc (pe_ILF_vars * vars, + bfd_vma address, + bfd_reloc_code_real_type reloc, + struct bfd_symbol ** sym, + unsigned int sym_index) { arelent * entry; struct internal_reloc * internal; @@ -478,10 +478,10 @@ pe_ILF_make_a_symbol_reloc (pe_ILF_vars * vars, /* Create an empty relocation against the given section. */ static void -pe_ILF_make_a_reloc (pe_ILF_vars * vars, - bfd_vma address, +pe_ILF_make_a_reloc (pe_ILF_vars * vars, + bfd_vma address, bfd_reloc_code_real_type reloc, - asection_ptr sec) + asection_ptr sec) { pe_ILF_make_a_symbol_reloc (vars, address, reloc, sec->symbol_ptr_ptr, coff_section_data (vars->abfd, sec)->i); @@ -565,8 +565,8 @@ pe_ILF_make_a_symbol (pe_ILF_vars * vars, zero initialised. They are just kept here as reminders. */ /* Initialise the internal symbol structure. */ - ent->u.syment.n_sclass = sclass; - ent->u.syment.n_scnum = section->target_index; + ent->u.syment.n_sclass = sclass; + ent->u.syment.n_scnum = section->target_index; ent->u.syment._n._n_n._n_offset = (bfd_hostptr_t) sym; ent->is_sym = TRUE; @@ -574,7 +574,7 @@ pe_ILF_make_a_symbol (pe_ILF_vars * vars, sym->symbol.name = vars->string_ptr; sym->symbol.flags = BSF_EXPORT | BSF_GLOBAL | extra_flags; sym->symbol.section = section; - sym->native = ent; + sym->native = ent; * vars->table_ptr = vars->sym_index; * vars->sym_ptr_ptr = sym; @@ -743,21 +743,21 @@ static jump_table jtab[] = /* Build a full BFD from the information supplied in a ILF object. */ static bfd_boolean -pe_ILF_build_a_bfd (bfd * abfd, +pe_ILF_build_a_bfd (bfd * abfd, unsigned int magic, - char * symbol_name, - char * source_dll, + char * symbol_name, + char * source_dll, unsigned int ordinal, unsigned int types) { - bfd_byte * ptr; - pe_ILF_vars vars; + bfd_byte * ptr; + pe_ILF_vars vars; struct internal_filehdr internal_f; - unsigned int import_type; - unsigned int import_name_type; - asection_ptr id4, id5, id6 = NULL, text = NULL; - coff_symbol_type ** imp_sym; - unsigned int imp_index; + unsigned int import_type; + unsigned int import_name_type; + asection_ptr id4, id5, id6 = NULL, text = NULL; + coff_symbol_type ** imp_sym; + unsigned int imp_index; /* Decode and verify the types field of the ILF structure. */ import_type = types & 0x3; @@ -974,7 +974,7 @@ pe_ILF_build_a_bfd (bfd * abfd, case IMPORT_CODE: /* CODE functions are special, in that they get a trampoline that - jumps to the main import symbol. Create a .text section to hold it. + jumps to the main import symbol. Create a .text section to hold it. First we need to look up its contents in the jump table. */ for (i = NUM_ENTRIES (jtab); i--;) { @@ -1124,15 +1124,15 @@ pe_ILF_build_a_bfd (bfd * abfd, static const bfd_target * pe_ILF_object_p (bfd * abfd) { - bfd_byte buffer[14]; - bfd_byte * ptr; - char * symbol_name; - char * source_dll; - unsigned int machine; - bfd_size_type size; - unsigned int ordinal; - unsigned int types; - unsigned int magic; + bfd_byte buffer[14]; + bfd_byte * ptr; + char * symbol_name; + char * source_dll; + unsigned int machine; + bfd_size_type size; + unsigned int ordinal; + unsigned int types; + unsigned int magic; /* Upon entry the first six bytes of the ILF header have already been read. Now read the rest of the header. */ @@ -1315,7 +1315,7 @@ pe_bfd_read_buildid (bfd *abfd) for (section = abfd->sections; section != NULL; section = section->next) { if ((addr >= section->vma) && (addr < (section->vma + section->size))) - break; + break; } if (section == NULL) @@ -1336,7 +1336,7 @@ pe_bfd_read_buildid (bfd *abfd) abfd); return; } - + /* Read the whole section. */ if (!bfd_malloc_and_get_section (abfd, section, &data)) { @@ -1355,30 +1355,30 @@ pe_bfd_read_buildid (bfd *abfd) _bfd_XXi_swap_debugdir_in (abfd, ext, &idd); if (idd.Type == PE_IMAGE_DEBUG_TYPE_CODEVIEW) - { - char buffer[256 + 1]; - CODEVIEW_INFO *cvinfo = (CODEVIEW_INFO *) buffer; - - /* - The debug entry doesn't have to have to be in a section, in which - case AddressOfRawData is 0, so always use PointerToRawData. - */ - if (_bfd_XXi_slurp_codeview_record (abfd, - (file_ptr) idd.PointerToRawData, - idd.SizeOfData, cvinfo)) - { - struct bfd_build_id* build_id = bfd_alloc (abfd, - sizeof (struct bfd_build_id) + cvinfo->SignatureLength); - if (build_id) - { - build_id->size = cvinfo->SignatureLength; - memcpy(build_id->data, cvinfo->Signature, - cvinfo->SignatureLength); - abfd->build_id = build_id; - } - } - break; - } + { + char buffer[256 + 1]; + CODEVIEW_INFO *cvinfo = (CODEVIEW_INFO *) buffer; + + /* + The debug entry doesn't have to have to be in a section, in which + case AddressOfRawData is 0, so always use PointerToRawData. + */ + if (_bfd_XXi_slurp_codeview_record (abfd, + (file_ptr) idd.PointerToRawData, + idd.SizeOfData, cvinfo)) + { + struct bfd_build_id* build_id = bfd_alloc (abfd, + sizeof (struct bfd_build_id) + cvinfo->SignatureLength); + if (build_id) + { + build_id->size = cvinfo->SignatureLength; + memcpy(build_id->data, cvinfo->Signature, + cvinfo->SignatureLength); + abfd->build_id = build_id; + } + } + break; + } } } @@ -1488,9 +1488,9 @@ pe_bfd_object_p (bfd * abfd) result = coff_real_object_p (abfd, internal_f.f_nscns, &internal_f, - (opt_hdr_size != 0 - ? &internal_a - : (struct internal_aouthdr *) NULL)); + (opt_hdr_size != 0 + ? &internal_a + : (struct internal_aouthdr *) NULL)); if (result) -- cgit v1.1