summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binary-reader-objdump.cc25
-rw-r--r--src/interp/interp-wasm-c-api.cc2
-rw-r--r--src/tools/spectest-interp.cc2
-rw-r--r--src/tools/wasm-interp.cc2
-rw-r--r--src/tools/wasm-objdump.cc2
-rw-r--r--src/tools/wasm-opcodecnt.cc2
-rw-r--r--src/tools/wasm-validate.cc2
-rw-r--r--src/tools/wasm2c.cc2
-rw-r--r--src/tools/wasm2wat.cc2
-rw-r--r--src/tools/wast2json.cc2
-rw-r--r--src/tools/wat2wasm.cc2
11 files changed, 25 insertions, 20 deletions
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc
index c4ffdfa9..2468afd3 100644
--- a/src/binary-reader-objdump.cc
+++ b/src/binary-reader-objdump.cc
@@ -75,6 +75,8 @@ class BinaryReaderObjdumpBase : public BinaryReaderNop {
std::vector<BinarySection> section_types_;
bool section_found_ = false;
std::string module_name_;
+
+ std::unique_ptr<FileStream> err_stream_;
};
BinaryReaderObjdumpBase::BinaryReaderObjdumpBase(const uint8_t* data,
@@ -84,7 +86,8 @@ BinaryReaderObjdumpBase::BinaryReaderObjdumpBase(const uint8_t* data,
: options_(options),
objdump_state_(objdump_state),
data_(data),
- size_(size) {
+ size_(size),
+ err_stream_(FileStream::CreateStderr()) {
ZeroMemory(section_starts_);
}
@@ -194,8 +197,8 @@ void BinaryReaderObjdumpBase::PrintRelocation(const Reloc& reloc,
Result BinaryReaderObjdumpBase::OnRelocCount(Index count, Index section_index) {
if (section_index >= section_types_.size()) {
- fprintf(stderr, "invalid relocation section index: %" PRIindex "\n",
- section_index);
+ err_stream_->Writef("invalid relocation section index: %" PRIindex "\n",
+ section_index);
reloc_section_ = BinarySection::Invalid;
return Result::Error;
}
@@ -485,7 +488,8 @@ std::string BinaryReaderObjdumpDisassemble::BlockSigToString(Type type) const {
Result BinaryReaderObjdumpDisassemble::OnOpcode(Opcode opcode) {
if (options_->debug) {
const char* opcode_name = opcode.GetName();
- printf("on_opcode: %#" PRIzx ": %s\n", state->offset, opcode_name);
+ err_stream_->Writef("on_opcode: %#" PRIzx ": %s\n", state->offset,
+ opcode_name);
}
if (last_opcode_end) {
@@ -961,6 +965,7 @@ class BinaryReaderObjdump : public BinaryReaderObjdumpBase {
Result OnEventType(Index index, Index sig_index) override;
private:
+ Result InitExprToConstOffset(const InitExpr& expr, uint32_t* out_offset);
Result HandleInitExpr(const InitExpr& expr);
bool ShouldPrintDetails();
void PrintDetails(const char* fmt, ...);
@@ -1083,13 +1088,13 @@ Result BinaryReaderObjdump::OnCount(Index count) {
Result BinaryReaderObjdump::EndModule() {
if (options_->section_name && !section_found_) {
- fprintf(stderr, "Section not found: %s\n", options_->section_name);
+ err_stream_->Writef("Section not found: %s\n", options_->section_name);
return Result::Error;
}
if (options_->relocs) {
if (next_data_reloc_ != objdump_state_->data_relocations.size()) {
- fprintf(stderr, "Data reloctions outside of segments\n");
+ err_stream_->Writef("Data reloctions outside of segments\n");
return Result::Error;
}
}
@@ -1489,8 +1494,8 @@ void BinaryReaderObjdump::PrintInitExpr(const InitExpr& expr) {
}
}
-static Result InitExprToConstOffset(const InitExpr& expr,
- uint32_t* out_offset) {
+Result BinaryReaderObjdump::InitExprToConstOffset(const InitExpr& expr,
+ uint32_t* out_offset) {
switch (expr.type) {
case InitExprType::I32:
*out_offset = expr.value.i32;
@@ -1504,7 +1509,7 @@ static Result InitExprToConstOffset(const InitExpr& expr,
case InitExprType::V128:
case InitExprType::FuncRef:
case InitExprType::NullRef:
- fprintf(stderr, "Segment/Elem offset must be an i32 init expr");
+ err_stream_->Writef("Segment/Elem offset must be an i32 init expr");
return Result::Error;
break;
}
@@ -1750,7 +1755,7 @@ Result BinaryReaderObjdump::OnSymbolCount(Index count) {
Result BinaryReaderObjdump::PrintSymbolFlags(uint32_t flags) {
if (flags > WABT_SYMBOL_FLAG_MAX) {
- fprintf(stderr, "Unknown symbols flags: %x\n", flags);
+ err_stream_->Writef("Unknown symbols flags: %x\n", flags);
return Result::Error;
}
diff --git a/src/interp/interp-wasm-c-api.cc b/src/interp/interp-wasm-c-api.cc
index e55b80c5..ef2b87e8 100644
--- a/src/interp/interp-wasm-c-api.cc
+++ b/src/interp/interp-wasm-c-api.cc
@@ -490,7 +490,7 @@ static ReadBinaryOptions GetOptions() {
const bool kFailOnCustomSectionError = true;
s_features.EnableAll();
if (getenv("WASM_API_DEBUG") != nullptr) {
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
}
return ReadBinaryOptions(s_features, s_log_stream.get(), kReadDebugNames,
kStopOnFirstError, kFailOnCustomSectionError);
diff --git a/src/tools/spectest-interp.cc b/src/tools/spectest-interp.cc
index a212053c..8f380ad8 100644
--- a/src/tools/spectest-interp.cc
+++ b/src/tools/spectest-interp.cc
@@ -69,7 +69,7 @@ static void ParseOptions(int argc, char** argv) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
s_features.AddOptions(&parser);
parser.AddOption('V', "value-stack-size", "SIZE",
diff --git a/src/tools/wasm-interp.cc b/src/tools/wasm-interp.cc
index f7561d3f..e349a9e3 100644
--- a/src/tools/wasm-interp.cc
+++ b/src/tools/wasm-interp.cc
@@ -82,7 +82,7 @@ static void ParseOptions(int argc, char** argv) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
s_features.AddOptions(&parser);
parser.AddOption('V', "value-stack-size", "SIZE",
diff --git a/src/tools/wasm-objdump.cc b/src/tools/wasm-objdump.cc
index f7ef1ddd..ca28eee4 100644
--- a/src/tools/wasm-objdump.cc
+++ b/src/tools/wasm-objdump.cc
@@ -53,7 +53,7 @@ static void ParseOptions(int argc, char** argv) {
[]() { s_objdump_options.disassemble = true; });
parser.AddOption("debug", "Print extra debug information", []() {
s_objdump_options.debug = true;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
s_objdump_options.log_stream = s_log_stream.get();
});
parser.AddOption('x', "details", "Show section details",
diff --git a/src/tools/wasm-opcodecnt.cc b/src/tools/wasm-opcodecnt.cc
index eb49dce4..5d6225f0 100644
--- a/src/tools/wasm-opcodecnt.cc
+++ b/src/tools/wasm-opcodecnt.cc
@@ -57,7 +57,7 @@ static void ParseOptions(int argc, char** argv) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
s_read_binary_options.log_stream = s_log_stream.get();
});
s_features.AddOptions(&parser);
diff --git a/src/tools/wasm-validate.cc b/src/tools/wasm-validate.cc
index 3d671b2f..a55c5ed8 100644
--- a/src/tools/wasm-validate.cc
+++ b/src/tools/wasm-validate.cc
@@ -50,7 +50,7 @@ static void ParseOptions(int argc, char** argv) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
s_features.AddOptions(&parser);
parser.AddOption("no-debug-names", "Ignore debug names in the binary file",
diff --git a/src/tools/wasm2c.cc b/src/tools/wasm2c.cc
index d35d5789..896841a2 100644
--- a/src/tools/wasm2c.cc
+++ b/src/tools/wasm2c.cc
@@ -60,7 +60,7 @@ static void ParseOptions(int argc, char** argv) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
parser.AddOption(
'o', "output", "FILENAME",
diff --git a/src/tools/wasm2wat.cc b/src/tools/wasm2wat.cc
index 63ce282c..58e89849 100644
--- a/src/tools/wasm2wat.cc
+++ b/src/tools/wasm2wat.cc
@@ -62,7 +62,7 @@ static void ParseOptions(int argc, char** argv) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
parser.AddOption(
'o', "output", "FILENAME",
diff --git a/src/tools/wast2json.cc b/src/tools/wast2json.cc
index 9cc2afbd..a5c9a47d 100644
--- a/src/tools/wast2json.cc
+++ b/src/tools/wast2json.cc
@@ -63,7 +63,7 @@ static void ParseOptions(int argc, char* argv[]) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
parser.AddOption("debug-parser", "Turn on debugging the parser of wast files",
[]() { s_debug_parsing = true; });
diff --git a/src/tools/wat2wasm.cc b/src/tools/wat2wasm.cc
index e664d589..f77dad27 100644
--- a/src/tools/wat2wasm.cc
+++ b/src/tools/wat2wasm.cc
@@ -69,7 +69,7 @@ static void ParseOptions(int argc, char* argv[]) {
parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
s_verbose++;
- s_log_stream = FileStream::CreateStdout();
+ s_log_stream = FileStream::CreateStderr();
});
parser.AddOption("debug-parser", "Turn on debugging the parser of wat files",
[]() { s_debug_parsing = true; });
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-28 19:11:54 +0000