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

Use types to distinguish between wasm function body indices and wasm function indices.

Browse Source
This commit is contained in:
Maddy
2018-08-02 01:29:47 +00:00
committed by Dan Gohman
parent f7e481d9ac
commit f5d46cabe7
12 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cranelift/Cargo.toml
View File

@@ -15,6 +15,7 @@ path = "src/clif-util.rs"
[dependencies]
cfg-if = "0.1"
cranelift-codegen = { path = "lib/codegen", version = "0.18.1" }
cranelift-entity = { path = "lib/entity", version = "0.18.1" }
cranelift-reader = { path = "lib/reader", version = "0.18.1" }
cranelift-frontend = { path = "lib/frontend", version = "0.18.1" }
cranelift-serde = { path = "lib/serde", version = "0.18.1", optional = true }

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

@@ -23,6 +23,7 @@ extern crate term;
cfg_if! {
if #[cfg(feature = "wasm")] {
extern crate cranelift_entity;
extern crate cranelift_wasm;
extern crate wabt;
mod wasm;

21
cranelift/src/wasm.rs
View File

@@ -7,7 +7,8 @@
use cranelift_codegen::Context;
use cranelift_codegen::print_errors::{pretty_error, pretty_verifier_error};
use cranelift_codegen::settings::FlagsOrIsa;
use cranelift_wasm::{translate_module, DummyEnvironment, ModuleEnvironment};
use cranelift_entity::EntityRef;
use cranelift_wasm::{translate_module, DummyEnvironment, FuncIndex, ModuleEnvironment};
use std::error::Error;
use std::path::Path;
use std::path::PathBuf;
@@ -107,17 +108,17 @@ fn handle_module(
}
let num_func_imports = dummy_environ.get_num_func_imports();
for (def_index, func) in dummy_environ.info.function_bodies.iter().enumerate() {
let func_index = num_func_imports + def_index;
for (def_index, func) in dummy_environ.info.function_bodies.iter() {
let func_index = num_func_imports + def_index.index();
let mut context = Context::new();
context.func = func.clone();
if let Some(start_func) = dummy_environ.info.start_func {
if func_index == start_func {
if func_index == start_func.index() {
println!("; Selected as wasm start function");
}
}
vprintln!(flag_verbose, "");
for export_name in &dummy_environ.info.functions[func_index].export_names {
for export_name in &dummy_environ.info.functions[FuncIndex::new(func_index)].export_names {
println!("; Exported as \"{}\"", export_name);
}
println!("{}", context.func.display(None));
@@ -142,10 +143,10 @@ fn handle_module(
let num_func_imports = dummy_environ.get_num_func_imports();
let mut total_module_code_size = 0;
let mut context = Context::new();
for (def_index, func) in dummy_environ.info.function_bodies.iter().enumerate() {
for (def_index, func) in dummy_environ.info.function_bodies.iter() {
context.func = func.clone();
let func_index = num_func_imports + def_index;
let func_index = num_func_imports + def_index.index();
if flag_check_translation {
context
.verify(fisa)
@@ -162,7 +163,7 @@ fn handle_module(
total_module_code_size += compiled_size;
println!(
"Function #{} bytecode size: {} bytes",
func_index, dummy_environ.func_bytecode_sizes[def_index]
func_index, dummy_environ.func_bytecode_sizes[def_index.index()]
);
}
}
@@ -170,11 +171,11 @@ fn handle_module(
if flag_print {
vprintln!(flag_verbose, "");
if let Some(start_func) = dummy_environ.info.start_func {
if func_index == start_func {
if func_index == start_func.index() {
println!("; Selected as wasm start function");
}
}
for export_name in &dummy_environ.info.functions[func_index].export_names {
for export_name in &dummy_environ.info.functions[FuncIndex::new(func_index)].export_names {
println!("; Exported as \"{}\"", export_name);
}
println!("{}", context.func.display(fisa.isa));