diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/asm2wasm.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/tools/asm2wasm.cpp b/src/tools/asm2wasm.cpp index 01602c8b7..0679ad3f5 100644 --- a/src/tools/asm2wasm.cpp +++ b/src/tools/asm2wasm.cpp @@ -33,7 +33,7 @@ using namespace wasm; int main(int argc, const char *argv[]) { PassOptions passOptions; bool runOptimizationPasses = false; - bool imprecise = false; + Asm2WasmBuilder::TrapMode trapMode = Asm2WasmBuilder::TrapMode::JS; bool wasmOnly = false; bool debugInfo = false; std::string symbolMap; @@ -76,9 +76,21 @@ int main(int argc, const char *argv[]) { [](Options *o, const std::string &) { std::cerr << "--no-opts is deprecated (use -O0, etc.)\n"; }) - .add("--imprecise", "-i", "Imprecise optimizations", Options::Arguments::Zero, - [&imprecise](Options *o, const std::string &) { - imprecise = true; + .add("--emit-potential-traps", "-i", "Emit instructions that might trap, like div/rem of 0", Options::Arguments::Zero, + [&trapMode](Options *o, const std::string &) { + trapMode = Asm2WasmBuilder::TrapMode::Allow; + }) + .add("--emit-clamped-potential-traps", "-i", "Clamp instructions that might trap, like float => int", Options::Arguments::Zero, + [&trapMode](Options *o, const std::string &) { + trapMode = Asm2WasmBuilder::TrapMode::Clamp; + }) + .add("--emit-jsified-potential-traps", "-i", "Avoid instructions that might trap, handling them exactly like JS would", Options::Arguments::Zero, + [&trapMode](Options *o, const std::string &) { + trapMode = Asm2WasmBuilder::TrapMode::JS; + }) + .add("--imprecise", "-i", "Imprecise optimizations (old name for --emit-potential-traps)", Options::Arguments::Zero, + [&trapMode](Options *o, const std::string &) { + trapMode = Asm2WasmBuilder::TrapMode::Allow; }) .add("--wasm-only", "-w", "Input is in WebAssembly-only format, and not actually valid asm.js", Options::Arguments::Zero, [&wasmOnly](Options *o, const std::string &) { @@ -128,7 +140,7 @@ int main(int argc, const char *argv[]) { if (options.debug) std::cerr << "wasming..." << std::endl; Module wasm; wasm.memory.initial = wasm.memory.max = totalMemory / Memory::kPageSize; - Asm2WasmBuilder asm2wasm(wasm, pre, options.debug, imprecise, passOptions, runOptimizationPasses, wasmOnly); + Asm2WasmBuilder asm2wasm(wasm, pre, options.debug, trapMode, passOptions, runOptimizationPasses, wasmOnly); asm2wasm.processAsm(asmjs); // import mem init file, if provided |