BTCPrivate
/
trezor-core
mirror of https://github.com/BTCPrivate/trezor-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update micropython submodule; add REPL to firmware

This commit is contained in:
Pavol Rusnak 2017-05-15 17:57:04 +02:00
parent 3765fb734b
commit c3e5e2b208
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
7 changed files with 86 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.firmware
View File

@ -159,6 +159,7 @@ OBJ_MICROPYTHON += $(addprefix $(BUILD_MP)/,\
lib/libm/thumb_vfp_sqrtf.o \ lib/libm/thumb_vfp_sqrtf.o \
lib/libm/wf_lgamma.o \ lib/libm/wf_lgamma.o \
lib/libm/wf_tgamma.o \ lib/libm/wf_tgamma.o \
lib/mp-readline/readline.o \
lib/utils/interrupt_char.o \ lib/utils/interrupt_char.o \
lib/utils/printf.o \ lib/utils/printf.o \
lib/utils/pyexec.o \ lib/utils/pyexec.o \

7
micropython/firmware/main.c
View File

@ -65,6 +65,13 @@ int main(void) {
// Run the main script // Run the main script
pyexec_frozen_module("main.py"); pyexec_frozen_module("main.py");
// Run REPL
for (;;) {
if (pyexec_friendly_repl() != 0) {
break;
}
}
// Clean up // Clean up
mp_deinit(); mp_deinit();
} }

117
micropython/firmware/mpconfigport.h
View File

