summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tools/wasm-as.cpp2
-rw-r--r--src/tools/wasm-opt.cpp105
-rw-r--r--src/tools/wasm-shell.cpp (renamed from src/tools/binaryen-shell.cpp)47
3 files changed, 107 insertions, 47 deletions
diff --git a/src/tools/wasm-as.cpp b/src/tools/wasm-as.cpp
index e2425b24a..376c1288c 100644
--- a/src/tools/wasm-as.cpp
+++ b/src/tools/wasm-as.cpp
@@ -56,7 +56,7 @@ int main(int argc, const char *argv[]) {
Module wasm;
- try{
+ try {
if (options.debug) std::cerr << "s-parsing..." << std::endl;
SExpressionParser parser(const_cast<char*>(input.c_str()));
Element& root = *parser.root;
diff --git a/src/tools/wasm-opt.cpp b/src/tools/wasm-opt.cpp
new file mode 100644
index 000000000..d6e7d3bd6
--- /dev/null
+++ b/src/tools/wasm-opt.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2016 WebAssembly Community Group participants
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// A WebAssembly optimizer, loads code, optionally runs passes on it,
+// then writes it.
+//
+
+#include <memory>
+
+#include "pass.h"
+#include "support/command-line.h"
+#include "support/file.h"
+#include "wasm-printing.h"
+#include "wasm-s-parser.h"
+#include "wasm-validator.h"
+
+using namespace wasm;
+
+//
+// main
+//
+
+int main(int argc, const char* argv[]) {
+ Name entry;
+ std::vector<std::string> passes;
+
+ Options options("wasm-opt", "Optimize .wast files");
+ options
+ .add("--output", "-o", "Output file (stdout if not specified)",
+ Options::Arguments::One,
+ [](Options* o, const std::string& argument) {
+ o->extra["output"] = argument;
+ Colors::disable();
+ })
+ .add("", "-O", "execute default optimization passes",
+ Options::Arguments::Zero,
+ [&passes](Options*, const std::string&) {
+ passes.push_back("O");
+ })
+ .add_positional("INFILE", Options::Arguments::One,
+ [](Options* o, const std::string& argument) {
+ o->extra["infile"] = argument;
+ });
+ for (const auto& p : PassRegistry::get()->getRegisteredNames()) {
+ options.add(
+ std::string("--") + p, "", PassRegistry::get()->getPassDescription(p),
+ Options::Arguments::Zero,
+ [&passes, p](Options*, const std::string&) { passes.push_back(p); });
+ }
+ options.parse(argc, argv);
+
+ auto input(read_file<std::string>(options.extra["infile"], Flags::Text, options.debug ? Flags::Debug : Flags::Release));
+
+ Module wasm;
+
+ try {
+ if (options.debug) std::cerr << "s-parsing..." << std::endl;
+ SExpressionParser parser(const_cast<char*>(input.c_str()));
+ Element& root = *parser.root;
+ if (options.debug) std::cerr << "w-parsing..." << std::endl;
+ SExpressionWasmBuilder builder(wasm, *root[0]);
+ } catch (ParseException& p) {
+ p.dump(std::cerr);
+ Fatal() << "error in parsing input";
+ }
+
+ if (!WasmValidator().validate(wasm)) {
+ Fatal() << "error in validating input";
+ }
+
+ if (passes.size() > 0) {
+ if (options.debug) std::cerr << "running passes...\n";
+ PassRunner passRunner(&wasm);
+ if (options.debug) passRunner.setDebug(true);
+ for (auto& passName : passes) {
+ if (passName == "O") {
+ passRunner.addDefaultOptimizationPasses();
+ } else {
+ passRunner.add(passName);
+ }
+ }
+ passRunner.run();
+ assert(WasmValidator().validate(wasm));
+ }
+
+ if (options.extra.count("output") > 0) {
+ if (options.debug) std::cerr << "writing..." << std::endl;
+ Output output(options.extra["output"], Flags::Text, options.debug ? Flags::Debug : Flags::Release);
+ WasmPrinter::printModule(&wasm, output.getStream());
+ }
+}
diff --git a/src/tools/binaryen-shell.cpp b/src/tools/wasm-shell.cpp
index 79c01c5bf..72e8e13ba 100644
--- a/src/tools/binaryen-shell.cpp
+++ b/src/tools/wasm-shell.cpp
@@ -169,44 +169,21 @@ static void run_asserts(size_t* i, bool* checked, Module* wasm,
int main(int argc, const char* argv[]) {
Name entry;
- std::vector<std::string> passes;
- Options options("binaryen-shell", "Execute .wast files");
+ Options options("wasm-shell", "Execute .wast files");
options
- .add("--output", "-o", "Output file (stdout if not specified)",
- Options::Arguments::One,
- [](Options* o, const std::string& argument) {
- o->extra["output"] = argument;
- Colors::disable();
- })
.add(
"--entry", "-e", "call the entry point after parsing the module",
Options::Arguments::One,
[&entry](Options*, const std::string& argument) { entry = argument; })
- .add("", "-O", "execute default optimization passes",
- Options::Arguments::Zero,
- [&passes](Options*, const std::string&) {
- passes.push_back("O");
- })
.add_positional("INFILE", Options::Arguments::One,
[](Options* o, const std::string& argument) {
o->extra["infile"] = argument;
});
- for (const auto& p : PassRegistry::get()->getRegisteredNames()) {
- options.add(
- std::string("--") + p, "", PassRegistry::get()->getPassDescription(p),
- Options::Arguments::Zero,
- [&passes, p](Options*, const std::string&) { passes.push_back(p); });
- }
options.parse(argc, argv);
auto input(read_file<std::vector<char>>(options.extra["infile"], Flags::Text, options.debug ? Flags::Debug : Flags::Release));
- std::unique_ptr<Output> output;
- if (options.extra.count("output") > 0) {
- output = wasm::make_unique<Output>(options.extra["output"], Flags::Text, options.debug ? Flags::Debug : Flags::Release);
- }
-
bool checked = false;
try {
@@ -226,29 +203,7 @@ int main(int argc, const char* argv[]) {
builder = wasm::make_unique<SExpressionWasmBuilder>(wasm, *root[i]);
i++;
assert(WasmValidator().validate(wasm));
-
- MixedArena moreModuleAllocations;
-
- if (passes.size() > 0) {
- if (options.debug) std::cerr << "running passes...\n";
- PassRunner passRunner(&wasm);
- if (options.debug) passRunner.setDebug(true);
- for (auto& passName : passes) {
- if (passName == "O") {
- passRunner.addDefaultOptimizationPasses();
- } else {
- passRunner.add(passName);
- }
- }
- passRunner.run();
- assert(WasmValidator().validate(wasm));
- }
-
run_asserts(&i, &checked, &wasm, &root, &builder, entry);
-
- if (output) {
- WasmPrinter::printModule(&wasm, output->getStream());
- }
} else {
run_asserts(&i, &checked, nullptr, &root, nullptr, entry);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-06 04:58:32 +0000