Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/memoryprofiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ var emscriptenMemoryProfiler = {
html += '. STACK_MAX: ' + toHex(stackMax, width) + '.';
html += '<br />STACK memory area used now (should be zero): ' + self.formatBytes(stackBase - stackCurrent) + '.' + colorBar('#FFFF00') + ' STACK watermark highest seen usage (approximate lower-bound!): ' + self.formatBytes(stackBase - self.stackTopWatermark);

var heap_base = Module['___heap_base'];
var heap_base = ___heap_base;
var heap_end = _sbrk({{{ to64('0') }}});
html += "<br />DYNAMIC memory area size: " + self.formatBytes(heap_end - heap_base);
html += ". start: " + toHex(heap_base, width);
Expand Down
4 changes: 2 additions & 2 deletions test/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -8593,8 +8593,8 @@ def test_memprof_requirements(self):
assert(typeof _emscripten_stack_get_base === 'function');
assert(typeof _emscripten_stack_get_end === 'function');
assert(typeof _emscripten_stack_get_current === 'function');
assert(typeof Module['___heap_base'] === 'number');
assert(Module['___heap_base'] > 0);
assert(typeof ___heap_base === 'number');
assert(___heap_base > 0);
out('able to run memprof');
}
};
Expand Down
6 changes: 3 additions & 3 deletions tools/emscripten.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,10 @@ def create_data_exports(data_exports):
if settings.RELOCATABLE:
v += settings.GLOBAL_BASE
mangled = asmjs_mangle(k)
if settings.MINIMAL_RUNTIME:
lines.append("var %s = %s;" % (mangled, v))
else:
if should_export(mangled) and not settings.MINIMAL_RUNTIME:
lines.append("var %s = Module['%s'] = %s;" % (mangled, mangled, v))
else:
lines.append("var %s = %s;" % (mangled, v))

return '\n'.join(lines)

Expand Down