Fix emscripten environment (#172) #173

syrusakbary · 2019-02-11T01:20:59Z

Fix emscripten environment

syrusakbary · 2019-02-11T01:24:09Z

lib/emscripten/src/memory.rs

@@ -33,8 +47,8 @@ pub fn enlarge_memory(_ctx: &mut Ctx) -> u32 {
 }

 /// emscripten: abortOnCannotGrowMemory
-pub fn abort_on_cannot_grow_memory(ctx: &mut Ctx) -> u32 {
-    debug!("emscripten::abort_on_cannot_grow_memory");
+pub fn abort_on_cannot_grow_memory(requested_size: u32, ctx: &mut Ctx) -> u32 {


Can we have a abort_on_cannot_grow_memory and abort_on_cannot_grow_memory_old? (with the previous signature)
We will use one or the other depending on the expected signature from the function in the module.

That way we will have backwards compatibility with old-generated emscripten files.

How to do it?

Creating a flag in the EmscriptenGlobals storing if the signature is one or the other:

wasmer/lib/emscripten/src/lib.rs

Line 242 in c3da14d

EmscriptenGlobalsData {

And then use one function or the other depending on that flag.

Thanks, an issue I think we are going to run into is that the types of functions are not going to be the same and these functions get converted into the Func type which will be generic over different argument list types.

It looks like I can potential use the new_from_ptr call. Is this the best way to go?

I think I have a solution using the IsExport trait object.

Dynamically determine abortOnCannotGrowMemory and add _emscripten_get_heap_size and _emscripten_resize_heap

davidMcneil · 2019-02-16T22:45:18Z

This should be ready to be merged. I tested locally with emcc version 1.38.21 and 1.38.26. The wasm files are built with version 1.38.26. Does it make sense to update these files or should I have kept the older version?

syrusakbary · 2019-02-17T00:33:14Z

Looks great! Merging

1026: Bump smallvec from 0.6.13 to 1.0.0 r=MarkMcCaskey a=dependabot-preview[bot] Bumps [smallvec](https://github.com/servo/rust-smallvec) from 0.6.13 to 1.0.0. <details> <summary>Release notes</summary> *Sourced from [smallvec's releases](https://github.com/servo/rust-smallvec/releases).* > ## v1.0.0 > * Requires Rust 1.36 or later. > * [breaking change] Use `MaybeUninit` to avoid possible undefined behavior ([#162](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/162), [#170](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/170)). > * [breaking change] The `drain` method now takes a range argument, just like the standard `Vec::drain` ([#145](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/145)). > * [breaking change] Remove the `unreachable` function and replace it with the new standard `unreachable_unchecked` function ([#164](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/164)). > * [breaking change] Use `no_std` by default. This crate depends only on `core` and `alloc` by default. If the optional `write` feature is enabled then it depends on `std` so that `SmallVec<[u8;_]>` can implement the `std::io::Write` trait ([#173](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/173)). > * [breaking change] Remove the deprecated `VecLike` trait ([#165](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/165)). > * Add support for 96-element small vectors, `SmallVec<[T; 96]>` ([#163](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/163)). > * Iterators now implement `FusedIterator` ([#172](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/172)). > * Indexing now uses the standard `SliceIndex` trait ([#166](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/166)). > * Add automatic fuzz testing and MIRI testing ([#168](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/168), [#162](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/162)). > * Update syntax and formatting to Rust 2018 standard ([#174](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/174), [#167](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/167)). > </details> <details> <summary>Commits</summary> - [`34c2628`](servo/rust-smallvec@34c2628) Auto merge of [#175](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/175) - mbrubeck:one, r=jdm - [`523a6dc`](servo/rust-smallvec@523a6dc) Version 1.0.0 - [`a2c0504`](servo/rust-smallvec@a2c0504) Auto merge of [#174](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/174) - mbrubeck:2018, r=jdm - [`a51059c`](servo/rust-smallvec@a51059c) Update to Rust 2018 edition - [`01917a6`](servo/rust-smallvec@01917a6) Auto merge of [#168](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/168) - dpc:fuzz, r=mbrubeck - [`a3ba738`](servo/rust-smallvec@a3ba738) Add a fake stub input case for afl fuzzer - [`85c54a5`](servo/rust-smallvec@85c54a5) Add simple fuzzing - [`b2c9c65`](servo/rust-smallvec@b2c9c65) Auto merge of [#173](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/173) - mbrubeck:std, r=emilio - [`fffb185`](servo/rust-smallvec@fffb185) Use no_std by default - [`af73fbd`](servo/rust-smallvec@af73fbd) Auto merge of [#172](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/172) - mbrubeck:fused, r=mbrubeck - Additional commits viewable in [compare view](servo/rust-smallvec@v0.6.13...v1.0.0) </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=smallvec&package-manager=cargo&previous-version=0.6.13&new-version=1.0.0)](https://dependabot.com/compatibility-score.html?dependency-name=smallvec&package-manager=cargo&previous-version=0.6.13&new-version=1.0.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

syrusakbary commented Feb 11, 2019

View reviewed changes

syrusakbary mentioned this pull request Feb 11, 2019

abortOnCannotGrowMemory has the wrong type signiture, _emscripten_get_heap_size and _emscripten_resize_heap missing #172

Closed

Fix emscripten environment (#172)

a9b1c6c

Dynamically determine abortOnCannotGrowMemory and add _emscripten_get_heap_size and _emscripten_resize_heap

syrusakbary merged commit 7602071 into wasmerio:master Feb 17, 2019

davidMcneil deleted the 172 branch February 17, 2019 03:35

nlewycky pushed a commit that referenced this pull request Aug 13, 2020

Added Debug to public structs. Close #173

1293df8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix emscripten environment (#172) #173

Fix emscripten environment (#172) #173

syrusakbary commented Feb 11, 2019

syrusakbary Feb 11, 2019

davidMcneil Feb 13, 2019

davidMcneil Feb 13, 2019

davidMcneil Feb 13, 2019

davidMcneil commented Feb 16, 2019

syrusakbary commented Feb 17, 2019

Fix emscripten environment (#172) #173

Fix emscripten environment (#172) #173

Conversation

syrusakbary commented Feb 11, 2019

syrusakbary Feb 11, 2019

Choose a reason for hiding this comment

How to do it?

davidMcneil Feb 13, 2019

Choose a reason for hiding this comment

davidMcneil Feb 13, 2019

Choose a reason for hiding this comment

davidMcneil Feb 13, 2019

Choose a reason for hiding this comment

davidMcneil commented Feb 16, 2019

syrusakbary commented Feb 17, 2019