From 9bc3af08b2596d2e1b06cc2b5d6bc880bb1fcef9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 27 May 2019 14:27:12 +0200 Subject: [PATCH] core: update mpconfigport.h from upstream (for both stm32 and unix) --- core/embed/firmware/mpconfigport.h | 28 ++- core/embed/unix/mpconfigport.h | 294 ++++++++++++++--------------- 2 files changed, 166 insertions(+), 156 deletions(-) diff --git a/core/embed/firmware/mpconfigport.h b/core/embed/firmware/mpconfigport.h index d9ea16487..1275e6d34 100644 --- a/core/embed/firmware/mpconfigport.h +++ b/core/embed/firmware/mpconfigport.h @@ -57,6 +57,7 @@ #define MICROPY_OPT_COMPUTED_GOTO (1) #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0) #define MICROPY_OPT_MPZ_BITWISE (1) +#define MICROPY_OPT_MATH_FACTORIAL (0) // Python internal features #define MICROPY_READER_VFS (0) @@ -85,6 +86,8 @@ // control over Python builtins #define MICROPY_PY_FUNCTION_ATTRS (1) +#define MICROPY_PY_DESCRIPTORS (0) +#define MICROPY_PY_DELATTR_SETATTR (0) #define MICROPY_PY_BUILTINS_STR_UNICODE (1) #define MICROPY_PY_BUILTINS_STR_CENTER (1) #define MICROPY_PY_BUILTINS_STR_PARTITION (0) @@ -92,9 +95,11 @@ #define MICROPY_PY_BUILTINS_MEMORYVIEW (1) #define MICROPY_PY_BUILTINS_FROZENSET (0) #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1) +#define MICROPY_PY_BUILTINS_ROUND_INT (0) #define MICROPY_PY_ALL_SPECIAL_METHODS (0) -#define MICROPY_PY_BUILTINS_COMPILE (0) -#define MICROPY_PY_BUILTINS_EXECFILE (0) +#define MICROPY_PY_BUILTINS_COMPILE (MICROPY_ENABLE_COMPILER) +#define MICROPY_PY_BUILTINS_EXECFILE (MICROPY_ENABLE_COMPILER) +#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1) #define MICROPY_PY_BUILTINS_INPUT (0) #define MICROPY_PY_BUILTINS_POW3 (0) #define MICROPY_PY_BUILTINS_HELP (0) @@ -102,29 +107,37 @@ #define MICROPY_PY_BUILTINS_HELP_MODULES (0) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1) -#define MICROPY_PY_COLLECTIONS (0) +#define MICROPY_PY_COLLECTIONS (0) +#define MICROPY_PY_COLLECTIONS_DEQUE (0) #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0) #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0) +#define MICROPY_PY_MATH_ISCLOSE (0) +#define MICROPY_PY_MATH_FACTORIAL (0) #define MICROPY_PY_CMATH (0) #define MICROPY_PY_IO (0) -#define MICROPY_PY_IO_FILEIO (0) +#define MICROPY_PY_IO_IOBASE (0) +#define MICROPY_PY_IO_FILEIO (MICROPY_VFS_FAT) // because mp_type_fileio/textio point to fatfs impl #define MICROPY_PY_SYS_MAXSIZE (0) #define MICROPY_PY_SYS_EXIT (0) #define MICROPY_PY_SYS_STDFILES (0) #define MICROPY_PY_SYS_STDIO_BUFFER (0) +#define MICROPY_PY_SYS_PLATFORM "trezor" #define MICROPY_PY_UERRNO (0) #ifndef MICROPY_PY_THREAD #define MICROPY_PY_THREAD (0) #endif -#define MICROPY_PY_THREAD_GIL (0) // extended modules #define MICROPY_PY_UCTYPES (1) #define MICROPY_PY_UZLIB (0) #define MICROPY_PY_UJSON (0) #define MICROPY_PY_URE (0) +#define MICROPY_PY_URE_SUB (0) #define MICROPY_PY_UHEAPQ (0) #define MICROPY_PY_UHASHLIB (0) +#define MICROPY_PY_UHASHLIB_MD5 (0) +#define MICROPY_PY_UHASHLIB_SHA1 (0) +#define MICROPY_PY_UCRYPTOLIB (0) #define MICROPY_PY_UBINASCII (1) #define MICROPY_PY_UBINASCII_CRC32 (0) #define MICROPY_PY_URANDOM (0) @@ -132,7 +145,11 @@ #define MICROPY_PY_USELECT (0) #define MICROPY_PY_UTIMEQ (1) #define MICROPY_PY_UTIME_MP_HAL (1) +#define MICROPY_PY_OS_DUPTERM (0) +#define MICROPY_PY_LWIP_SOCK_RAW (0) #define MICROPY_PY_MACHINE (0) +#define MICROPY_PY_UWEBSOCKET (0) +#define MICROPY_PY_WEBREPL (0) #define MICROPY_PY_FRAMEBUF (0) #define MICROPY_PY_USOCKET (0) #define MICROPY_PY_NETWORK (0) @@ -192,7 +209,6 @@ typedef long mp_off_t; #define MICROPY_HW_BOARD_NAME "TREZORv2" #define MICROPY_HW_MCU_NAME "STM32F427xx" -#define MICROPY_PY_SYS_PLATFORM "trezor" #define MICROPY_HW_HAS_SDCARD 1 // There is no classical C heap in bare-metal ports, only Python diff --git a/core/embed/unix/mpconfigport.h b/core/embed/unix/mpconfigport.h index 94179a6f0..e7ea5b033 100644 --- a/core/embed/unix/mpconfigport.h +++ b/core/embed/unix/mpconfigport.h @@ -35,53 +35,54 @@ #define MPZ_DIG_SIZE (16) -#define MICROPY_ALLOC_PATH_MAX (PATH_MAX) +#define MICROPY_ALLOC_PATH_MAX (PATH_MAX) #define MICROPY_PERSISTENT_CODE_LOAD (1) #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__) -#define MICROPY_EMIT_X64 (0) + #define MICROPY_EMIT_X64 (0) #endif #if !defined(MICROPY_EMIT_X86) && defined(__i386__) -#define MICROPY_EMIT_X86 (0) + #define MICROPY_EMIT_X86 (0) #endif #if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__) -#define MICROPY_EMIT_THUMB (0) -#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1)) + #define MICROPY_EMIT_THUMB (0) + #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1)) #endif // Some compilers define __thumb2__ and __arm__ at the same time, let // autodetected thumb2 emitter have priority. #if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__) -#define MICROPY_EMIT_ARM (0) + #define MICROPY_EMIT_ARM (0) #endif -#define MICROPY_COMP_MODULE_CONST (1) +#define MICROPY_COMP_MODULE_CONST (1) #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1) #define MICROPY_COMP_RETURN_IF_EXPR (1) -#define MICROPY_ENABLE_GC (1) -#define MICROPY_ENABLE_FINALISER (1) -#define MICROPY_STACK_CHECK (1) +#define MICROPY_ENABLE_GC (1) +#define MICROPY_ENABLE_FINALISER (1) +#define MICROPY_STACK_CHECK (1) #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1) -#define MICROPY_MEM_STATS (1) -#define MICROPY_DEBUG_PRINTERS (1) +#define MICROPY_MEM_STATS (1) +#define MICROPY_DEBUG_PRINTERS (1) // Printing debug to stderr may give tests which // check stdout a chance to pass, etc. -#define MICROPY_DEBUG_PRINTER_DEST mp_stderr_print -#define MICROPY_READER_POSIX (1) +#define MICROPY_DEBUG_PRINTER (&mp_stderr_print) +#define MICROPY_READER_POSIX (1) #define MICROPY_USE_READLINE_HISTORY (1) -#define MICROPY_HELPER_REPL (1) -#define MICROPY_REPL_EMACS_KEYS (1) -#define MICROPY_REPL_AUTO_INDENT (1) -#define MICROPY_HELPER_LEXER_UNIX (1) -#define MICROPY_ENABLE_SOURCE_LINE (1) -#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_DOUBLE) -#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) -#define MICROPY_STREAMS_NON_BLOCK (1) -#define MICROPY_STREAMS_POSIX_API (1) -#define MICROPY_OPT_COMPUTED_GOTO (1) +#define MICROPY_HELPER_REPL (1) +#define MICROPY_REPL_EMACS_KEYS (1) +#define MICROPY_REPL_AUTO_INDENT (1) +#define MICROPY_HELPER_LEXER_UNIX (1) +#define MICROPY_ENABLE_SOURCE_LINE (1) +#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_DOUBLE) +#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) +#define MICROPY_STREAMS_NON_BLOCK (1) +#define MICROPY_STREAMS_POSIX_API (1) +#define MICROPY_OPT_COMPUTED_GOTO (1) #ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0) #endif +#define MICROPY_MODULE_WEAK_LINKS (0) #define MICROPY_CAN_OVERRIDE_BUILTINS (0) -#define MICROPY_PY_FUNCTION_ATTRS (1) -#define MICROPY_PY_DESCRIPTORS (1) +#define MICROPY_PY_FUNCTION_ATTRS (1) +#define MICROPY_PY_DESCRIPTORS (1) #define MICROPY_PY_BUILTINS_STR_UNICODE (1) #define MICROPY_PY_BUILTINS_STR_CENTER (1) #define MICROPY_PY_BUILTINS_STR_PARTITION (0) @@ -90,82 +91,88 @@ #define MICROPY_PY_BUILTINS_FROZENSET (0) #define MICROPY_PY_BUILTINS_COMPILE (1) #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1) -#define MICROPY_PY_BUILTINS_INPUT (1) -#define MICROPY_PY_BUILTINS_POW3 (1) +#define MICROPY_PY_BUILTINS_INPUT (1) +#define MICROPY_PY_BUILTINS_POW3 (1) +#define MICROPY_PY_BUILTINS_ROUND_INT (0) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_PY_ALL_SPECIAL_METHODS (0) #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0) #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1) #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1) -#define MICROPY_PY_SYS_EXIT (1) +#define MICROPY_PY_SYS_EXIT (1) +#define MICROPY_PY_SYS_ATEXIT (1) +#define MICROPY_PY_SYS_SETTRACE (1) +#if MICROPY_PY_SYS_SETTRACE +#define MICROPY_PERSISTENT_CODE_SAVE (1) +#define MICROPY_COMP_CONST (0) +#endif #if defined(__APPLE__) && defined(__MACH__) -#define MICROPY_PY_SYS_PLATFORM "darwin" + #define MICROPY_PY_SYS_PLATFORM "darwin" #else -#define MICROPY_PY_SYS_PLATFORM "linux" + #define MICROPY_PY_SYS_PLATFORM "linux" #endif -#define MICROPY_PY_SYS_MAXSIZE (0) -#define MICROPY_PY_SYS_STDFILES (0) -#define MICROPY_PY_SYS_EXC_INFO (1) -#define MICROPY_PY_COLLECTIONS (0) +#define MICROPY_PY_SYS_MAXSIZE (0) +#define MICROPY_PY_SYS_STDFILES (0) +#define MICROPY_PY_SYS_EXC_INFO (1) +#define MICROPY_PY_COLLECTIONS (0) +#define MICROPY_PY_COLLECTIONS_DEQUE (0) #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0) #ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0) #endif -#define MICROPY_PY_CMATH (0) -#define MICROPY_PY_IO (0) -#define MICROPY_PY_IO_FILEIO (0) -#define MICROPY_PY_IO_RESOURCE_STREAM (0) +#define MICROPY_PY_MATH_ISCLOSE (MICROPY_PY_MATH_SPECIAL_FUNCTIONS) +#define MICROPY_PY_CMATH (0) +#define MICROPY_PY_IO (1) +#define MICROPY_PY_IO_IOBASE (1) +#define MICROPY_PY_IO_FILEIO (1) #define MICROPY_PY_GC_COLLECT_RETVAL (1) -#define MICROPY_MODULE_FROZEN_STR (0) - -#define MICROPY_STACKLESS (0) -#define MICROPY_STACKLESS_STRICT (0) - -#define MICROPY_PY_OS_STATVFS (0) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_MP_HAL (1) -#define MICROPY_PY_UERRNO (0) -#define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UZLIB (0) -#define MICROPY_PY_UJSON (0) -#define MICROPY_PY_URE (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (1) -#define MICROPY_PY_UHASHLIB (0) -#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS -#define MICROPY_PY_UHASHLIB_SHA1 (0) -#endif -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_UBINASCII_CRC32 (0) -#define MICROPY_PY_URANDOM (0) +#define MICROPY_MODULE_FROZEN_STR (0) + +#ifndef MICROPY_STACKLESS +#define MICROPY_STACKLESS (0) +#define MICROPY_STACKLESS_STRICT (0) +#endif + +#define MICROPY_PY_OS_STATVFS (0) +#define MICROPY_PY_UTIME (1) +#define MICROPY_PY_UTIME_MP_HAL (1) +#define MICROPY_PY_UERRNO (0) +#define MICROPY_PY_UCTYPES (1) +#define MICROPY_PY_UZLIB (0) +#define MICROPY_PY_UJSON (0) +#define MICROPY_PY_URE (0) +#define MICROPY_PY_UHEAPQ (0) +#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_UHASHLIB (0) +#if MICROPY_PY_USSL +#define MICROPY_PY_UHASHLIB_MD5 (1) +#define MICROPY_PY_UHASHLIB_SHA1 (1) +#define MICROPY_PY_UCRYPTOLIB (1) +#endif +#define MICROPY_PY_UBINASCII (1) +#define MICROPY_PY_UBINASCII_CRC32 (0) +#define MICROPY_PY_URANDOM (0) #ifndef MICROPY_PY_USELECT_POSIX -#define MICROPY_PY_USELECT_POSIX (0) +#define MICROPY_PY_USELECT_POSIX (0) #endif -#define MICROPY_PY_WEBSOCKET (0) -#define MICROPY_PY_MACHINE (0) -#define MICROPY_PY_MACHINE_PULSE (0) -#define MICROPY_MACHINE_MEM_GET_READ_ADDR mod_machine_mem_get_addr -#define MICROPY_MACHINE_MEM_GET_WRITE_ADDR mod_machine_mem_get_addr - -#define MICROPY_PY_TREZORCONFIG (1) -#define MICROPY_PY_TREZORCRYPTO (1) -#define MICROPY_PY_TREZORIO (1) -#define MICROPY_PY_TREZORMSG (1) -#define MICROPY_PY_TREZORUI (1) -#define MICROPY_PY_TREZORUTILS (1) +#define MICROPY_PY_UWEBSOCKET (0) +#define MICROPY_PY_MACHINE (0) +#define MICROPY_PY_MACHINE_PULSE (0) +#define MICROPY_MACHINE_MEM_GET_READ_ADDR mod_machine_mem_get_addr +#define MICROPY_MACHINE_MEM_GET_WRITE_ADDR mod_machine_mem_get_addr -#define MICROPY_FATFS_ENABLE_LFN (1) -#define MICROPY_FATFS_RPATH (2) -#define MICROPY_FATFS_MAX_SS (4096) -#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ -#define MICROPY_VFS (0) -#define MICROPY_VFS_FAT (0) +#define MICROPY_FATFS_ENABLE_LFN (1) +#define MICROPY_FATFS_RPATH (2) +#define MICROPY_FATFS_MAX_SS (4096) +#define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ +#define MICROPY_VFS (0) +#define MICROPY_VFS_FAT (0) // Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc. // names in exception messages (may require more RAM). -#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED) -#define MICROPY_WARNINGS (1) -#define MICROPY_ERROR_PRINTER (&mp_stderr_print) +#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED) +#define MICROPY_WARNINGS (1) +#define MICROPY_ERROR_PRINTER (&mp_stderr_print) #define MICROPY_PY_STR_BYTES_CMP_WARN (1) extern const struct _mp_print_t mp_stderr_print; @@ -173,19 +180,25 @@ extern const struct _mp_print_t mp_stderr_print; // Define to 1 to use undertested inefficient GC helper implementation // (if more efficient arch-specific one is not available). #ifndef MICROPY_GCREGS_SETJMP -#ifdef __mips__ -#define MICROPY_GCREGS_SETJMP (1) -#else -#define MICROPY_GCREGS_SETJMP (0) -#endif + #ifdef __mips__ + #define MICROPY_GCREGS_SETJMP (1) + #else + #define MICROPY_GCREGS_SETJMP (0) + #endif #endif -#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) -#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (256) -#define MICROPY_KBD_EXCEPTION (1) -#define MICROPY_ASYNC_KBD_INTR (1) +#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) +#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (256) +#define MICROPY_KBD_EXCEPTION (1) +#define MICROPY_ASYNC_KBD_INTR (1) + +#define MICROPY_PY_TREZORCONFIG (1) +#define MICROPY_PY_TREZORCRYPTO (1) +#define MICROPY_PY_TREZORIO (1) +#define MICROPY_PY_TREZORMSG (1) +#define MICROPY_PY_TREZORUI (1) +#define MICROPY_PY_TREZORUTILS (1) -// extern const struct _mp_obj_module_t mp_module_machine; extern const struct _mp_obj_module_t mp_module_os; // extern const struct _mp_obj_module_t mp_module_uos_vfs; // extern const struct _mp_obj_module_t mp_module_uselect; @@ -202,94 +215,80 @@ extern const struct _mp_obj_module_t mp_module_trezorui; extern const struct _mp_obj_module_t mp_module_trezorutils; #if MICROPY_PY_UOS_VFS -#define MICROPY_PY_UOS_VFS_DEF \ - {MP_ROM_QSTR(MP_QSTR_uos_vfs), MP_ROM_PTR(&mp_module_uos_vfs)}, +#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos_vfs) }, #else -#define MICROPY_PY_UOS_VFS_DEF +#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, #endif #if MICROPY_PY_FFI -#define MICROPY_PY_FFI_DEF \ - {MP_ROM_QSTR(MP_QSTR_ffi), MP_ROM_PTR(&mp_module_ffi)}, +#define MICROPY_PY_FFI_DEF { MP_ROM_QSTR(MP_QSTR_ffi), MP_ROM_PTR(&mp_module_ffi) }, #else #define MICROPY_PY_FFI_DEF #endif #if MICROPY_PY_JNI -#define MICROPY_PY_JNI_DEF \ - {MP_ROM_QSTR(MP_QSTR_jni), MP_ROM_PTR(&mp_module_jni)}, +#define MICROPY_PY_JNI_DEF { MP_ROM_QSTR(MP_QSTR_jni), MP_ROM_PTR(&mp_module_jni) }, #else #define MICROPY_PY_JNI_DEF #endif #if MICROPY_PY_UTIME -#define MICROPY_PY_UTIME_DEF \ - {MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time)}, +#define MICROPY_PY_UTIME_DEF { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) }, #else #define MICROPY_PY_UTIME_DEF #endif #if MICROPY_PY_TERMIOS -#define MICROPY_PY_TERMIOS_DEF \ - {MP_ROM_QSTR(MP_QSTR_termios), MP_ROM_PTR(&mp_module_termios)}, +#define MICROPY_PY_TERMIOS_DEF { MP_ROM_QSTR(MP_QSTR_termios), MP_ROM_PTR(&mp_module_termios) }, #else #define MICROPY_PY_TERMIOS_DEF #endif #if MICROPY_PY_SOCKET -#define MICROPY_PY_SOCKET_DEF \ - {MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_socket)}, +#define MICROPY_PY_SOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_socket) }, #else #define MICROPY_PY_SOCKET_DEF #endif #if MICROPY_PY_USELECT_POSIX -#define MICROPY_PY_USELECT_DEF \ - {MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect)}, +#define MICROPY_PY_USELECT_DEF { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) }, #else #define MICROPY_PY_USELECT_DEF #endif #if MICROPY_PY_TREZORCONFIG -#define MICROPY_PY_TREZORCONFIG_DEF \ - {MP_ROM_QSTR(MP_QSTR_trezorconfig), MP_ROM_PTR(&mp_module_trezorconfig)}, +#define MICROPY_PY_TREZORCONFIG_DEF { MP_ROM_QSTR(MP_QSTR_trezorconfig), MP_ROM_PTR(&mp_module_trezorconfig) }, #else #define MICROPY_PY_TREZORCONFIG_DEF #endif #if MICROPY_PY_TREZORCRYPTO -#define MICROPY_PY_TREZORCRYPTO_DEF \ - {MP_ROM_QSTR(MP_QSTR_trezorcrypto), MP_ROM_PTR(&mp_module_trezorcrypto)}, +#define MICROPY_PY_TREZORCRYPTO_DEF { MP_ROM_QSTR(MP_QSTR_trezorcrypto), MP_ROM_PTR(&mp_module_trezorcrypto) }, #else #define MICROPY_PY_TREZORCRYPTO_DEF #endif #if MICROPY_PY_TREZORIO -#define MICROPY_PY_TREZORIO_DEF \ - {MP_ROM_QSTR(MP_QSTR_trezorio), MP_ROM_PTR(&mp_module_trezorio)}, +#define MICROPY_PY_TREZORIO_DEF { MP_ROM_QSTR(MP_QSTR_trezorio), MP_ROM_PTR(&mp_module_trezorio) }, #else #define MICROPY_PY_TREZORIO_DEF #endif #if MICROPY_PY_TREZORUI -#define MICROPY_PY_TREZORUI_DEF \ - {MP_ROM_QSTR(MP_QSTR_trezorui), MP_ROM_PTR(&mp_module_trezorui)}, +#define MICROPY_PY_TREZORUI_DEF { MP_ROM_QSTR(MP_QSTR_trezorui), MP_ROM_PTR(&mp_module_trezorui) }, #else #define MICROPY_PY_TREZORUI_DEF #endif #if MICROPY_PY_TREZORUTILS -#define MICROPY_PY_TREZORUTILS_DEF \ - {MP_ROM_QSTR(MP_QSTR_trezorutils), MP_ROM_PTR(&mp_module_trezorutils)}, +#define MICROPY_PY_TREZORUTILS_DEF { MP_ROM_QSTR(MP_QSTR_trezorutils), MP_ROM_PTR(&mp_module_trezorutils) }, #else #define MICROPY_PY_TREZORUTILS_DEF #endif -#define MICROPY_PORT_BUILTIN_MODULES \ - MICROPY_PY_FFI_DEF \ - MICROPY_PY_JNI_DEF \ - MICROPY_PY_UTIME_DEF \ - MICROPY_PY_SOCKET_DEF \ - /* { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, */ \ - { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \ - MICROPY_PY_UOS_VFS_DEF \ - MICROPY_PY_USELECT_DEF \ - MICROPY_PY_TERMIOS_DEF \ - MICROPY_PY_TREZORCONFIG_DEF \ - MICROPY_PY_TREZORCRYPTO_DEF \ - MICROPY_PY_TREZORIO_DEF \ - MICROPY_PY_TREZORUI_DEF \ - MICROPY_PY_TREZORUTILS_DEF +#define MICROPY_PORT_BUILTIN_MODULES \ + MICROPY_PY_FFI_DEF \ + MICROPY_PY_JNI_DEF \ + MICROPY_PY_UTIME_DEF \ + MICROPY_PY_SOCKET_DEF \ + MICROPY_PY_UOS_DEF \ + MICROPY_PY_USELECT_DEF \ + MICROPY_PY_TERMIOS_DEF \ + MICROPY_PY_TREZORCONFIG_DEF \ + MICROPY_PY_TREZORCRYPTO_DEF \ + MICROPY_PY_TREZORIO_DEF \ + MICROPY_PY_TREZORUI_DEF \ + MICROPY_PY_TREZORUTILS_DEF // type definitions for the specific machine @@ -299,13 +298,13 @@ extern const struct _mp_obj_module_t mp_module_trezorutils; // assume that if we already defined the obj repr then we also defined types #ifndef MICROPY_OBJ_REPR #ifdef __LP64__ -typedef long mp_int_t; // must be pointer size -typedef unsigned long mp_uint_t; // must be pointer size +typedef long mp_int_t; // must be pointer size +typedef unsigned long mp_uint_t; // must be pointer size #else // These are definitions for machines where sizeof(int) == sizeof(void*), // regardless of actual size. -typedef int mp_int_t; // must be pointer size -typedef unsigned int mp_uint_t; // must be pointer size +typedef int mp_int_t; // must be pointer size +typedef unsigned int mp_uint_t; // must be pointer size #endif #endif @@ -318,31 +317,26 @@ typedef long long mp_off_t; typedef long mp_off_t; #endif -void mp_unix_alloc_exec(size_t min_size, void **ptr, size_t *size); +void mp_unix_alloc_exec(size_t min_size, void** ptr, size_t *size); void mp_unix_free_exec(void *ptr, size_t size); void mp_unix_mark_exec(void); -#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) \ - mp_unix_alloc_exec(min_size, ptr, size) +#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size) #define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size) #ifndef MICROPY_FORCE_PLAT_ALLOC_EXEC -// Use MP_PLAT_ALLOC_EXEC for any executable memory allocation, including for -// FFI (overriding libffi own implementation) +// Use MP_PLAT_ALLOC_EXEC for any executable memory allocation, including for FFI +// (overriding libffi own implementation) #define MICROPY_FORCE_PLAT_ALLOC_EXEC (1) #endif #if MICROPY_PY_OS_DUPTERM #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len) #else -#define MP_PLAT_PRINT_STRN(str, len) \ - do { \ - ssize_t ret = write(1, str, len); \ - (void)ret; \ - } while (0) +#define MP_PLAT_PRINT_STRN(str, len) do { ssize_t ret = write(1, str, len); (void)ret; } while (0) #endif #ifdef __linux__ // Can access physical memory using /dev/mem -#define MICROPY_PLAT_DEV_MEM (1) +#define MICROPY_PLAT_DEV_MEM (1) #endif // Assume that select() call, interrupted with a signal, and erroring @@ -363,8 +357,8 @@ void mp_unix_mark_exec(void); #define MP_STATE_PORT MP_STATE_VM #define MICROPY_PORT_ROOT_POINTERS \ - const char *readline_hist[50]; \ - void *mmap_region_head; + const char *readline_hist[50]; \ + void *mmap_region_head; \ // We need to provide a declaration/definition of alloca() // unless support for it is disabled.