fluencelabs/wasm-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-utils synced 2025-05-09 21:52:15 +00:00
Code Issues Projects Releases Wiki Activity

rename crate

Browse Source
This commit is contained in:
NikVolf 2018-03-13 15:58:18 +03:00
parent de971270f8
commit b0f43bb575
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "wasm-utils" name = "pwasm-utils"
version = "0.1.0" version = "0.1.0"
authors = ["NikVolf <nikvolf@gmail.com>"] authors = ["NikVolf <nikvolf@gmail.com>"]

14
build/main.rs
View File

@ -1,7 +1,7 @@
//! Experimental build tool for cargo //! Experimental build tool for cargo
extern crate glob; extern crate glob;
extern crate wasm_utils; extern crate pwasm_utils as utils;
extern crate clap; extern crate clap;
extern crate parity_wasm; extern crate parity_wasm;
@ -14,7 +14,7 @@ use std::path::PathBuf;
use clap::{App, Arg}; use clap::{App, Arg};
use parity_wasm::elements; use parity_wasm::elements;
use wasm_utils::{CREATE_SYMBOL, CALL_SYMBOL, ununderscore_funcs, externalize_mem, shrink_unknown_stack}; use utils::{CREATE_SYMBOL, CALL_SYMBOL, ununderscore_funcs, externalize_mem, shrink_unknown_stack};
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
@ -64,7 +64,7 @@ fn has_ctor(module: &elements::Module) -> bool {
} }
fn main() { fn main() {
wasm_utils::init_log(); utils::init_log();
let matches = App::new("wasm-build") let matches = App::new("wasm-build")
.arg(Arg::with_name("target") .arg(Arg::with_name("target")
@ -151,13 +151,13 @@ fn main() {
} }
let runtime_version: u32 = matches.value_of("runtime_version").unwrap_or("1").parse() let runtime_version: u32 = matches.value_of("runtime_version").unwrap_or("1").parse()
.expect("--runtime-version should be a positive integer"); .expect("--runtime-version should be a positive integer");
module = wasm_utils::inject_runtime_type(module, &runtime_type, runtime_version); module = utils::inject_runtime_type(module, &runtime_type, runtime_version);
} }
let mut ctor_module = module.clone(); let mut ctor_module = module.clone();
if !matches.is_present("skip_optimization") { if !matches.is_present("skip_optimization") {
wasm_utils::optimize( utils::optimize(
&mut module, &mut module,
vec![CALL_SYMBOL] vec![CALL_SYMBOL]
).expect("Optimizer to finish without errors"); ).expect("Optimizer to finish without errors");
@ -175,9 +175,9 @@ fn main() {
// Otherwise it will just save an optimised raw_module // Otherwise it will just save an optimised raw_module
if has_ctor(&ctor_module) { if has_ctor(&ctor_module) {
if !matches.is_present("skip_optimization") { if !matches.is_present("skip_optimization") {
wasm_utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors"); utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors");
} }
let ctor_module = wasm_utils::pack_instance(raw_module, ctor_module).expect("Packing failed"); let ctor_module = utils::pack_instance(raw_module, ctor_module).expect("Packing failed");
parity_wasm::serialize_to_file(&path, ctor_module).expect("Failed to serialize to file"); parity_wasm::serialize_to_file(&path, ctor_module).expect("Failed to serialize to file");
} else { } else {
let mut file = fs::File::create(&path).expect("Failed to create file"); let mut file = fs::File::create(&path).expect("Failed to create file");

6
ext/main.rs
View File

@ -1,11 +1,11 @@
extern crate parity_wasm; extern crate parity_wasm;
extern crate wasm_utils; extern crate pwasm_utils as utils;
use std::env; use std::env;
fn main() { fn main() {
wasm_utils::init_log(); utils::init_log();
let args = env::args().collect::<Vec<_>>(); let args = env::args().collect::<Vec<_>>();
if args.len() != 3 { if args.len() != 3 {
@ -13,7 +13,7 @@ fn main() {
return; return;
} }
let module = wasm_utils::externalize( let module = utils::externalize(
parity_wasm::deserialize_file(&args[1]).expect("Module to deserialize ok"), parity_wasm::deserialize_file(&args[1]).expect("Module to deserialize ok"),
vec!["_free", "_malloc", "_memcpy", "_memset", "_memmove"], vec!["_free", "_malloc", "_memcpy", "_memset", "_memmove"],
); );

6
gas/main.rs
View File

@ -1,11 +1,11 @@
extern crate parity_wasm; extern crate parity_wasm;
extern crate wasm_utils; extern crate pwasm_utils as utils;
use std::env; use std::env;
fn main() { fn main() {
wasm_utils::init_log(); utils::init_log();
let args = env::args().collect::<Vec<_>>(); let args = env::args().collect::<Vec<_>>();
if args.len() != 3 { if args.len() != 3 {
@ -16,7 +16,7 @@ fn main() {
// Loading module // Loading module
let module = parity_wasm::deserialize_file(&args[1]).expect("Module deserialization to succeed"); let module = parity_wasm::deserialize_file(&args[1]).expect("Module deserialization to succeed");
let result = wasm_utils::inject_gas_counter( let result = utils::inject_gas_counter(
module, &Default::default() module, &Default::default()
).expect("Failed to inject gas. Some forbidden opcodes?"); ).expect("Failed to inject gas. Some forbidden opcodes?");

6
prune/main.rs
View File

@ -1,11 +1,11 @@
extern crate parity_wasm; extern crate parity_wasm;
extern crate wasm_utils; extern crate pwasm_utils as utils;
extern crate clap; extern crate clap;
use clap::{App, Arg}; use clap::{App, Arg};
fn main() { fn main() {
wasm_utils::init_log(); utils::init_log();
let matches = App::new("wasm-opt") let matches = App::new("wasm-opt")
.arg(Arg::with_name("input") .arg(Arg::with_name("input")
@ -38,7 +38,7 @@ fn main() {
// Invoke optimizer // Invoke optimizer
// Contract is supposed to have only these functions as public api // Contract is supposed to have only these functions as public api
// All other symbols not usable by this list is optimized away // All other symbols not usable by this list is optimized away
wasm_utils::optimize(&mut module, exports).expect("Optimizer to finish without errors"); utils::optimize(&mut module, exports).expect("Optimizer to finish without errors");
parity_wasm::serialize_to_file(&output, module).unwrap(); parity_wasm::serialize_to_file(&output, module).unwrap();
} }

6
stack_height/main.rs
View File

@ -1,11 +1,11 @@
extern crate wasm_utils; extern crate pwasm_utils as utils;
extern crate parity_wasm; extern crate parity_wasm;
use std::env; use std::env;
use wasm_utils::stack_height; use utils::stack_height;
fn main() { fn main() {
wasm_utils::init_log(); utils::init_log();
let args = env::args().collect::<Vec<_>>(); let args = env::args().collect::<Vec<_>>();
if args.len() != 3 { if args.len() != 3 {

4
tests/diff.rs
View File

@ -1,5 +1,5 @@
extern crate diff; extern crate diff;
extern crate wasm_utils; extern crate pwasm_utils as utils;
extern crate wabt; extern crate wabt;
extern crate parity_wasm; extern crate parity_wasm;
@ -80,7 +80,7 @@ macro_rules! def_stack_height_test {
fn $name() { fn $name() {
run_diff_test("stack-height", concat!(stringify!($name), ".wat"), |input| { run_diff_test("stack-height", concat!(stringify!($name), ".wat"), |input| {
let module = elements::deserialize_buffer(input).expect("Failed to deserialize"); let module = elements::deserialize_buffer(input).expect("Failed to deserialize");
let instrumented = wasm_utils::stack_height::inject_limiter(module, 1024).expect("Failed to instrument with stack counter"); let instrumented = utils::stack_height::inject_limiter(module, 1024).expect("Failed to instrument with stack counter");
elements::serialize(instrumented).expect("Failed to serialize") elements::serialize(instrumented).expect("Failed to serialize")
}); });
} }