arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-28 16:21:03 +00:00
Code Issues Releases Wiki Activity

chore(vendor): bump micropython to 1.15

Browse Source 
Relevant micropython commits:
  ad4656b861f94277bed9647ca176e662ce5119e3 all: Rename BYTES_PER_WORD to MP_BYTES_PER_OBJ_WORD.
  9fef1c0bde2f9642d383bd56aa112447384a84ba py: Rename remaining object types to be of the form mp_type_xxx.
  5fdf351178df9a18df624ae0f5947d8a5a6bce40 py/gc: Don't include mpconfig.h and misc.h in gc.h.
This commit is contained in:
Martin Milata 2021-09-09 16:35:02 +02:00 committed by matejcik
parent d69b23e3c5
commit b062b95348
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/extmod/modtrezorutils/modtrezorutils-meminfo.h
View File

@ -38,7 +38,7 @@
#include <string.h> #include <string.h>
#define WORDS_PER_BLOCK ((MICROPY_BYTES_PER_GC_BLOCK) / BYTES_PER_WORD) #define WORDS_PER_BLOCK ((MICROPY_BYTES_PER_GC_BLOCK) / MP_BYTES_PER_OBJ_WORD)
#define BYTES_PER_BLOCK (MICROPY_BYTES_PER_GC_BLOCK) #define BYTES_PER_BLOCK (MICROPY_BYTES_PER_GC_BLOCK)
// ATB = allocation table byte // ATB = allocation table byte
@ -279,7 +279,7 @@ typedef struct _mp_obj_closure_t {
} mp_obj_closure_t; } mp_obj_closure_t;
extern const mp_obj_type_t mp_type_bound_meth; extern const mp_obj_type_t mp_type_bound_meth;
extern const mp_obj_type_t closure_type; extern const mp_obj_type_t mp_type_closure;
extern const mp_obj_type_t mp_type_cell; extern const mp_obj_type_t mp_type_cell;
extern const mp_obj_type_t mod_trezorio_WebUSB_type; extern const mp_obj_type_t mod_trezorio_WebUSB_type;
extern const mp_obj_type_t mod_trezorio_USB_type; extern const mp_obj_type_t mod_trezorio_USB_type;
@ -576,7 +576,7 @@ void dump_value_opt(FILE *out, mp_const_obj_t value, bool eval_short) {
dump_bound_method(out, value); dump_bound_method(out, value);
} }
else if (mp_obj_is_type(value, &closure_type)) { else if (mp_obj_is_type(value, &mp_type_closure)) {
dump_closure(out, value); dump_closure(out, value);
} }

4
core/embed/unix/main.c
View File

@ -380,7 +380,7 @@ STATIC void pre_process_options(int argc, char **argv) {
goto invalid_arg; goto invalid_arg;
} }
if (word_adjust) { if (word_adjust) {
heap_size = heap_size * BYTES_PER_WORD / 4; heap_size = heap_size * MP_BYTES_PER_OBJ_WORD / 4;
} }
// If requested size too small, we'll crash anyway // If requested size too small, we'll crash anyway
if (heap_size < 700) { if (heap_size < 700) {
@ -492,7 +492,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
mp_stack_set_limit(600000 * (BYTES_PER_WORD / 4)); mp_stack_set_limit(600000 * (sizeof(void *) / 4));
pre_process_options(argc, argv); pre_process_options(argc, argv);