/* BFD back-end for WebAssembly modules.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2020 Free Software Foundation, Inc.
Based on srec.c, mmo.c, and binary.c
#include "sysdep.h"
#include "alloca-conf.h"
#include "bfd.h"
-#include "sysdep.h"
#include <limits.h>
-#include "bfd_stdint.h"
#include "libiberty.h"
#include "libbfd.h"
#include "wasm-module.h"
unsigned int num_read = 0;
unsigned int shift = 0;
unsigned char byte = 0;
- bfd_boolean success = FALSE;
+ int status = 1;
while (bfd_bread (&byte, 1, abfd) == 1)
{
num_read++;
- result |= ((bfd_vma) (byte & 0x7f)) << shift;
+ if (shift < sizeof (result) * 8)
+ {
+ result |= ((bfd_vma) (byte & 0x7f)) << shift;
+ if ((result >> shift) != (byte & 0x7f))
+ /* Overflow. */
+ status |= 2;
+ shift += 7;
+ }
+ else if ((byte & 0x7f) != 0)
+ status |= 2;
- shift += 7;
if ((byte & 0x80) == 0)
{
- success = TRUE;
+ status &= ~1;
+ if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
+ result |= -((bfd_vma) 1 << shift);
break;
}
}
if (length_return != NULL)
*length_return = num_read;
if (error_return != NULL)
- *error_return = ! success;
-
- if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
- result |= -((bfd_vma) 1 << shift);
+ *error_return = status != 0;
return result;
}
for (symcount = 0; p < end && symcount < tdata->symcount; symcount++)
{
- bfd_vma index;
+ bfd_vma idx;
bfd_vma len;
char *name;
asymbol *sym;
- READ_LEB128 (index, p, end);
+ READ_LEB128 (idx, p, end);
READ_LEB128 (len, p, end);
if (p + len < p || p + len > end)
sym = &symbols[symcount];
sym->the_bfd = abfd;
sym->name = name;
- sym->value = index;
+ sym->value = idx;
sym->flags = BSF_GLOBAL | BSF_FUNCTION;
sym->section = space_function_index;
sym->udata.p = NULL;
void *fsarg)
{
sec_ptr *numbered_sections = fsarg;
- int index = wasm_section_name_to_code (asect->name);
+ int idx = wasm_section_name_to_code (asect->name);
- if (index == 0)
+ if (idx == 0)
return;
- numbered_sections[index] = asect;
+ numbered_sections[idx] = asect;
}
struct compute_section_arg
void *fsarg)
{
struct compute_section_arg *fs = fsarg;
- int index;
+ int idx;
if (fs->failed)
return;
- index = wasm_section_name_to_code (asect->name);
+ idx = wasm_section_name_to_code (asect->name);
- if (index != 0)
+ if (idx != 0)
return;
if (CONST_STRNEQ (asect->name, WASM_SECTION_PREFIX))
/* 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_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define wasm_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_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
_bfd_dummy_target,
},
{
- bfd_false,
+ _bfd_bool_bfd_false_error,
wasm_mkobject,
_bfd_generic_mkarchive,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
{ /* bfd_write_contents. */
- bfd_false,
+ _bfd_bool_bfd_false_error,
wasm_write_object_contents,
_bfd_write_archive_contents,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
BFD_JUMP_TABLE_GENERIC (_bfd_generic),