Consistent method naming in tools/webassembly.py. NFC (#17253)

Author: sbc100

emsymbolizer.py

@@ -165,9 +165,9 @@ def symbolize_address_sourcemap(module, address, force_file):
     section = get_sourceMappingURL_section(module)
     assert section
     module.seek(section.offset)
-    assert module.readString() == 'sourceMappingURL'
+    assert module.read_string() == 'sourceMappingURL'
     # TODO: support stripping/replacing a prefix from the URL
-    URL = module.readString()
+    URL = module.read_string()
 
   if shared.DEBUG:
     print(f'Source Mapping URL: {URL}')

tests/test_other.py

@@ -8475,7 +8475,7 @@ def test_check_sourcemapurl(self):
     self.run_process([EMCC, test_file('hello_123.c'), '-gsource-map', '-o', 'a.js', '--source-map-base', 'dir/'])
     output = read_binary('a.wasm')
     # has sourceMappingURL section content and points to 'dir/a.wasm.map' file
-    source_mapping_url_content = webassembly.toLEB(len('sourceMappingURL')) + b'sourceMappingURL' + webassembly.toLEB(len('dir/a.wasm.map')) + b'dir/a.wasm.map'
+    source_mapping_url_content = webassembly.to_leb(len('sourceMappingURL')) + b'sourceMappingURL' + webassembly.to_leb(len('dir/a.wasm.map')) + b'dir/a.wasm.map'
     self.assertEqual(output.count(source_mapping_url_content), 1)
     # make sure no DWARF debug info sections remain - they would just waste space
     self.assertNotIn(b'.debug_', output)
@@ -8502,7 +8502,7 @@ def test_check_sourcemapurl_default(self, *args):
     self.run_process([EMCC, test_file('hello_123.c'), '-gsource-map', '-o', 'a.js'] + list(args))
     output = read_binary('a.wasm')
     # has sourceMappingURL section content and points to 'a.wasm.map' file
-    source_mapping_url_content = webassembly.toLEB(len('sourceMappingURL')) + b'sourceMappingURL' + webassembly.toLEB(len('a.wasm.map')) + b'a.wasm.map'
+    source_mapping_url_content = webassembly.to_leb(len('sourceMappingURL')) + b'sourceMappingURL' + webassembly.to_leb(len('a.wasm.map')) + b'a.wasm.map'
     self.assertIn(source_mapping_url_content, output)
 
   def test_wasm_sourcemap(self):

tools/building.py

@@ -1252,11 +1252,11 @@ def emit_debug_on_side(wasm_file):
   # see https://yurydelendik.github.io/webassembly-dwarf/#external-DWARF
   section_name = b'\x13external_debug_info' # section name, including prefixed size
   filename_bytes = embedded_path.encode('utf-8')
-  contents = webassembly.toLEB(len(filename_bytes)) + filename_bytes
+  contents = webassembly.to_leb(len(filename_bytes)) + filename_bytes
   section_size = len(section_name) + len(contents)
   with open(wasm_file, 'ab') as f:
     f.write(b'\0') # user section is code 0
-    f.write(webassembly.toLEB(section_size))
+    f.write(webassembly.to_leb(section_size))
     f.write(section_name)
     f.write(contents)
 
@@ -1353,7 +1353,7 @@ def is_wasm_dylib(filename):
   section = next(module.sections())
   if section.type == webassembly.SecType.CUSTOM:
     module.seek(section.offset)
-    if module.readString() in ('dylink', 'dylink.0'):
+    if module.read_string() in ('dylink', 'dylink.0'):
       return True
   return False
 

tools/extract_metadata.py

@@ -10,21 +10,21 @@
 
 def is_wrapper_function(module, function):
   module.seek(function.offset)
-  num_local_decls = module.readULEB()
+  num_local_decls = module.read_uleb()
   while num_local_decls:
-    local_count = module.readULEB()  # noqa
+    local_count = module.read_uleb()  # noqa
     local_type = module.read_type()  # noqa
     num_local_decls -= 1
   end = function.offset + function.size
   while module.tell() != end:
-    opcode = module.readByte()
+    opcode = module.read_byte()
     try:
       opcode = webassembly.OpCode(opcode)
     except ValueError as e:
       print(e)
       return False
     if opcode == webassembly.OpCode.CALL:
-      callee = module.readULEB()  # noqa
+      callee = module.read_uleb()  # noqa
     elif opcode == webassembly.OpCode.END:
       break
     else:
@@ -100,7 +100,7 @@ def get_asm_strings(module, globls, export_map, imported_globals):
 
   asm_strings = {}
   str_start = seg_offset
-  data = module.readAt(seg.offset, seg.size)
+  data = module.read_at(seg.offset, seg.size)
   size = end_addr - start_addr
   end = seg_offset + size
   while str_start < end:
@@ -157,7 +157,7 @@ def update_metadata(filename, metadata):
 
 def get_string_at(module, address):
   seg, offset = find_segment_with_address(module, address)
-  data = module.readAt(seg.offset, seg.size)
+  data = module.read_at(seg.offset, seg.size)
   str_end = data.find(b'\0', offset)
   return data_to_string(data[offset:str_end])