Skip to content

Commit

Permalink
Revert "Flesh out emscripten metadata (emscripten-core#8519)"
Browse files Browse the repository at this point in the history
This reverts commit c25f8bc.
  • Loading branch information
VirtualTim authored May 23, 2019
1 parent 4fc42ed commit 4d2f441
Showing 1 changed file with 5 additions and 19 deletions.
24 changes: 5 additions & 19 deletions tools/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ def get_emscripten_version(path):
# For the Emscripten-specific WASM metadata section, follows semver, changes
# whenever metadata section changes structure
# NB: major version 0 implies no compatibility
(EMSCRIPTEN_METADATA_MAJOR, EMSCRIPTEN_METADATA_MINOR) = (0, 1)
(EMSCRIPTEN_METADATA_MAJOR, EMSCRIPTEN_METADATA_MINOR) = (0, 0)
# For the JS/WASM ABI, specifies the minimum ABI version required of
# the WASM runtime implementation by the generated WASM binary. It follows
# semver and changes whenever C types change size/signedness or
Expand Down Expand Up @@ -2979,20 +2979,8 @@ def delebify(buf, offset):

@staticmethod
def add_emscripten_metadata(js_file, wasm_file):
WASM_PAGE_SIZE = 65536

mem_size = Settings.TOTAL_MEMORY // WASM_PAGE_SIZE
mem_size = Settings.STATIC_BUMP
table_size = Settings.WASM_TABLE_SIZE
global_base = Settings.GLOBAL_BASE

js = open(js_file).read()
m = re.search(r"(^|\s)tempDoublePtr\s+=\s+(\d+)", js)
tempdouble_ptr = int(m.group(2))
m = re.search(r"(^|\s)DYNAMIC_BASE\s+=\s+(\d+)", js)
dynamic_base = int(m.group(2))
m = re.search(r"(^|\s)DYNAMICTOP_PTR\s+=\s+(\d+)", js)
dynamictop_ptr = int(m.group(2))

logger.debug('creating wasm emscripten metadata section with mem size %d, table size %d' % (mem_size, table_size,))
name = b'\x13emscripten_metadata' # section name, including prefixed size
contents = (
Expand All @@ -3006,13 +2994,11 @@ def add_emscripten_metadata(js_file, wasm_file):
WebAssembly.lebify(EMSCRIPTEN_ABI_MAJOR) +
WebAssembly.lebify(EMSCRIPTEN_ABI_MINOR) +

# static bump
WebAssembly.lebify(mem_size) +
WebAssembly.lebify(table_size) +
WebAssembly.lebify(global_base) +
WebAssembly.lebify(dynamic_base) +
WebAssembly.lebify(dynamictop_ptr) +
WebAssembly.lebify(tempdouble_ptr)

# table size
WebAssembly.lebify(table_size)
# NB: more data can be appended here as long as you increase
# the EMSCRIPTEN_METADATA_MINOR
)
Expand Down

0 comments on commit 4d2f441

Please sign in to comment.