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

Emit wasm data initializers as faerie data segments.

Browse Source 
This is a temporary measure while other parts of the system are being
developed, and will need to be replaced by a proper solution.
This commit is contained in:
Dan Gohman
2017-11-04 15:28:19 -07:00
parent 04660ae8cc
commit be9e3e88e4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/wasm2obj.rs
View File

@@ -97,6 +97,12 @@ fn handle_module(path: PathBuf, output: &str) -> Result<(), String> {
let mut obj = Artifact::new(faerie_target(&*isa)?, Some(String::from(output))); let mut obj = Artifact::new(faerie_target(&*isa)?, Some(String::from(output)));
// FIXME: We need to initialize memory in a way that supports alternate
// memory spaces, imported base addresses, and offsets.
for &(_mem_index, _base, _offset, data) in &environ.lazy.data_initializers {
obj.add_data("memory", Vec::from(data));
}
let translation = environ.finish_translation(); let translation = environ.finish_translation();
let (compilation, relocations) = translation.compile(&*isa)?; let (compilation, relocations) = translation.compile(&*isa)?;
@@ -110,14 +116,6 @@ fn handle_module(path: PathBuf, output: &str) -> Result<(), String> {
return Err(String::from("FIXME: implement tables")); return Err(String::from("FIXME: implement tables"));
} }
if !compilation.module.memories.is_empty() {
if compilation.module.memories.len() > 1 {
return Err(String::from("multiple memories not supported yet"));
}
//obj.add_data("memory", initializer);
return Err(String::from("FIXME: implement data initializers"));
}
// FIXME: Make the format a parameter. // FIXME: Make the format a parameter.
let file = ::std::fs::File::create(Path::new(output)).map_err(|x| { let file = ::std::fs::File::create(Path::new(output)).map_err(|x| {
format(format_args!("{}", x)) format(format_args!("{}", x))