Skip to content

Remove build-std cargo option and switch to core::intrinsics::abort() in panic_handler #135

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

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

Remove build-std cargo option and switch to core::intrinsics::abort() in panic_handler #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f91f02d
chore: update `cargo-component` to v0.7.0, use `wee_alloc` in Wasm
greenhat Feb 15, 2024
46ea9e3
chore: add Wasm component translation support to the integration tests;
greenhat Feb 15, 2024
306d3a8
fix: fix build after rebase
greenhat Feb 15, 2024
5b9f39e
test: remove invocation method in component import textual representa…
greenhat Feb 29, 2024
2d39974
feature: in IR textual representation put module body in a curly braces
greenhat Feb 29, 2024
eb1ad1d
draft basic wallet translation
greenhat Feb 20, 2024
975eb94
feat: introduce module instantiation arguments,
greenhat Feb 26, 2024
19f3213
feat: `Component::modules` are topologically sorted
greenhat Feb 26, 2024
99cc093
fix: find the correct core module function for the IR component import
greenhat Feb 26, 2024
365bda4
refactor: introduce `ComponentTranslator`
greenhat Feb 28, 2024
1f281fc
refactor: ensure Wasm module name fallback is set as early as possible
greenhat Feb 29, 2024
d4519c2
test: add expected imports/exports check in basic wallet test
greenhat Feb 29, 2024
042a30d
chore: clean up todos, add comments
greenhat Feb 29, 2024
de462df
update basic wallet test expected IR after the rebase (indentation);
greenhat Feb 29, 2024
5c2cc0d
fix: after rebase, add Wasm CM `record` type conversion,
greenhat Feb 29, 2024
a77c8c8
remove invocation method from component imports/exports
greenhat Feb 29, 2024
860ec1c
remove build-std option and switch to `core::intrinsics::abort()`
greenhat Feb 29, 2024
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
3 changes: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ smallstr = { version = "0.3", features = ["union"] }
thiserror = "1.0"
toml = { version = "0.5", features = ["preserve_order"] }
derive_more = "0.99"
indexmap = "2.1"
# 211152c631d16a943aae503466b198b93c61150f is latest (as of Jan 25th) commit in the next branch
miden-assembly = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "211152c631d16a943aae503466b198b93c61150f"}
miden-core = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "211152c631d16a943aae503466b198b93c61150f" }
Expand Down
2 changes: 1 addition & 1 deletion frontend-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ log.workspace = true
anyhow.workspace = true
wasmparser = "0.118.1"
derive_more.workspace = true
indexmap = "2.1"
indexmap.workspace = true
gimli = { version = "0.28.0", default-features = false, features = ['read', 'std'] }
rustc-hash.workspace = true

Expand Down
18 changes: 12 additions & 6 deletions frontend-wasm/src/code_translator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use std::collections::hash_map;
use std::u64;

use crate::error::{WasmError, WasmResult};
use crate::module::func_env::FuncEnvironment;
use crate::module::func_translation_state::{ControlStackFrame, ElseData, FuncTranslationState};
use crate::module::function_builder_ext::FunctionBuilderExt;
use crate::module::types::{ir_type, BlockType, FuncIndex, GlobalIndex, ModuleTypes};
Expand Down Expand Up @@ -44,6 +45,7 @@ pub fn translate_operator(
state: &mut FuncTranslationState,
module: &Module,
mod_types: &ModuleTypes,
func_env: &FuncEnvironment,
diagnostics: &DiagnosticsHandler,
span: SourceSpan,
) -> WasmResult<()> {
Expand Down Expand Up @@ -121,12 +123,18 @@ pub fn translate_operator(
state,
builder,
FuncIndex::from_u32(*function_index),
module,
mod_types,
func_env,
span,
diagnostics,
)?;
}
Operator::CallIndirect {
type_index: _,
table_index: _,
table_byte: _,
} => {
// TODO: implement call_indirect
}
/******************************* Memory management *********************************/
Operator::MemoryGrow { .. } => {
let arg = state.pop1_casted(U32, builder, span);
Expand Down Expand Up @@ -633,16 +641,14 @@ fn translate_call(
state: &mut FuncTranslationState,
builder: &mut FunctionBuilderExt,
function_index: FuncIndex,
module: &Module,
mod_types: &ModuleTypes,
func_env: &FuncEnvironment,
span: SourceSpan,
diagnostics: &DiagnosticsHandler,
) -> WasmResult<()> {
let (fident, num_args) = state.get_direct_func(
builder.data_flow_graph_mut(),
function_index,
module,
mod_types,
func_env,
diagnostics,
)?;
let args = state.peekn_mut(num_args);
Expand Down
216 changes: 112 additions & 104 deletions frontend-wasm/src/code_translator/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,16 @@ fn module() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn main() {
block0:
v0 = const.i32 0 : i32;
br block1;
pub fn main() {
block0:
v0 = const.i32 0 : i32;
br block1;

block1:
ret;
block1:
ret;
}
}
"#]],
);
Expand All @@ -86,16 +87,17 @@ fn locals() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn main() {
block0:
v0 = const.i32 0 : i32;
v1 = const.i32 1 : i32;
br block1;
pub fn main() {
block0:
v0 = const.i32 0 : i32;
v1 = const.i32 1 : i32;
br block1;

block1:
ret;
block1:
ret;
}
}
"#]],
);
Expand Down Expand Up @@ -124,26 +126,27 @@ fn locals_inter_block() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn main() -> i32 {
block0:
v1 = const.i32 0 : i32;
v2 = const.i32 3 : i32;
br block2;
pub fn main() -> i32 {
block0:
v1 = const.i32 0 : i32;
v2 = const.i32 3 : i32;
br block2;

block1(v0: i32):
ret v0;
block1(v0: i32):
ret v0;

block2:
v3 = const.i32 5 : i32;
v4 = add.wrapping v2, v3 : i32;
br block3;
block2:
v3 = const.i32 5 : i32;
v4 = add.wrapping v2, v3 : i32;
br block3;

block3:
v5 = const.i32 7 : i32;
v6 = add.wrapping v5, v4 : i32;
br block1(v6);
block3:
v5 = const.i32 7 : i32;
v6 = add.wrapping v5, v4 : i32;
br block1(v6);
}
}
"#]],
);
Expand All @@ -167,26 +170,27 @@ fn func_call() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn add(i32, i32) -> i32 {
block0(v0: i32, v1: i32):
v3 = add.wrapping v0, v1 : i32;
br block1(v3);
pub fn add(i32, i32) -> i32 {
block0(v0: i32, v1: i32):
v3 = add.wrapping v0, v1 : i32;
br block1(v3);

block1(v2: i32):
ret v2;
}
block1(v2: i32):
ret v2;
}

