diff --git a/extmod/modtrezorutils/modtrezorutils.c b/extmod/modtrezorutils/modtrezorutils.c new file mode 100644 index 000000000..017cdca56 --- /dev/null +++ b/extmod/modtrezorutils/modtrezorutils.c @@ -0,0 +1,74 @@ +/* + * Copyright (c) Pavol Rusnak, SatoshiLabs + * + * Licensed under Microsoft Reference Source License (Ms-RSL) + * see LICENSE.md file for details + */ + +#include +#include +#include + +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/binary.h" +#include "py/objstr.h" + +#if MICROPY_PY_TREZORUTILS + +// class Utils(object): +typedef struct _mp_obj_Utils_t { + mp_obj_base_t base; +} mp_obj_Utils_t; + +// def Utils.__init__(self) +STATIC mp_obj_t mod_TrezorUtils_Utils_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { + mp_arg_check_num(n_args, n_kw, 0, 0, false); + mp_obj_Utils_t *o = m_new_obj(mp_obj_Utils_t); + o->base.type = type; + return MP_OBJ_FROM_PTR(o); +} + +// def Utils.memaccess(self, address: int, length: int) -> bytes +STATIC mp_obj_t mod_TrezorUtils_Utils_memaccess(mp_obj_t self, mp_obj_t address, mp_obj_t length) { + uint32_t addr = mp_obj_get_int(address); + uint32_t len = mp_obj_get_int(length); + mp_obj_str_t *o = m_new_obj(mp_obj_str_t); + o->base.type = &mp_type_bytes; + o->len = len; + o->hash = 0; + o->data = (byte *)(uintptr_t)addr; + return MP_OBJ_FROM_PTR(o); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorUtils_Utils_memaccess_obj, mod_TrezorUtils_Utils_memaccess); + +// Utils stuff + +STATIC const mp_rom_map_elem_t mod_TrezorUtils_Utils_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_memaccess), MP_ROM_PTR(&mod_TrezorUtils_Utils_memaccess_obj) }, +}; +STATIC MP_DEFINE_CONST_DICT(mod_TrezorUtils_Utils_locals_dict, mod_TrezorUtils_Utils_locals_dict_table); + +STATIC const mp_obj_type_t mod_TrezorUtils_Utils_type = { + { &mp_type_type }, + .name = MP_QSTR_Utils, + .make_new = mod_TrezorUtils_Utils_make_new, + .locals_dict = (void*)&mod_TrezorUtils_Utils_locals_dict, +}; + +// module stuff + +STATIC const mp_rom_map_elem_t mp_module_TrezorUtils_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_TrezorUtils) }, + { MP_ROM_QSTR(MP_QSTR_Utils), MP_ROM_PTR(&mod_TrezorUtils_Utils_type) }, +}; + +STATIC MP_DEFINE_CONST_DICT(mp_module_TrezorUtils_globals, mp_module_TrezorUtils_globals_table); + +const mp_obj_module_t mp_module_TrezorUtils = { + .base = { &mp_type_module }, + .name = MP_QSTR_TrezorUtils, + .globals = (mp_obj_dict_t*)&mp_module_TrezorUtils_globals, +}; + +#endif // MICROPY_PY_TREZORPROTOBUF diff --git a/src/trezor/utils.py b/src/trezor/utils.py index 115087a6c..24409153c 100644 --- a/src/trezor/utils.py +++ b/src/trezor/utils.py @@ -1,5 +1,11 @@ import sys import gc +from TrezorUtils import Utils + +_utils = Utils() + +def memaccess(address, length): + return _utils.memaccess(address, length) def unimport(func): def inner(*args, **kwargs): diff --git a/vendor/micropython b/vendor/micropython index 130c6ff92..b2f874742 160000 --- a/vendor/micropython +++ b/vendor/micropython @@ -1 +1 @@ -Subproject commit 130c6ff92931b7895616a5c4a230ddbe625d0b94 +Subproject commit b2f874742c4b7f5937c1edaf6c2a9bb18b69ed2d