diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-04-09 23:56:15 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-04-16 14:30:16 +0000 |
| commit | 7f9d1d6ab923096582622b700bedb6a571518eac (patch) | |
| tree | f97a0d56ba0279dd4ef2a44f00676193c4d49d8b /esp8266 | |
| parent | 56beb01724d4f0027babc5d23f016efbde4c4190 (diff) | |
| download | micropython-7f9d1d6ab923096582622b700bedb6a571518eac.tar.gz micropython-7f9d1d6ab923096582622b700bedb6a571518eac.zip | |
py: Overhaul and simplify printf/pfenv mechanism.
Previous to this patch the printing mechanism was a bit of a tangled
mess. This patch attempts to consolidate printing into one interface.
All (non-debug) printing now uses the mp_print* family of functions,
mainly mp_printf. All these functions take an mp_print_t structure as
their first argument, and this structure defines the printing backend
through the "print_strn" function of said structure.
Printing from the uPy core can reach the platform-defined print code via
two paths: either through mp_sys_stdout_obj (defined pert port) in
conjunction with mp_stream_write; or through the mp_plat_print structure
which uses the MP_PLAT_PRINT_STRN macro to define how string are printed
on the platform. The former is only used when MICROPY_PY_IO is defined.
With this new scheme printing is generally more efficient (less layers
to go through, less arguments to pass), and, given an mp_print_t*
structure, one can call mp_print_str for efficiency instead of
mp_printf("%s", ...). Code size is also reduced by around 200 bytes on
Thumb2 archs.
Diffstat (limited to 'esp8266')
| -rw-r--r-- | esp8266/modesp.c | 3 | ||||
| -rw-r--r-- | esp8266/modpybpin.c | 4 | ||||
| -rw-r--r-- | esp8266/mpconfigport.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/esp8266/modesp.c b/esp8266/modesp.c index 29ef42ab2a..3b5a0b7d74 100644 --- a/esp8266/modesp.c +++ b/esp8266/modesp.c @@ -32,7 +32,6 @@ #include "py/obj.h" #include "py/gc.h" #include "py/runtime.h" -#include "py/pfenv.h" #include MICROPY_HAL_H #include "queue.h" #include "user_interface.h" @@ -52,7 +51,7 @@ mp_obj_t call_function_1_protected(mp_obj_t fun, mp_obj_t arg) { if (nlr_push(&nlr) == 0) { return mp_call_function_1(fun, arg); } else { - mp_obj_print_exception(printf_wrapper, NULL, (mp_obj_t)nlr.ret_val); + mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val); return (mp_obj_t)nlr.ret_val; } } diff --git a/esp8266/modpybpin.c b/esp8266/modpybpin.c index 0089e71ab2..8b09c7f655 100644 --- a/esp8266/modpybpin.c +++ b/esp8266/modpybpin.c @@ -65,11 +65,11 @@ STATIC const pyb_pin_obj_t pyb_pin_obj[] = { {{&pyb_pin_type}, 15, 15, PERIPHS_IO_MUX_MTDO_U, FUNC_GPIO15}, }; -STATIC void pyb_pin_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { +STATIC void pyb_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { pyb_pin_obj_t *self = self_in; // pin name - print(env, "Pin(%u)", self->pin_id); + mp_printf(print, "Pin(%u)", self->pin_id); } // pin.init(mode, pull=Pin.PULL_NONE, af=-1) diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h index 7e7f0fdbac..dcd9407f82 100644 --- a/esp8266/mpconfigport.h +++ b/esp8266/mpconfigport.h @@ -52,6 +52,9 @@ typedef void *machine_ptr_t; // must be of pointer size typedef const void *machine_const_ptr_t; // must be of pointer size typedef long mp_off_t; +void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len); +#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len) + // extra built in names to add to the global namespace extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ |