summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/asm2wasm.cpp10
-rw-r--r--src/tools/fuzzing.h3
-rw-r--r--src/tools/wasm-as.cpp5
-rw-r--r--src/tools/wasm-ctor-eval.cpp8
-rw-r--r--src/tools/wasm-dis.cpp4
-rw-r--r--src/tools/wasm-emscripten-finalize.cpp6
-rw-r--r--src/tools/wasm-metadce.cpp9
-rw-r--r--src/tools/wasm-opt.cpp9
-rw-r--r--src/tools/wasm-shell.cpp6
-rw-r--r--src/tools/wasm2js.cpp11
10 files changed, 19 insertions, 52 deletions
diff --git a/src/tools/asm2wasm.cpp b/src/tools/asm2wasm.cpp
index 083f3386b..b54dd8cd8 100644
--- a/src/tools/asm2wasm.cpp
+++ b/src/tools/asm2wasm.cpp
@@ -199,10 +199,8 @@ int main(int argc, const char* argv[]) {
// debug info is disabled if a map file is not specified with wasm binary
pre.debugInfo =
options.passOptions.debugInfo && (!emitBinary || sourceMapFilename.size());
- auto input(read_file<std::vector<char>>(options.extra["infile"],
- Flags::Text,
- options.debug ? Flags::Debug
- : Flags::Release));
+ auto input(
+ read_file<std::vector<char>>(options.extra["infile"], Flags::Text));
char* start = pre.process(input.data());
if (options.debug) {
@@ -224,8 +222,7 @@ int main(int argc, const char* argv[]) {
const auto& memInit = options.extra.find("mem init");
if (memInit != options.extra.end()) {
auto filename = memInit->second.c_str();
- auto data(read_file<std::vector<char>>(
- filename, Flags::Binary, options.debug ? Flags::Debug : Flags::Release));
+ auto data(read_file<std::vector<char>>(filename, Flags::Binary));
// create the memory segment
Expression* init;
const auto& memBase = options.extra.find("mem base");
@@ -293,7 +290,6 @@ int main(int argc, const char* argv[]) {
std::cerr << "emitting..." << std::endl;
}
ModuleWriter writer;
- writer.setDebug(options.debug);
writer.setDebugInfo(options.passOptions.debugInfo);
writer.setSymbolMap(symbolMap);
writer.setBinary(emitBinary);
diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
index 571dad79e..733029bd7 100644
--- a/src/tools/fuzzing.h
+++ b/src/tools/fuzzing.h
@@ -65,8 +65,7 @@ class TranslateToFuzzReader {
public:
TranslateToFuzzReader(Module& wasm, std::string& filename)
: wasm(wasm), builder(wasm) {
- auto input(
- read_file<std::vector<char>>(filename, Flags::Binary, Flags::Release));
+ auto input(read_file<std::vector<char>>(filename, Flags::Binary));
readData(input);
}
diff --git a/src/tools/wasm-as.cpp b/src/tools/wasm-as.cpp
index 2203aa83c..cb6a8f226 100644
--- a/src/tools/wasm-as.cpp
+++ b/src/tools/wasm-as.cpp
@@ -97,10 +97,7 @@ int main(int argc, const char* argv[]) {
removeSpecificSuffix(options.extra["infile"], ".wast") + ".wasm";
}
- auto input(
- read_file<std::string>(options.extra["infile"],
- Flags::Text,
- options.debug ? Flags::Debug : Flags::Release));
+ auto input(read_file<std::string>(options.extra["infile"], Flags::Text));
Module wasm;
diff --git a/src/tools/wasm-ctor-eval.cpp b/src/tools/wasm-ctor-eval.cpp
index af4d0d0b2..34451b871 100644
--- a/src/tools/wasm-ctor-eval.cpp
+++ b/src/tools/wasm-ctor-eval.cpp
@@ -433,10 +433,7 @@ int main(int argc, const char* argv[]) {
});
options.parse(argc, argv);
- auto input(
- read_file<std::string>(options.extra["infile"],
- Flags::Text,
- options.debug ? Flags::Debug : Flags::Release));
+ auto input(read_file<std::string>(options.extra["infile"], Flags::Text));
Module wasm;
@@ -445,8 +442,6 @@ int main(int argc, const char* argv[]) {
std::cerr << "reading...\n";
}
ModuleReader reader;
- reader.setDebug(options.debug);
-
try {
reader.read(options.extra["infile"], wasm);
} catch (ParseException& p) {
@@ -488,7 +483,6 @@ int main(int argc, const char* argv[]) {
std::cerr << "writing..." << std::endl;
}
ModuleWriter writer;
- writer.setDebug(options.debug);
writer.setBinary(emitBinary);
writer.setDebugInfo(debugInfo);
writer.write(wasm, options.extra["output"]);
diff --git a/src/tools/wasm-dis.cpp b/src/tools/wasm-dis.cpp
index 6c1ed1524..493a55566 100644
--- a/src/tools/wasm-dis.cpp
+++ b/src/tools/wasm-dis.cpp
@@ -75,9 +75,7 @@ int main(int argc, const char* argv[]) {
if (options.debug) {
std::cerr << "Printing..." << std::endl;
}
- Output output(options.extra["output"],
- Flags::Text,
- options.debug ? Flags::Debug : Flags::Release);
+ Output output(options.extra["output"], Flags::Text);
WasmPrinter::printModule(&wasm, output.getStream());
output << '\n';
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index 38904df12..c1d104c6a 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -277,7 +277,7 @@ int main(int argc, const char* argv[]) {
// Finally, separate out data segments if relevant (they may have been needed
// for metadata).
if (!dataSegmentFile.empty()) {
- Output memInitFile(dataSegmentFile, Flags::Binary, Flags::Release);
+ Output memInitFile(dataSegmentFile, Flags::Binary);
if (globalBase == INVALID_BASE) {
Fatal() << "globalBase must be set";
}
@@ -296,10 +296,8 @@ int main(int argc, const char* argv[]) {
passRunner.run();
}
- auto outputBinaryFlag = emitBinary ? Flags::Binary : Flags::Text;
- Output output(outfile, outputBinaryFlag, Flags::Release);
+ Output output(outfile, emitBinary ? Flags::Binary : Flags::Text);
ModuleWriter writer;
- writer.setDebug(options.debug);
writer.setDebugInfo(debugInfo);
// writer.setSymbolMap(symbolMap);
writer.setBinary(emitBinary);
diff --git a/src/tools/wasm-metadce.cpp b/src/tools/wasm-metadce.cpp
index 1bdb18db2..6fa0477b3 100644
--- a/src/tools/wasm-metadce.cpp
+++ b/src/tools/wasm-metadce.cpp
@@ -489,8 +489,7 @@ int main(int argc, const char* argv[]) {
Fatal() << "no graph file provided.";
}
- auto input(read_file<std::string>(
- options.extra["infile"], Flags::Text, Flags::Release));
+ auto input(read_file<std::string>(options.extra["infile"], Flags::Text));
Module wasm;
@@ -499,8 +498,6 @@ int main(int argc, const char* argv[]) {
std::cerr << "reading...\n";
}
ModuleReader reader;
- reader.setDebug(options.debug);
-
try {
reader.read(options.extra["infile"], wasm);
} catch (ParseException& p) {
@@ -518,8 +515,7 @@ int main(int argc, const char* argv[]) {
}
}
- auto graphInput(
- read_file<std::string>(graphFile, Flags::Text, Flags::Release));
+ auto graphInput(read_file<std::string>(graphFile, Flags::Text));
auto* copy = strdup(graphInput.c_str());
json::Value outside;
outside.parse(copy);
@@ -613,7 +609,6 @@ int main(int argc, const char* argv[]) {
if (options.extra.count("output") > 0) {
ModuleWriter writer;
writer.setBinary(emitBinary);
- writer.setDebugInfo(debugInfo);
writer.write(wasm, options.extra["output"]);
}
diff --git a/src/tools/wasm-opt.cpp b/src/tools/wasm-opt.cpp
index 1964019a5..7b04f5449 100644
--- a/src/tools/wasm-opt.cpp
+++ b/src/tools/wasm-opt.cpp
@@ -210,7 +210,6 @@ int main(int argc, const char* argv[]) {
if (!translateToFuzz) {
ModuleReader reader;
- reader.setDebug(options.debug);
try {
reader.read(options.extra["infile"], wasm, inputSourceMapFilename);
} catch (ParseException& p) {
@@ -285,7 +284,6 @@ int main(int argc, const char* argv[]) {
if (extraFuzzCommand.size() > 0 && options.extra.count("output") > 0) {
BYN_TRACE("writing binary before opts, for extra fuzz command...\n");
ModuleWriter writer;
- writer.setDebug(options.debug);
writer.setBinary(emitBinary);
writer.setDebugInfo(options.passOptions.debugInfo);
writer.write(wasm, options.extra["output"]);
@@ -297,13 +295,13 @@ int main(int argc, const char* argv[]) {
Module other;
if (fuzzExecAfter && fuzzBinary) {
- BufferWithRandomAccess buffer(false);
+ BufferWithRandomAccess buffer;
// write the binary
- WasmBinaryWriter writer(&wasm, buffer, false);
+ WasmBinaryWriter writer(&wasm, buffer);
writer.write();
// read the binary
auto input = buffer.getAsChars();
- WasmBinaryBuilder parser(other, input, false);
+ WasmBinaryBuilder parser(other, input);
parser.read();
options.applyFeatures(other);
if (options.passOptions.validate) {
@@ -368,7 +366,6 @@ int main(int argc, const char* argv[]) {
BYN_TRACE("writing...\n");
ModuleWriter writer;
- writer.setDebug(options.debug);
writer.setBinary(emitBinary);
writer.setDebugInfo(options.passOptions.debugInfo);
if (outputSourceMapFilename.size()) {
diff --git a/src/tools/wasm-shell.cpp b/src/tools/wasm-shell.cpp
index b83989a2d..f9efcd245 100644
--- a/src/tools/wasm-shell.cpp
+++ b/src/tools/wasm-shell.cpp
@@ -276,10 +276,8 @@ int main(int argc, const char* argv[]) {
});
options.parse(argc, argv);
- auto input(read_file<std::vector<char>>(options.extra["infile"],
- Flags::Text,
- options.debug ? Flags::Debug
- : Flags::Release));
+ auto input(
+ read_file<std::vector<char>>(options.extra["infile"], Flags::Text));
bool checked = false;
diff --git a/src/tools/wasm2js.cpp b/src/tools/wasm2js.cpp
index 0eed845c1..b8e2daa39 100644
--- a/src/tools/wasm2js.cpp
+++ b/src/tools/wasm2js.cpp
@@ -882,13 +882,10 @@ int main(int argc, const char* argv[]) {
// is defined.
if (binaryInput) {
ModuleReader reader;
- reader.setDebug(options.debug);
reader.read(input, wasm, "");
} else {
- auto input(read_file<std::vector<char>>(options.extra["infile"],
- Flags::Text,
- options.debug ? Flags::Debug
- : Flags::Release));
+ auto input(
+ read_file<std::vector<char>>(options.extra["infile"], Flags::Text));
if (options.debug) {
std::cerr << "s-parsing..." << std::endl;
}
@@ -918,9 +915,7 @@ int main(int argc, const char* argv[]) {
if (options.debug) {
std::cerr << "j-printing..." << std::endl;
}
- Output output(options.extra["output"],
- Flags::Text,
- options.debug ? Flags::Debug : Flags::Release);
+ Output output(options.extra["output"], Flags::Text);
if (!binaryInput && options.extra["asserts"] == "1") {
AssertionEmitter(*root, *sexprBuilder, output, flags, options).emit();
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-11 08:46:47 +0000