T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #404: Use log.rs and a file-per-thread logger instead of the dbg! macro;

Browse Source
This commit is contained in:
Benjamin Bouvier
2018-07-20 19:14:04 +02:00
committed by Dan Gohman
parent 60c2cad06e
commit a044f58cea
27 changed files with 123 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/Cargo.toml
View File

@@ -34,6 +34,8 @@ term = "0.5.1"
capstone = { version = "0.4", optional = true }
wabt = { version = "0.4", optional = true }
target-lexicon = "0.0.3"
pretty_env_logger = "0.2.4"
file-per-thread-logger = "0.1.1"
[features]
default = ["disas", "wasm"]

23
cranelift/src/clif-util.rs
View File

@@ -12,6 +12,7 @@
extern crate cfg_if;
extern crate cranelift_codegen;
extern crate cranelift_filetests;
extern crate file_per_thread_logger;
extern crate cranelift_reader;
extern crate docopt;
extern crate filecheck;
@@ -19,6 +20,7 @@ extern crate filecheck;
extern crate serde_derive;
#[cfg(feature = "disas")]
extern crate capstone;
extern crate pretty_env_logger;
extern crate term;
cfg_if! {
@@ -31,6 +33,7 @@ cfg_if! {
}
extern crate target_lexicon;
use cranelift_codegen::dbg::LOG_FILENAME_PREFIX;
use cranelift_codegen::{timing, VERSION};
use docopt::Docopt;
use std::io::{self, Write};
@@ -46,16 +49,17 @@ const USAGE: &str = "
Cranelift code generator utility
Usage:
clif-util test [-vT] <file>...
clif-util cat <file>...
clif-util filecheck [-v] <file>
clif-util print-cfg <file>...
clif-util compile [-vpT] [--set <set>]... [--target <triple>] <file>...
clif-util wasm [-ctvpTs] [--set <set>]... [--target <triple>] <file>...
clif-util test [-vTd] <file>...
clif-util cat [-d] <file>...
clif-util filecheck [-vd] <file>
clif-util print-cfg [-d] <file>...
clif-util compile [-vpTd] [--set <set>]... [--target <triple>] <file>...
clif-util wasm [-ctvpTsd] [--set <set>]... [--target <triple>] <file>...
clif-util --help | --version
Options:
-v, --verbose be more verbose
-d, --debug enable debug output on stderr/stdout
-T, --time-passes
print pass timing report
-t, --just-decode
@@ -90,6 +94,7 @@ struct Args {
flag_target: String,
flag_time_passes: bool,
flag_print_size: bool,
flag_debug: bool,
}
/// A command either succeeds or fails with an error message.
@@ -106,6 +111,12 @@ fn clif_util() -> CommandResult {
})
.unwrap_or_else(|e| e.exit());
if args.flag_debug {
pretty_env_logger::init();
} else {
file_per_thread_logger::initialize(LOG_FILENAME_PREFIX);
}
// Find the sub-command to execute.
let result = if args.cmd_test {
cranelift_filetests::run(args.flag_verbose, &args.arg_file).map(|_time| ())