@ -3,7 +3,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2013-2015 Damien P. George * Copyright (c) 2013-2017 Damien P. George
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -24,22 +24,27 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <stdbool.h> // bool // Options to control how MicroPython is built for this port,
#include <alloca.h> // alloca // overriding defaults in py/mpconfig.h.
// Memory allocation policies #pragma once
#ifndef __INCLUDED_MPCONFIGPORT_H
#define __INCLUDED_MPCONFIGPORT_H
// memory allocation policies
#define MICROPY_ALLOC_PATH_MAX (128) #define MICROPY_ALLOC_PATH_MAX (128)
// Emitters // emitters
#define MICROPY_PERSISTENT_CODE_LOAD (0) #define MICROPY_PERSISTENT_CODE_LOAD (0)
#define MICROPY_EMIT_THUMB (0) #define MICROPY_EMIT_THUMB (0)
#define MICROPY_EMIT_INLINE_THUMB (0) #define MICROPY_EMIT_INLINE_THUMB (0)
// Compiler configuration // compiler configuration
#define MICROPY_COMP_MODULE_CONST (1) #define MICROPY_COMP_MODULE_CONST (1)
#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1) #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
#define MICROPY_COMP_RETURN_IF_EXPR (1)
// Optimisations // optimisations
#define MICROPY_OPT_COMPUTED_GOTO (1) #define MICROPY_OPT_COMPUTED_GOTO (1)
#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0) #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
#define MICROPY_OPT_MPZ_BITWISE (1) #define MICROPY_OPT_MPZ_BITWISE (1)
@ -62,10 +67,12 @@
#define MICROPY_MODULE_WEAK_LINKS (1) #define MICROPY_MODULE_WEAK_LINKS (1)
#define MICROPY_CAN_OVERRIDE_BUILTINS (1) #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
#define MICROPY_USE_INTERNAL_ERRNO (1) #define MICROPY_USE_INTERNAL_ERRNO (1)
#define MICROPY_ENABLE_SCHEDULER (0)
#define MICROPY_SCHEDULER_DEPTH (0)
#define MICROPY_VFS (0) #define MICROPY_VFS (0)
#define MICROPY_VFS_FAT (0) #define MICROPY_VFS_FAT (0)
// Control over Python builtins // control over Python builtins
#define MICROPY_PY_FUNCTION_ATTRS (1) #define MICROPY_PY_FUNCTION_ATTRS (1)
#define MICROPY_PY_BUILTINS_STR_UNICODE (1) #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
#define MICROPY_PY_BUILTINS_STR_CENTER (1) #define MICROPY_PY_BUILTINS_STR_CENTER (1)
@ -79,6 +86,7 @@
#define MICROPY_PY_BUILTINS_EXECFILE (1) #define MICROPY_PY_BUILTINS_EXECFILE (1)
#define MICROPY_PY_BUILTINS_POW3 (0) #define MICROPY_PY_BUILTINS_POW3 (0)
#define MICROPY_PY_BUILTINS_HELP (0) #define MICROPY_PY_BUILTINS_HELP (0)
#define MICROPY_PY_BUILTINS_HELP_TEXT stmhal_help_text
#define MICROPY_PY_BUILTINS_HELP_MODULES (0) #define MICROPY_PY_BUILTINS_HELP_MODULES (0)
#define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1) #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
@ -95,13 +103,13 @@
#define MICROPY_PY_THREAD (0) #define MICROPY_PY_THREAD (0)
#define MICROPY_PY_THREAD_GIL (0) #define MICROPY_PY_THREAD_GIL (0)
// Extended modules // extended modules
#define MICROPY_PY_UBINASCII (1)
#define MICROPY_PY_UBINASCII_CRC32 (1)
#define MICROPY_PY_UCTYPES (1) #define MICROPY_PY_UCTYPES (1)
#define MICROPY_PY_UZLIB (1) #define MICROPY_PY_UZLIB (1)
#define MICROPY_PY_UTIME_MP_HAL (1) #define MICROPY_PY_UBINASCII (1)
#define MICROPY_PY_UBINASCII_CRC32 (1)
#define MICROPY_PY_UTIMEQ (1) #define MICROPY_PY_UTIMEQ (1)
#define MICROPY_PY_UTIME_MP_HAL (1)
#define MICROPY_PY_TREZORCONFIG (1) #define MICROPY_PY_TREZORCONFIG (1)
#define MICROPY_PY_TREZORCRYPTO (1) #define MICROPY_PY_TREZORCRYPTO (1)
#define MICROPY_PY_TREZORIO (1) #define MICROPY_PY_TREZORIO (1)
@ -109,21 +117,57 @@
#define MICROPY_PY_TREZORUI (1) #define MICROPY_PY_TREZORUI (1)
#define MICROPY_PY_TREZORUTILS (1) #define MICROPY_PY_TREZORUTILS (1)
// Type definitions for the specific machine // extra built in names to add to the global namespace
#define MICROPY_PORT_BUILTINS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
#include STM32_HAL_H // extra built in modules to add to the list of known ones
extern const struct _mp_obj_module_t mp_module_utime;
extern const struct _mp_obj_module_t mp_module_TrezorConfig;
extern const struct _mp_obj_module_t mp_module_TrezorCrypto;
extern const struct _mp_obj_module_t mp_module_TrezorIO;
extern const struct _mp_obj_module_t mp_module_TrezorMsg;
extern const struct _mp_obj_module_t mp_module_TrezorUi;
extern const struct _mp_obj_module_t mp_module_TrezorUtils;
#define BYTES_PER_WORD (4) #define MICROPY_PORT_BUILTIN_MODULES \
{ MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&mp_module_utime }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorConfig), (mp_obj_t)&mp_module_TrezorConfig }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorCrypto), (mp_obj_t)&mp_module_TrezorCrypto }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorIO), (mp_obj_t)&mp_module_TrezorIO }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorMsg), (mp_obj_t)&mp_module_TrezorMsg }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorUi), (mp_obj_t)&mp_module_TrezorUi }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorUtils), (mp_obj_t)&mp_module_TrezorUtils },
#define MP_STATE_PORT MP_STATE_VM
#define MICROPY_PORT_ROOT_POINTERS \
const char *readline_hist[8]; \
// type definitions for the specific machine
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1)) #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
#define INT_FMT "%d"
#define UINT_FMT "%u"
#define MP_SSIZE_MAX (0x0fffffff) #define MP_SSIZE_MAX (0x0fffffff)
#define UINT_FMT "%u"
#define INT_FMT "%d"
typedef int mp_int_t; // must be pointer size
typedef unsigned int mp_uint_t; // must be pointer size
typedef long mp_off_t; typedef long mp_off_t;
typedef int mp_int_t;
typedef unsigned mp_uint_t; #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
// We have inlined IRQ functions for efficiency (they are generally
// 1 machine instruction).
//
// Note on IRQ state: you should not need to know the specific
// value of the state variable, but rather just pass the return
// value from disable_irq back to enable_irq. If you really need
// to know the machine-specific values, see irq.h.
#include STM32_HAL_H
static inline void enable_irq(mp_uint_t state) { static inline void enable_irq(mp_uint_t state) {
__set_PRIMASK(state); __set_PRIMASK(state);
@ -143,32 +187,15 @@ static inline mp_uint_t disable_irq(void) {
#define MICROPY_HW_MCU_NAME "STM32F405VG" #define MICROPY_HW_MCU_NAME "STM32F405VG"
#define MICROPY_PY_SYS_PLATFORM "trezor" #define MICROPY_PY_SYS_PLATFORM "trezor"
#define MICROPY_PORT_ROOT_POINTERS // There is no classical C heap in bare-metal ports, only Python
// garbage-collected heap. For completeness, emulate C heap via
#define MP_STATE_PORT MP_STATE_VM // GC heap. Note that MicroPython core never uses malloc() and friends,
// so these defines are mostly to help extension module writers.
// Extra built in modules to add to the list of known ones
extern const struct _mp_obj_module_t mp_module_utime;
extern const struct _mp_obj_module_t mp_module_TrezorConfig;
extern const struct _mp_obj_module_t mp_module_TrezorCrypto;
extern const struct _mp_obj_module_t mp_module_TrezorIO;
extern const struct _mp_obj_module_t mp_module_TrezorMsg;
extern const struct _mp_obj_module_t mp_module_TrezorUi;
extern const struct _mp_obj_module_t mp_module_TrezorUtils;
#define MICROPY_PORT_BUILTIN_MODULES \
{ MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&mp_module_utime }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorConfig), (mp_obj_t)&mp_module_TrezorConfig }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorCrypto), (mp_obj_t)&mp_module_TrezorCrypto }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorIO), (mp_obj_t)&mp_module_TrezorIO }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorMsg), (mp_obj_t)&mp_module_TrezorMsg }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorUi), (mp_obj_t)&mp_module_TrezorUi }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_TrezorUtils), (mp_obj_t)&mp_module_TrezorUtils },
// Extra built in names to add to the global namespace
#define MICROPY_PORT_BUILTINS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
// Make sure all allocations are done through GC
#define malloc(n) m_malloc(n) #define malloc(n) m_malloc(n)
#define free(p) m_free(p) #define free(p) m_free(p)
#define realloc(p, n) m_realloc(p, n) #define realloc(p, n) m_realloc(p, n)
// We need to provide a declaration/definition of alloca()
#include <alloca.h>
#endif // __INCLUDED_MPCONFIGPORT_H

