language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Wasm: use parsed data from object file in the backend

Browse source
This commit is contained in:
Brian Carroll 2022-01-09 16:14:54 +00:00
parent 8a384ffa88
commit c8181c3a19
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/gen_wasm/src/backend.rs
View file

@ -40,7 +40,8 @@ pub struct WasmBackend<'a> {
module: WasmModule<'a>, module: WasmModule<'a>,
layout_ids: LayoutIds<'a>, layout_ids: LayoutIds<'a>,
next_constant_addr: u32, next_constant_addr: u32,
preloaded_fn_index_map: MutMap<&'a str, u32>, fn_index_offset: u32,
preloaded_functions_map: MutMap<&'a [u8], u32>,
proc_symbols: Vec<'a, (Symbol, u32)>, proc_symbols: Vec<'a, (Symbol, u32)>,
helper_proc_gen: CodeGenHelp<'a>, helper_proc_gen: CodeGenHelp<'a>,
@ -62,6 +63,8 @@ impl<'a> WasmBackend<'a> {
layout_ids: LayoutIds<'a>, layout_ids: LayoutIds<'a>,
proc_symbols: Vec<'a, (Symbol, u32)>, proc_symbols: Vec<'a, (Symbol, u32)>,
module: WasmModule<'a>, module: WasmModule<'a>,
fn_index_offset: u32,
preloaded_functions_map: MutMap<&'a [u8], u32>,
helper_proc_gen: CodeGenHelp<'a>, helper_proc_gen: CodeGenHelp<'a>,
) -> Self { ) -> Self {
WasmBackend { WasmBackend {
@ -73,7 +76,8 @@ impl<'a> WasmBackend<'a> {
layout_ids, layout_ids,
next_constant_addr: CONST_SEGMENT_BASE_ADDR, next_constant_addr: CONST_SEGMENT_BASE_ADDR,
preloaded_fn_index_map: MutMap::default(), fn_index_offset,
preloaded_functions_map,
proc_symbols, proc_symbols,
helper_proc_gen, helper_proc_gen,
@ -542,8 +546,7 @@ impl<'a> WasmBackend<'a> {
for (roc_proc_index, (ir_sym, linker_sym_index)) in for (roc_proc_index, (ir_sym, linker_sym_index)) in
self.proc_symbols.iter().enumerate() self.proc_symbols.iter().enumerate()
{ {
let wasm_fn_index = let wasm_fn_index = self.fn_index_offset + roc_proc_index as u32;
self.module.code.preloaded_count + roc_proc_index as u32;
if ir_sym == func_sym { if ir_sym == func_sym {
let num_wasm_args = param_types.len(); let num_wasm_args = param_types.len();
let has_return_val = ret_type.is_some(); let has_return_val = ret_type.is_some();
@ -1461,7 +1464,7 @@ impl<'a> WasmBackend<'a> {
) { ) {
let num_wasm_args = param_types.len(); let num_wasm_args = param_types.len();
let has_return_val = ret_type.is_some(); let has_return_val = ret_type.is_some();
let fn_index = self.preloaded_fn_index_map[name]; let fn_index = self.preloaded_functions_map[name.as_bytes()];
let linker_symbol_index = u32::MAX; let linker_symbol_index = u32::MAX;
self.code_builder self.code_builder

14
compiler/gen_wasm/src/lib.rs
View file

@ -92,8 +92,17 @@ pub fn build_module_help<'a>(
fn_index += 1; fn_index += 1;
} }
// Pre-load the WasmModule with data from the platform & builtins object file
let initial_module = WasmModule::preload(env.arena, preload_bytes); let initial_module = WasmModule::preload(env.arena, preload_bytes);
let main_function_index = maybe_main_fn_index.unwrap() + initial_module.code.preloaded_count;
// Adjust Wasm function indices to account for functions from the object file
let runtime_import_fn_count: u32 = initial_module.import.function_count(); // to be imported at runtime (e.g. WASI)
let fn_index_offset: u32 = runtime_import_fn_count + initial_module.code.preloaded_count;
// Get a map of name to index for the preloaded functions
// Assumes the preloaded object file has all symbols exported, as per `zig build-lib -dymamic`
let preloaded_functions_map: MutMap<&'a [u8], u32> =
initial_module.export.function_index_map(env.arena);
let mut backend = WasmBackend::new( let mut backend = WasmBackend::new(
env, env,
@ -101,6 +110,8 @@ pub fn build_module_help<'a>(
layout_ids, layout_ids,
proc_symbols, proc_symbols,
initial_module, initial_module,
fn_index_offset,
preloaded_functions_map,
CodeGenHelp::new(env.arena, IntWidth::I32, env.module_id), CodeGenHelp::new(env.arena, IntWidth::I32, env.module_id),
); );
@ -137,6 +148,7 @@ pub fn build_module_help<'a>(
let module = backend.into_module(); let module = backend.into_module();
let main_function_index = maybe_main_fn_index.unwrap() + fn_index_offset;
Ok((module, main_function_index)) Ok((module, main_function_index))
} }