language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-24 06:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm: Fix struct calling convention for Zig lowlevels

Browse source
This commit is contained in:
Brian Carroll 2022-09-09 18:56:08 +01:00 • committed by Brendan Hansknecht
parent 4c4344b46c
commit b3bb477ccb
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/compiler/gen_wasm/src/lib.rs
View file

@ -249,7 +249,7 @@ pub const DEBUG_SETTINGS: WasmDebugSettings = WasmDebugSettings {
let_stmt_ir: false && cfg!(debug_assertions),
instructions: false && cfg!(debug_assertions),
storage_map: false && cfg!(debug_assertions),
keep_test_binary: false && cfg!(debug_assertions), // see also ROC_WRITE_FINAL_WASM
keep_test_binary: true && cfg!(debug_assertions),
};
#[cfg(test)]

42
crates/compiler/gen_wasm/src/low_level.rs
View file

@ -241,7 +241,7 @@ impl<'a> LowLevelCall<'a> {
Roc AST wrapper converts this to a tag union, with app-dependent tag IDs.
output: *FromUtf8Result i32
arg: RocList i64, i32
arg: RocList i32
start i32
count i32
update_mode: UpdateMode i32
@ -256,7 +256,7 @@ impl<'a> LowLevelCall<'a> {
&WasmLayout::new(backend.layout_interner, self.ret_layout),
);
backend.code_builder.i32_const(UPDATE_MODE_IMMUTABLE);
backend.call_host_fn_after_loading_args(bitcode::STR_FROM_UTF8_RANGE, 6, false);
backend.call_host_fn_after_loading_args(bitcode::STR_FROM_UTF8_RANGE, 5, false);
}
StrTrimStart => self.load_args_and_call_zig(backend, bitcode::STR_TRIM_START),
StrTrimEnd => self.load_args_and_call_zig(backend, bitcode::STR_TRIM_END),
@ -401,7 +401,7 @@ impl<'a> LowLevelCall<'a> {
// Load all the arguments for Zig
// (List return pointer) i32
// list: RocList, i64, i32
// list: RocList, i32
// alignment: u32, i32
// index: usize, i32
// element: Opaque, i32
@ -435,7 +435,7 @@ impl<'a> LowLevelCall<'a> {
}
// There is an in-place version of this but we don't use it for dev backends. No morphic_lib analysis.
backend.call_host_fn_after_loading_args(bitcode::LIST_REPLACE, 8, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_REPLACE, 7, false);
}
ListWithCapacity => {
// List.withCapacity : Nat -> List elem
@ -464,8 +464,8 @@ impl<'a> LowLevelCall<'a> {
// List.concat : List elem, List elem -> List elem
// Zig arguments Wasm types
// (return pointer) i32
// list_a: RocList i64, i32
// list_b: RocList i64, i32
// list_a: RocList i32
// list_b: RocList i32
// alignment: u32 i32
// element_width: usize i32
@ -486,7 +486,7 @@ impl<'a> LowLevelCall<'a> {
backend.code_builder.i32_const(elem_align as i32);
backend.code_builder.i32_const(elem_width as i32);
backend.call_host_fn_after_loading_args(bitcode::LIST_CONCAT, 7, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_CONCAT, 5, false);
}
ListReserve => {
@ -502,7 +502,7 @@ impl<'a> LowLevelCall<'a> {
// Zig arguments Wasm types
// (return pointer) i32
// list: RocList i64, i32
// list: RocList i32
// alignment: u32 i32
// spare: usize i32
// element_width: usize i32
@ -527,7 +527,7 @@ impl<'a> LowLevelCall<'a> {
backend.code_builder.i32_const(UPDATE_MODE_IMMUTABLE);
backend.call_host_fn_after_loading_args(bitcode::LIST_RESERVE, 7, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_RESERVE, 6, false);
}
ListReleaseExcessCapacity => {
@ -582,7 +582,7 @@ impl<'a> LowLevelCall<'a> {
// Zig arguments Wasm types
// (return pointer) i32
// list: RocList i64, i32
// list: RocList i32
// element: Opaque i32
// element_width: usize i32
@ -603,7 +603,7 @@ impl<'a> LowLevelCall<'a> {
backend.code_builder.i32_const(elem_width as i32);
backend.call_host_fn_after_loading_args(bitcode::LIST_APPEND_UNSAFE, 4, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_APPEND_UNSAFE, 3, false);
}
ListPrepend => {
// List.prepend : List elem, elem -> List elem
@ -620,7 +620,7 @@ impl<'a> LowLevelCall<'a> {
// Zig arguments Wasm types
// (return pointer) i32
// list: RocList i64, i32
// list: RocList i32
// alignment: u32 i32
// element: Opaque i32
// element_width: usize i32
@ -643,7 +643,7 @@ impl<'a> LowLevelCall<'a> {
}
backend.code_builder.i32_const(elem_width as i32);
backend.call_host_fn_after_loading_args(bitcode::LIST_PREPEND, 6, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_PREPEND, 5, false);
}
ListSublist => {
// As a low-level, record is destructured
@ -671,7 +671,7 @@ impl<'a> LowLevelCall<'a> {
// Zig arguments Wasm types
// (return pointer) i32
// list: RocList, i64, i32
// list: RocList, i32
// alignment: u32, i32
// element_width: usize, i32
// start: usize, i32
@ -693,7 +693,7 @@ impl<'a> LowLevelCall<'a> {
.load_symbols(&mut backend.code_builder, &[start, len]);
backend.code_builder.i32_const(dec_fn_ptr);
backend.call_host_fn_after_loading_args(bitcode::LIST_SUBLIST, 8, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_SUBLIST, 7, false);
}
ListDropAt => {
// List.dropAt : List elem, Nat -> List elem
@ -718,7 +718,7 @@ impl<'a> LowLevelCall<'a> {
// Zig arguments Wasm types
// (return pointer) i32
// list: RocList, i64, i32
// list: RocList, i32
// element_width: usize, i32
// alignment: u32, i32
// drop_index: usize, i32
@ -740,7 +740,7 @@ impl<'a> LowLevelCall<'a> {
.load_symbols(&mut backend.code_builder, &[drop_index]);
backend.code_builder.i32_const(dec_fn_ptr);
backend.call_host_fn_after_loading_args(bitcode::LIST_DROP_AT, 6, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_DROP_AT, 5, false);
}
ListSwap => {
// List.swap : List elem, Nat, Nat -> List elem
@ -755,7 +755,7 @@ impl<'a> LowLevelCall<'a> {
// Zig arguments Wasm types
// (return pointer) i32
// list: RocList, i64, i32
// list: RocList, i32
// alignment: u32, i32
// element_width: usize, i32
// index_1: usize, i32
@ -778,7 +778,7 @@ impl<'a> LowLevelCall<'a> {
.load_symbols(&mut backend.code_builder, &[index_1, index_2]);
backend.code_builder.i32_const(UPDATE_MODE_IMMUTABLE);
backend.call_host_fn_after_loading_args(bitcode::LIST_SWAP, 8, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_SWAP, 7, false);
}
// Num
@ -2689,7 +2689,7 @@ pub fn call_higher_order_lowlevel<'a>(
let cb = &mut backend.code_builder;
// (return pointer) i32
// input: RocList, i64, i32
// input: RocList, i32
// caller: CompareFn, i32
// data: Opaque, i32
// inc_n_data: IncN, i32
@ -2714,7 +2714,7 @@ pub fn call_higher_order_lowlevel<'a>(
cb.i32_const(alignment as i32);
cb.i32_const(element_width as i32);
backend.call_host_fn_after_loading_args(bitcode::LIST_SORT_WITH, 9, false);
backend.call_host_fn_after_loading_args(bitcode::LIST_SORT_WITH, 8, false);
}
}
}