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/wasm-module.c | |
parent | 65281396861dfcfa993eb5af4769d6837104890d (diff) | |
download | gdb-07d6d2b8345ef3dc82eab49635acac9ee67dbb18.zip gdb-07d6d2b8345ef3dc82eab49635acac9ee67dbb18.tar.gz 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/wasm-module.c')
-rw-r--r-- | bfd/wasm-module.c | 250 |
1 files changed, 125 insertions, 125 deletions
diff --git a/bfd/wasm-module.c b/bfd/wasm-module.c index e2af184..18e72d9 100644 --- a/bfd/wasm-module.c +++ b/bfd/wasm-module.c @@ -104,10 +104,10 @@ wasm_section_name_to_code (const char *name) incomplete numbers). SIGN means interpret the number as SLEB128. */ static bfd_vma -wasm_read_leb128 (bfd * abfd, - bfd_boolean * error_return, - unsigned int * length_return, - bfd_boolean sign) +wasm_read_leb128 (bfd * abfd, + bfd_boolean * error_return, + unsigned int * length_return, + bfd_boolean sign) { bfd_vma result = 0; unsigned int num_read = 0; @@ -123,10 +123,10 @@ wasm_read_leb128 (bfd * abfd, shift += 7; if ((byte & 0x80) == 0) - { - success = TRUE; - break; - } + { + success = TRUE; + break; + } } if (length_return != NULL) @@ -152,10 +152,10 @@ wasm_write_uleb128 (bfd *abfd, bfd_vma v) v >>= 7; if (v) - c |= 0x80; + c |= 0x80; if (bfd_bwrite (&c, 1, abfd) != 1) - return FALSE; + return FALSE; } while (v); @@ -164,16 +164,16 @@ wasm_write_uleb128 (bfd *abfd, bfd_vma v) /* Read the LEB128 integer at P, saving it to X; at end of buffer, jump to error_return. */ -#define READ_LEB128(x, p, end) \ - do \ - { \ - unsigned int length_read; \ - (x) = _bfd_safe_read_leb128 (abfd, (p), &length_read, \ - FALSE, (end)); \ - (p) += length_read; \ - if (length_read == 0) \ - goto error_return; \ - } \ +#define READ_LEB128(x, p, end) \ + do \ + { \ + unsigned int length_read; \ + (x) = _bfd_safe_read_leb128 (abfd, (p), &length_read, \ + FALSE, (end)); \ + (p) += length_read; \ + if (length_read == 0) \ + goto error_return; \ + } \ while (0) /* Verify the magic number at the beginning of a WebAssembly module @@ -257,18 +257,18 @@ wasm_scan_name_function_section (bfd *abfd, sec_ptr asect) { bfd_byte subsection_code = *p++; if (subsection_code == WASM_FUNCTION_SUBSECTION) - break; + break; /* subsection_code is documented to be a varuint7, meaning that - it has to be a single byte in the 0 - 127 range. If it isn't, - the spec must have changed underneath us, so give up. */ + it has to be a single byte in the 0 - 127 range. If it isn't, + the spec must have changed underneath us, so give up. */ if (subsection_code & 0x80) - return FALSE; + return FALSE; READ_LEB128 (payload_size, p, end); if (p > p + payload_size) - return FALSE; + return FALSE; p += payload_size; } @@ -318,11 +318,11 @@ wasm_scan_name_function_section (bfd *abfd, sec_ptr asect) READ_LEB128 (len, p, end); if (p + len < p || p + len > end) - goto error_return; + goto error_return; name = bfd_zalloc (abfd, len + 1); if (! name) - goto error_return; + goto error_return; memcpy (name, p, len); p += len; @@ -362,7 +362,7 @@ wasm_read_byte (bfd *abfd, bfd_boolean *errorptr) if (bfd_bread (&byte, (bfd_size_type) 1, abfd) != 1) { if (bfd_get_error () != bfd_error_file_truncated) - *errorptr = TRUE; + *errorptr = TRUE; return EOF; } @@ -393,74 +393,74 @@ wasm_scan (bfd *abfd) while ((section_code = wasm_read_byte (abfd, &error)) != EOF) { if (section_code != 0) - { - const char *sname = wasm_section_code_to_name (section_code); - - if (! sname) - goto error_return; - - name = strdup (sname); - bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS); - if (bfdsec == NULL) - goto error_return; - name = NULL; - - bfdsec->vma = vma; - bfdsec->lma = vma; - bfdsec->size = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE); - if (error) - goto error_return; - bfdsec->filepos = bfd_tell (abfd); - bfdsec->alignment_power = 0; - } + { + const char *sname = wasm_section_code_to_name (section_code); + + if (! sname) + goto error_return; + + name = strdup (sname); + bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS); + if (bfdsec == NULL) + goto error_return; + name = NULL; + + bfdsec->vma = vma; + bfdsec->lma = vma; + bfdsec->size = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE); + if (error) + goto error_return; + bfdsec->filepos = bfd_tell (abfd); + bfdsec->alignment_power = 0; + } else - { - bfd_vma payload_len; - file_ptr section_start; - bfd_vma namelen; - char *prefix = WASM_SECTION_PREFIX; - char *p; - int ret; - - payload_len = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE); - if (error) - goto error_return; - section_start = bfd_tell (abfd); - namelen = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE); - if (error || namelen > payload_len) - goto error_return; - name = bfd_zmalloc (namelen + strlen (prefix) + 1); - if (! name) - goto error_return; - p = name; - ret = sprintf (p, "%s", prefix); - if (ret < 0 || (bfd_vma) ret != strlen (prefix)) - goto error_return; - p += ret; - if (bfd_bread (p, namelen, abfd) != namelen) + { + bfd_vma payload_len; + file_ptr section_start; + bfd_vma namelen; + char *prefix = WASM_SECTION_PREFIX; + char *p; + int ret; + + payload_len = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE); + if (error) + goto error_return; + section_start = bfd_tell (abfd); + namelen = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE); + if (error || namelen > payload_len) + goto error_return; + name = bfd_zmalloc (namelen + strlen (prefix) + 1); + if (! name) + goto error_return; + p = name; + ret = sprintf (p, "%s", prefix); + if (ret < 0 || (bfd_vma) ret != strlen (prefix)) + goto error_return; + p += ret; + if (bfd_bread (p, namelen, abfd) != namelen) goto error_return; - bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS); - if (bfdsec == NULL) - goto error_return; - name = NULL; + bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS); + if (bfdsec == NULL) + goto error_return; + name = NULL; - bfdsec->vma = vma; - bfdsec->lma = vma; - bfdsec->filepos = bfd_tell (abfd); - bfdsec->size = section_start + payload_len - bfdsec->filepos; - bfdsec->alignment_power = 0; - } + bfdsec->vma = vma; + bfdsec->lma = vma; + bfdsec->filepos = bfd_tell (abfd); + bfdsec->size = section_start + payload_len - bfdsec->filepos; + bfdsec->alignment_power = 0; + } if (bfdsec->size != 0) - { - bfdsec->contents = bfd_zalloc (abfd, bfdsec->size); - if (! bfdsec->contents) - goto error_return; + { + bfdsec->contents = bfd_zalloc (abfd, bfdsec->size); + if (! bfdsec->contents) + goto error_return; - if (bfd_bread (bfdsec->contents, bfdsec->size, abfd) != bfdsec->size) + if (bfd_bread (bfdsec->contents, bfdsec->size, abfd) != bfdsec->size) goto error_return; - } + } vma += bfdsec->size; } @@ -487,7 +487,7 @@ wasm_scan (bfd *abfd) static void wasm_register_section (bfd *abfd ATTRIBUTE_UNUSED, - asection *asect, + asection *asect, void *fsarg) { sec_ptr *numbered_sections = fsarg; @@ -517,7 +517,7 @@ struct compute_section_arg static void wasm_compute_custom_section_file_position (bfd *abfd, sec_ptr asect, - void *fsarg) + void *fsarg) { struct compute_section_arg *fs = fsarg; int index; @@ -540,18 +540,18 @@ wasm_compute_custom_section_file_position (bfd *abfd, payload_len += name_len; do - { - payload_len++; - nl >>= 7; - } + { + payload_len++; + nl >>= 7; + } while (nl); bfd_seek (abfd, fs->pos, SEEK_SET); if (! wasm_write_uleb128 (abfd, 0) - || ! wasm_write_uleb128 (abfd, payload_len) - || ! wasm_write_uleb128 (abfd, name_len) - || bfd_bwrite (name, name_len, abfd) != name_len) - goto error_return; + || ! wasm_write_uleb128 (abfd, payload_len) + || ! wasm_write_uleb128 (abfd, name_len) + || bfd_bwrite (name, name_len, abfd) != name_len) + goto error_return; fs->pos = asect->filepos = bfd_tell (abfd); } else @@ -602,13 +602,13 @@ wasm_compute_section_file_positions (bfd *abfd) bfd_size_type size; if (! sec) - continue; + continue; size = sec->size; if (bfd_seek (abfd, fs.pos, SEEK_SET) != 0) - return FALSE; + return FALSE; if (! wasm_write_uleb128 (abfd, i) - || ! wasm_write_uleb128 (abfd, size)) - return FALSE; + || ! wasm_write_uleb128 (abfd, size)) + return FALSE; fs.pos = sec->filepos = bfd_tell (abfd); fs.pos += size; } @@ -627,10 +627,10 @@ wasm_compute_section_file_positions (bfd *abfd) static bfd_boolean wasm_set_section_contents (bfd *abfd, - sec_ptr section, - const void *location, - file_ptr offset, - bfd_size_type count) + sec_ptr section, + const void *location, + file_ptr offset, + bfd_size_type count) { if (count == 0) return TRUE; @@ -713,9 +713,9 @@ wasm_make_empty_symbol (bfd *abfd) static void wasm_print_symbol (bfd *abfd, - void * filep, - asymbol *symbol, - bfd_print_symbol_type how) + void * filep, + asymbol *symbol, + bfd_print_symbol_type how) { FILE *file = (FILE *) filep; @@ -733,8 +733,8 @@ wasm_print_symbol (bfd *abfd, static void wasm_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, - asymbol *symbol, - symbol_info *ret) + asymbol *symbol, + symbol_info *ret) { bfd_symbol_info (symbol, ret); } @@ -768,31 +768,31 @@ wasm_object_p (bfd *abfd) } /* BFD_JUMP_TABLE_WRITE */ -#define wasm_set_arch_mach _bfd_generic_set_arch_mach +#define wasm_set_arch_mach _bfd_generic_set_arch_mach /* BFD_JUMP_TABLE_SYMBOLS */ -#define wasm_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string -#define wasm_bfd_is_local_label_name bfd_generic_is_local_label_name +#define wasm_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string +#define wasm_bfd_is_local_label_name bfd_generic_is_local_label_name #define wasm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) -#define wasm_get_lineno _bfd_nosymbols_get_lineno -#define wasm_find_nearest_line _bfd_nosymbols_find_nearest_line -#define wasm_find_line _bfd_nosymbols_find_line -#define wasm_find_inliner_info _bfd_nosymbols_find_inliner_info -#define wasm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol -#define wasm_read_minisymbols _bfd_generic_read_minisymbols -#define wasm_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol +#define wasm_get_lineno _bfd_nosymbols_get_lineno +#define wasm_find_nearest_line _bfd_nosymbols_find_nearest_line +#define wasm_find_line _bfd_nosymbols_find_line +#define wasm_find_inliner_info _bfd_nosymbols_find_inliner_info +#define wasm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define wasm_read_minisymbols _bfd_generic_read_minisymbols +#define wasm_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol const bfd_target wasm_vec = { - "wasm", /* Name. */ + "wasm", /* Name. */ bfd_target_unknown_flavour, BFD_ENDIAN_LITTLE, BFD_ENDIAN_LITTLE, (HAS_SYMS | WP_TEXT), /* Object flags. */ (SEC_CODE | SEC_DATA | SEC_HAS_CONTENTS), /* Section flags. */ - 0, /* Leading underscore. */ - ' ', /* AR_pad_char. */ - 255, /* AR_max_namelen. */ + 0, /* Leading underscore. */ + ' ', /* AR_pad_char. */ + 255, /* AR_max_namelen. */ 0, /* Match priority. */ /* Routines to byte-swap various sized integers from the data sections. */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, |