feat(core/rust): Implement exception catching in Rust

chore(core): Add test for Rust exc catching

chore(core): Document exception catching in Rust

[no changelog]
pull/1821/head
Jan Pochyla 3 years ago committed by Martin Milata
parent dea5778d39
commit 7c65f0357a

@ -21,6 +21,7 @@
#include "memzero.h"
#include "py/objint.h"
#include "py/runtime.h"
static bool mpz_as_ll_checked(const mpz_t *i, long long *value) {
// Analogue of `mpz_as_int_checked` from mpz.c
@ -62,3 +63,14 @@ bool trezor_obj_get_ll_checked(mp_obj_t obj, long long *value) {
return false;
}
}
mp_obj_t trezor_obj_call_protected(void (*func)(void *), void *arg) {
nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) {
(*func)(arg);
nlr_pop();
return mp_const_none;
} else {
return MP_OBJ_FROM_PTR(nlr.ret_val);
}
}

@ -77,4 +77,6 @@ static inline uint8_t trezor_obj_get_uint8(mp_obj_t obj) {
bool trezor_obj_get_ll_checked(mp_obj_t obj, long long *value);
mp_obj_t trezor_obj_call_protected(void (*func)(void *), void *arg);
#endif

@ -95,6 +95,7 @@ fn generate_micropython_bindings() {
.allowlist_function("mp_map_lookup")
// runtime
.allowlist_function("mp_raise_ValueError")
.allowlist_function("trezor_obj_call_protected")
// typ
.allowlist_var("mp_type_type");

@ -1,6 +1,8 @@
use core::mem::MaybeUninit;
use cstr_core::CStr;
use super::ffi;
use super::{ffi, obj::Obj};
pub fn raise_value_error(msg: &'static CStr) -> ! {
unsafe {
@ -8,3 +10,78 @@ pub fn raise_value_error(msg: &'static CStr) -> ! {
}
panic!();
}
/// Execute `func` while catching MicroPython exceptions. Returns `Ok` in the
/// successful case, and `Err` with the caught `Obj` in case of a raise.
pub fn except<F, T>(mut func: F) -> Result<T, Obj>
where
F: FnMut() -> T,
{
// Because MicroPython exceptions use `setjmp` and `longjmp`-like mechanism that
// doesn't play too well with Rust, we setup the non-local return pads in C, and
// execute `func` through a callback.
unsafe {
// First, we craft a wrapping closure that calls `func`. Because we are generic
// over the return type, we cannot pass the returned value over the FFI
// boundary, so we assign it explicitly in `wrapper`.
let mut result = MaybeUninit::zeroed();
let mut wrapper = || {
result = MaybeUninit::new(func());
};
// `wrapper` is a closure, and to pass it over the FFI, we split it into a function
// pointer, and a user-data pointer. `ffi::trezor_obj_call_protected` then calls
// the `callback` with the `argument`.
let (callback, argument) = split_func_into_callback_and_argument(&mut wrapper);
let exception = ffi::trezor_obj_call_protected(Some(callback), argument);
if exception == Obj::const_none() {
Ok(result.assume_init())
} else {
Err(exception)
}
}
}
type ProtectedArgument = *mut cty::c_void;
type ProtectedCallback = unsafe extern "C" fn(ProtectedArgument);
fn split_func_into_callback_and_argument<F>(func: &mut F) -> (ProtectedCallback, ProtectedArgument)
where
F: FnMut(),
{
// Here we mono-morphize a version of `trampoline` for each type `F`, so it
// calls the correct `FnMut` impl, and cast `func` into its data part to use
// as the argument.
(trampoline::<F>, func as *mut _ as *mut _)
}
unsafe extern "C" fn trampoline<F>(arg: ProtectedArgument)
where
F: FnMut(),
{
// Synthesize a callable `*mut F` from the closure environment pointer `arg`,
// and call it.
let func = arg as *mut F;
unsafe {
(*func)();
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn except_returns_ok_on_no_exception() {
let result = except(|| 1);
assert!(result.is_ok());
assert_eq!(result.unwrap(), 1);
}
#[test]
fn except_catches_value_error() {
let msg = unsafe { CStr::from_bytes_with_nul_unchecked(b"msg\0") };
let result = except(|| raise_value_error(&msg));
assert!(result.is_err());
}
}

Loading…
Cancel
Save