Skip to content

Update faerie to 0.9.1 #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 2 commits into from
Mar 27, 2019
Merged

Update faerie to 0.9.1 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd30ca
Update faerie to 0.9.1
yurydelendik Mar 26, 2019
8874a70
update cranelift deps to 0.30.0
yurydelendik Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ name = "wasm2obj"
path = "src/wasm2obj.rs"

[dependencies]
cranelift-codegen = "0.29.0"
cranelift-native = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-native = "0.30.0"
wasmtime-debug = { path = "wasmtime-debug" }
wasmtime-environ = { path = "wasmtime-environ" }
wasmtime-runtime = { path = "wasmtime-runtime" }
Expand All @@ -34,8 +34,8 @@ wasmtime-wast = { path = "wasmtime-wast" }
docopt = "1.0.1"
serde = "1.0.75"
serde_derive = "1.0.75"
faerie = "0.7.1"
target-lexicon = { version = "0.2.0", default-features = false }
faerie = "0.9.1"
target-lexicon = { version = "0.3.0", default-features = false }
pretty_env_logger = "0.3.0"
file-per-thread-logger = "0.1.1"
wabt = "0.7"
Expand Down
6 changes: 3 additions & 3 deletions fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ cargo-fuzz = true
[dependencies]
wasmtime-environ = { path = "../wasmtime-environ" }
wasmtime-jit = { path = "../wasmtime-jit" }
cranelift-codegen = "0.29.0"
cranelift-wasm = "0.29.0"
cranelift-native = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-wasm = "0.30.0"
cranelift-native = "0.30.0"
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
wasmparser = { version = "0.29.2", default-features = false }
binaryen = "0.5.0"
Expand Down
10 changes: 5 additions & 5 deletions wasmtime-debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ edition = "2018"
[dependencies]
gimli = "0.17.0"
wasmparser = { version = "0.28.0" }
cranelift-codegen = "0.29.0"
cranelift-entity = "0.29.0"
cranelift-wasm = "0.29.0"
faerie = "0.7.0"
cranelift-codegen = "0.30.0"
cranelift-entity = "0.30.0"
cranelift-wasm = "0.30.0"
faerie = "0.9.1"
wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
target-lexicon = { version = "0.2.0", default-features = false }
target-lexicon = { version = "0.3.0", default-features = false }
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion wasmtime-debug/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn emit_debugsections_image(
let segment_body = (segment_body.0 as *const u8, segment_body.1 - segment_body.0);

let body = unsafe { ::std::slice::from_raw_parts(segment_body.0, segment_body.1) };
obj.declare_with("all", Decl::Function { global: false }, body.to_vec())?;
obj.declare_with("all", Decl::function(), body.to_vec())?;

emit_dwarf(&mut obj, dwarf, &resolver);

Expand Down
2 changes: 1 addition & 1 deletion wasmtime-debug/src/write_debuginfo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ macro_rules! decl_section {
$artifact
.declare_with(
SectionId::$section.name(),
Decl::DebugSection,
Decl::debug_section(),
$name.0.writer.into_vec(),
)
.unwrap();
Expand Down
6 changes: 3 additions & 3 deletions wasmtime-environ/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = "0.29.0"
cranelift-entity = "0.29.0"
cranelift-wasm = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-entity = "0.30.0"
cranelift-wasm = "0.30.0"
cast = { version = "0.2.2", default-features = false }
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }
Expand Down
10 changes: 5 additions & 5 deletions wasmtime-jit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = "0.29.0"
cranelift-entity = "0.29.0"
cranelift-wasm = "0.29.0"
cranelift-frontend = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-entity = "0.30.0"
cranelift-wasm = "0.30.0"
cranelift-frontend = "0.30.0"
wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
wasmtime-runtime = { path = "../wasmtime-runtime", default-features = false }
wasmtime-debug = { path = "../wasmtime-debug", default-features = false }
region = "2.0.0"
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }
target-lexicon = { version = "0.2.0", default-features = false }
target-lexicon = { version = "0.3.0", default-features = false }
hashbrown = { version = "0.1.8", optional = true }
wasmparser = "0.29.2"

Expand Down
8 changes: 4 additions & 4 deletions wasmtime-obj/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = "0.29.0"
cranelift-entity = "0.29.0"
cranelift-wasm = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-entity = "0.30.0"
cranelift-wasm = "0.30.0"
wasmtime-environ = { path = "../wasmtime-environ" }
faerie = "0.7.1"
faerie = "0.9.1"
10 changes: 2 additions & 8 deletions wasmtime-obj/src/data_segment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@ pub fn declare_data_segment(
index: usize,
) -> Result<(), String> {
let name = format!("_memory_{}", index);
obj.declare(
name,
Decl::Data {
writable: false,
global: false,
},
)
.map_err(|err| format!("{}", err))?;
obj.declare(name, Decl::data())
.map_err(|err| format!("{}", err))?;
Ok(())
}

Expand Down
2 changes: 1 addition & 1 deletion wasmtime-obj/src/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub fn declare_functions(
for (i, _function_relocs) in relocations.iter().rev() {
let func_index = module.func_index(i);
let string_name = format!("_wasm_function_{}", func_index.index());
obj.declare(string_name, Decl::Function { global: true })
obj.declare(string_name, Decl::function().global())
.map_err(|err| format!("{}", err))?;
}
Ok(())
Expand Down
11 changes: 2 additions & 9 deletions wasmtime-obj/src/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,8 @@ fn emit_vmcontext_init(
target_config: &TargetFrontendConfig,
) -> Result<(), String> {
let (data, table_relocs) = layout_vmcontext(module, target_config);
obj.declare_with(
"_vmcontext_init",
Decl::Data {
writable: false,
global: true,
},
data.to_vec(),
)
.map_err(|err| format!("{}", err))?;
obj.declare_with("_vmcontext_init", Decl::data().global(), data.to_vec())
.map_err(|err| format!("{}", err))?;
for reloc in table_relocs.iter() {
let target_name = format!("_table_{}", reloc.index);
obj.link(Link {
Expand Down
10 changes: 2 additions & 8 deletions wasmtime-obj/src/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,8 @@ use faerie::{Artifact, Decl};
/// Declares data segment symbol
pub fn declare_table(obj: &mut Artifact, index: usize) -> Result<(), String> {
let name = format!("_table_{}", index);
obj.declare(
name,
Decl::Data {
writable: false,
global: false,
},
)
.map_err(|err| format!("{}", err))?;
obj.declare(name, Decl::data())
.map_err(|err| format!("{}", err))?;
Ok(())
}

Expand Down
6 changes: 3 additions & 3 deletions wasmtime-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = "0.29.0"
cranelift-entity = "0.29.0"
cranelift-wasm = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-entity = "0.30.0"
cranelift-wasm = "0.30.0"
wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
region = "2.0.0"
lazy_static = "1.2.0"
Expand Down
10 changes: 5 additions & 5 deletions wasmtime-wast/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = "0.29.0"
cranelift-native = "0.29.0"
cranelift-wasm = "0.29.0"
cranelift-entity = "0.29.0"
cranelift-codegen = "0.30.0"
cranelift-native = "0.30.0"
cranelift-wasm = "0.30.0"
cranelift-entity = "0.30.0"
wasmtime-jit = { path = "../wasmtime-jit" }
wasmtime-runtime = { path = "../wasmtime-runtime" }
wasmtime-environ = { path = "../wasmtime-environ" }
wabt = "0.7"
target-lexicon = "0.2.0"
target-lexicon = "0.3.0"
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }

Expand Down