Skip to content

chore(compiler): Cleanup swap code in compcore #2390

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

Open
spotandjake wants to merge 1 commit into
base: oscar/gc-rebased
Choose a base branch
from
+12 −114
Open

chore(compiler): Cleanup swap code in compcore #2390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
126 changes: 12 additions & 114 deletions compiler/src/codegen/compcore.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,15 @@ let compile_bind =
};
};

let get_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
let swap_help = (~action, ~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
switch (typ) {
| Types.GrainValue
| Types.WasmValue(WasmRef) =>
if (idx >= Array.length(swap_slots_ptr)) {
raise(Not_found);
};
compile_bind(
~action=BindGet,
~action,
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_ptr_offset), typ),
Expand All @@ -357,7 +357,7 @@ let get_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
raise(Not_found);
};
compile_bind(
~action=BindGet,
~action,
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_i32_offset), typ),
Expand All @@ -367,7 +367,7 @@ let get_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
raise(Not_found);
};
compile_bind(
~action=BindGet,
~action,
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_i64_offset), typ),
Expand All @@ -377,7 +377,7 @@ let get_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
raise(Not_found);
};
compile_bind(
~action=BindGet,
~action,
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_f32_offset), typ),
Expand All @@ -387,123 +387,21 @@ let get_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
raise(Not_found);
};
compile_bind(
~action=BindGet,
~action,
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_f64_offset), typ),
);
};

let set_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx, value) => {
switch (typ) {
| Types.GrainValue
| Types.WasmValue(WasmRef) =>
if (idx >= Array.length(swap_slots_ptr)) {
raise(Not_found);
};
compile_bind(
~action=BindSet({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_ptr_offset), typ),
);
| Types.WasmValue(WasmI32) =>
if (idx >= Array.length(swap_slots_i32)) {
raise(Not_found);
};
compile_bind(
~action=BindSet({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_i32_offset), typ),
);
| Types.WasmValue(WasmI64) =>
if (idx >= Array.length(swap_slots_i64)) {
raise(Not_found);
};
compile_bind(
~action=BindSet({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_i64_offset), typ),
);
| Types.WasmValue(WasmF32) =>
if (idx >= Array.length(swap_slots_f32)) {
raise(Not_found);
};
compile_bind(
~action=BindSet({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_f32_offset), typ),
);
| Types.WasmValue(WasmF64) =>
if (idx >= Array.length(swap_slots_f64)) {
raise(Not_found);
};
compile_bind(
~action=BindSet({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_f64_offset), typ),
);
};
};
let get_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx) =>
swap_help(~action=BindGet, ~ty=typ, wasm_mod, env, idx);

let set_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx, value) =>
swap_help(~action=BindSet({value: value}), ~ty=typ, wasm_mod, env, idx);

let tee_swap = (~ty as typ=Types.GrainValue, wasm_mod, env, idx, value) =>
switch (typ) {
| Types.GrainValue
| Types.WasmValue(WasmRef) =>
if (idx >= Array.length(swap_slots_ptr)) {
raise(Not_found);
};
compile_bind(
~action=BindTee({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_ptr_offset), typ),
);
| Types.WasmValue(WasmI32) =>
if (idx >= Array.length(swap_slots_i32)) {
raise(Not_found);
};
compile_bind(
~action=BindTee({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_i32_offset), typ),
);
| Types.WasmValue(WasmI64) =>
if (idx >= Array.length(swap_slots_i64)) {
raise(Not_found);
};
compile_bind(
~action=BindTee({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_i64_offset), typ),
);
| Types.WasmValue(WasmF32) =>
if (idx >= Array.length(swap_slots_f32)) {
raise(Not_found);
};
compile_bind(
~action=BindTee({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_f32_offset), typ),
);
| Types.WasmValue(WasmF64) =>
if (idx >= Array.length(swap_slots_f64)) {
raise(Not_found);
};
compile_bind(
~action=BindTee({value: value}),
wasm_mod,
env,
MSwapBind(Int32.of_int(idx + swap_f64_offset), typ),
);
};
swap_help(~action=BindTee({value: value}), ~ty=typ, wasm_mod, env, idx);

let rec compile_imm = (wasm_mod, env: codegen_env, i: immediate): Expression.t =>
switch (i.immediate_desc) {
Expand Down
Loading