2
micropython/firmware/mphalport.h
View File

@ -2,8 +2,6 @@
#include "lib/utils/interrupt_char.h" #include "lib/utils/interrupt_char.h"
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
static inline mp_uint_t mp_hal_ticks_cpu(void) { static inline mp_uint_t mp_hal_ticks_cpu(void) {
return DWT->CYCCNT; return DWT->CYCCNT;
} }

2
micropython/unix/Makefile
View File

@ -316,7 +316,7 @@ minimal:
BUILD=build-minimal PROG=micropython_minimal FROZEN_DIR= \ BUILD=build-minimal PROG=micropython_minimal FROZEN_DIR= \
MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_SOCKET=0 MICROPY_PY_THREAD=0 \ MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_SOCKET=0 MICROPY_PY_THREAD=0 \
MICROPY_PY_TERMIOS=0 MICROPY_PY_USSL=0 \ MICROPY_PY_TERMIOS=0 MICROPY_PY_USSL=0 \
MICROPY_USE_READLINE=0 MICROPY_FATFS=0 MICROPY_USE_READLINE=0
# build interpreter with nan-boxing as object model # build interpreter with nan-boxing as object model
nanbox: nanbox:

8
micropython/unix/mpconfigport.h
View File

@ -45,6 +45,7 @@
#endif #endif
#define MICROPY_COMP_MODULE_CONST (1) #define MICROPY_COMP_MODULE_CONST (1)
#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1) #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
#define MICROPY_COMP_RETURN_IF_EXPR (1)
#define MICROPY_ENABLE_GC (1) #define MICROPY_ENABLE_GC (1)
#define MICROPY_ENABLE_FINALISER (1) #define MICROPY_ENABLE_FINALISER (1)
#define MICROPY_STACK_CHECK (1) #define MICROPY_STACK_CHECK (1)
@ -100,6 +101,7 @@
#endif #endif
#define MICROPY_PY_CMATH (1) #define MICROPY_PY_CMATH (1)
#define MICROPY_PY_IO_FILEIO (1) #define MICROPY_PY_IO_FILEIO (1)
#define MICROPY_PY_IO_RESOURCE_STREAM (1)
#define MICROPY_PY_GC_COLLECT_RETVAL (1) #define MICROPY_PY_GC_COLLECT_RETVAL (1)
#define MICROPY_MODULE_FROZEN_STR (1) #define MICROPY_MODULE_FROZEN_STR (1)
@ -163,6 +165,7 @@
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (256) #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (256)
#define MICROPY_KBD_EXCEPTION (1)
#define MICROPY_ASYNC_KBD_INTR (1) #define MICROPY_ASYNC_KBD_INTR (1)
extern const struct _mp_obj_module_t mp_module_machine; extern const struct _mp_obj_module_t mp_module_machine;
@ -177,7 +180,7 @@ extern const struct _mp_obj_module_t mp_module_jni;
extern const struct _mp_obj_module_t mp_module_TrezorConfig; extern const struct _mp_obj_module_t mp_module_TrezorConfig;
extern const struct _mp_obj_module_t mp_module_TrezorCrypto; extern const struct _mp_obj_module_t mp_module_TrezorCrypto;
extern const struct _mp_obj_module_t mp_module_TrezorDebug; extern const struct _mp_obj_module_t mp_module_TrezorIO;
extern const struct _mp_obj_module_t mp_module_TrezorMsg; extern const struct _mp_obj_module_t mp_module_TrezorMsg;
extern const struct _mp_obj_module_t mp_module_TrezorUi; extern const struct _mp_obj_module_t mp_module_TrezorUi;
extern const struct _mp_obj_module_t mp_module_TrezorUtils; extern const struct _mp_obj_module_t mp_module_TrezorUtils;
@ -284,8 +287,6 @@ typedef unsigned int mp_uint_t; // must be pointer size
#endif #endif
#endif #endif
#define BYTES_PER_WORD sizeof(mp_int_t)
// Cannot include <sys/types.h>, as it may lead to symbol name clashes // Cannot include <sys/types.h>, as it may lead to symbol name clashes
#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__) #if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
typedef long long mp_off_t; typedef long long mp_off_t;
@ -336,7 +337,6 @@ void mp_unix_mark_exec(void);
#define MICROPY_PORT_ROOT_POINTERS \ #define MICROPY_PORT_ROOT_POINTERS \
const char *readline_hist[50]; \ const char *readline_hist[50]; \
mp_obj_t keyboard_interrupt_obj; \
void *mmap_region_head; \ void *mmap_region_head; \
// We need to provide a declaration/definition of alloca() // We need to provide a declaration/definition of alloca()

2
vendor/micropython vendored

@ -1 +1 @@
Subproject commit 6e6c01b97189a95b59a037fa7dabcf8217f199af Subproject commit d5713c8618e8d809f354b6be72b7410dc5ac840a