dranke/curlywas
1
0
Fork 0
mirror of https://github.com/exoticorn/curlywas.git synced 2026-01-20 19:56:42 +01:00
Code Issues Projects Releases Wiki Activity

added support for function imports

Browse Source
This commit is contained in:
Dennis Ranke
2021-11-03 22:07:55 +01:00
parent 4f70a65866
commit 4793c4eb69
11 changed files with 101 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/emit.rs
View File

@@ -24,6 +24,7 @@ pub fn emit(script: &ast::Script) -> Vec<u8> {
}
let mut globals: HashMap<&str, u32> = HashMap::new();
let mut function_map = HashMap::new();
{
let mut imports = ImportSection::new();
@@ -56,6 +57,18 @@ pub fn emit(script: &ast::Script) -> Vec<u8> {
}
.into()
}
ast::ImportType::Function {
ref name,
ref params,
ref result,
} => {
function_map.insert(name.clone(), function_map.len() as u32);
EntityType::Function(
*function_types
.get(&(params.clone(), result.clone()))
.unwrap() as u32,
)
}
};
imports.import(module, name, type_);
}
@@ -68,16 +81,15 @@ pub fn emit(script: &ast::Script) -> Vec<u8> {
let mut exports = ExportSection::new();
let mut code = CodeSection::new();
let mut function_map = HashMap::new();
for func in script.functions.iter() {
function_map.insert(func.name.clone(), function_map.len() as u32);
}
for (index, func) in script.functions.iter().enumerate() {
for func in script.functions.iter() {
let type_ = *function_types.get(&function_type_key(func)).unwrap();
functions.function(type_ as u32);
if func.export {
exports.export(&func.name, Export::Function(index as u32));
exports.export(&func.name, Export::Function(*function_map.get(&func.name).unwrap() as u32));
}
code.function(&emit_function(func, &globals, &function_map));
@@ -96,11 +108,23 @@ type FunctionTypeKey = (Vec<ast::Type>, Option<ast::Type>);
fn collect_function_types(script: &ast::Script) -> HashMap<FunctionTypeKey, usize> {
let mut types: HashMap<FunctionTypeKey, usize> = HashMap::new();
for import in &script.imports {
if let ast::ImportType::Function {
ref params,
ref result,
..
} = import.type_
{
let index = types.len();
types
.entry((params.clone(), result.clone()))
.or_insert(index);
}
}
for func in &script.functions {
let index = types.len();
types
.entry(function_type_key(func))
.or_insert_with(|| index);
types.entry(function_type_key(func)).or_insert(index);
}
types