arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

feat(core/rust): add const Obj::small_int

Browse Source
This commit is contained in:
matejcik 2024-01-24 11:23:27 +01:00 committed by Jiří Musil
parent ff26113083
commit 3e14937c8a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/embed/rust/src/micropython/obj.rs
View File

@ -97,11 +97,24 @@ impl Obj {
// SAFETY:
// - `val` is in `0..=3` range.
// - MicroPython compiled with `MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A`.
// - MicroPython compiled with `MICROPY_OBJ_IMMEDIATE_OBJS`.
// micropython/py/obj.h #define MP_OBJ_NEW_IMMEDIATE_OBJ(val)
// ((mp_obj_t)(((val) << 3) | 6))
// - MicroPython compiled with `MICROPY_OBJ_IMMEDIATE_OBJS.
// micropython/py/obj.h
// #define MP_OBJ_NEW_IMMEDIATE_OBJ(val) ((mp_obj_t)(((val) << 3) | 6))
unsafe { Self::from_bits((val << 3) | 6) }
}
pub const fn small_int(val: u16) -> Self {
// SAFETY:
// - MicroPython compiled with `MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A`.
// - val fits in 31 bits
// (TODO if we ever add static asserts, we can extend this function to u32)
// micropython/py/obj.h
// #define MP_OBJ_NEW_SMALL_INT(small_int) \
// ((mp_obj_t)((((mp_uint_t)(small_int)) << 1) | 1))
unsafe { Self::from_bits(((val << 1) | 1) as usize) }
}
}
impl Obj {
@ -327,14 +340,14 @@ impl TryFrom<(Obj, Obj, Obj)> for Obj {
impl From<u8> for Obj {
fn from(val: u8) -> Self {
// `u8` will fit into smallint so no error should happen here.
unwrap!(u32::from(val).try_into())
Obj::small_int(val as u16)
}
}
impl From<u16> for Obj {
fn from(val: u16) -> Self {
// `u16` will fit into smallint so no error should happen here.
unwrap!(u32::from(val).try_into())
Obj::small_int(val)
}
}