pub fn main() -> i32 {
block0:
v1 = const.i32 3 : i32;
v2 = const.i32 5 : i32;
v3 = call noname::add(v1, v2) : i32;
br block1(v3);
pub fn main() -> i32 {
block0:
v1 = const.i32 3 : i32;
v2 = const.i32 5 : i32;
v3 = call noname::add(v1, v2) : i32;
br block1(v3);

block1(v0: i32):
ret v0;
block1(v0: i32):
ret v0;
}
}
"#]],
);
Expand All @@ -208,19 +212,20 @@ fn br() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn main() -> i32 {
block0:
v1 = const.i32 0 : i32;
v2 = const.i32 3 : i32;
br block2;
pub fn main() -> i32 {
block0:
v1 = const.i32 0 : i32;
v2 = const.i32 3 : i32;
br block2;

block1(v0: i32):
ret v0;
block1(v0: i32):
ret v0;

block2:
br block1(v2);
block2:
br block1(v2);
}
}
"#]],
);
Expand Down Expand Up @@ -251,29 +256,30 @@ fn loop_br_if() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn main() -> i32 {
block0:
v1 = const.i32 0 : i32;
v2 = const.i32 2 : i32;
br block2(v2, v1);
pub fn main() -> i32 {
block0:
v1 = const.i32 0 : i32;
v2 = const.i32 2 : i32;
br block2(v2, v1);

block1(v0: i32):
ret v0;
block1(v0: i32):
ret v0;

block2(v3: i32, v4: i32):
v5 = add.wrapping v3, v4 : i32;
v6 = const.i32 1 : i32;
v7 = sub.wrapping v3, v6 : i32;
v8 = neq v7, 0 : i1;
condbr v8, block2(v7, v5), block4;
block2(v3: i32, v4: i32):
v5 = add.wrapping v3, v4 : i32;
v6 = const.i32 1 : i32;
v7 = sub.wrapping v3, v6 : i32;
v8 = neq v7, 0 : i1;
condbr v8, block2(v7, v5), block4;

block3:
br block1(v5);
block3:
br block1(v5);

block4:
br block3;
block4:
br block3;
}
}
"#]],
);
Expand All @@ -295,27 +301,28 @@ fn if_then_else() {
)
"#,
expect![[r#"
module noname
module noname {

pub fn main() -> i32 {
block0:
v1 = const.i32 2 : i32;
v2 = neq v1, 0 : i1;
condbr v2, block2, block4;
pub fn main() -> i32 {
block0:
v1 = const.i32 2 : i32;
v2 = neq v1, 0 : i1;
condbr v2, block2, block4;

block1(v0: i32):
ret v0;
block1(v0: i32):
ret v0;

block2:
v4 = const.i32 3 : i32;
br block3(v4);
block2:
v4 = const.i32 3 : i32;
br block3(v4);

block3(v3: i32):
br block1(v3);
block3(v3: i32):
br block1(v3);

block4:
v5 = const.i32 5 : i32;
br block3(v5);
block4:
v5 = const.i32 5 : i32;
br block3(v5);
}
}
"#]],
);
Expand All @@ -336,23 +343,24 @@ fn global_var() {
)
"#,
expect![[r#"
module noname
module noname {

const $0 = 0x0000002a;
const $0 = 0x0000002a;

global external @MyGlobalVal : i32 = $0 { id = 0 };
global external @MyGlobalVal : i32 = $0 { id = 0 };

pub fn main() {
block0:
v0 = global.load (@MyGlobalVal) as *mut i8 : i32;
v1 = const.i32 9 : i32;
v2 = add.wrapping v0, v1 : i32;
v3 = global.symbol @MyGlobalVal : *mut i32;
store v3, v2;
br block1;
pub fn main() {
block0:
v0 = global.load (@MyGlobalVal) as *mut i8 : i32;
v1 = const.i32 9 : i32;
v2 = add.wrapping v0, v1 : i32;
v3 = global.symbol @MyGlobalVal : *mut i32;
store v3, v2;
br block1;

block1:
ret;
block1:
ret;
}
}
"#]],
);
Expand Down
Loading