From 7f9d1d6ab923096582622b700bedb6a571518eac Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 9 Apr 2015 23:56:15 +0100 Subject: 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. --- pic16bit/modpybswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pic16bit/modpybswitch.c') diff --git a/pic16bit/modpybswitch.c b/pic16bit/modpybswitch.c index f5047b78f..901e478cc 100644 --- a/pic16bit/modpybswitch.c +++ b/pic16bit/modpybswitch.c @@ -40,9 +40,9 @@ STATIC const pyb_switch_obj_t pyb_switch_obj[] = { #define NUM_SWITCH MP_ARRAY_SIZE(pyb_switch_obj) #define SWITCH_ID(obj) ((obj) - &pyb_switch_obj[0] + 1) -void pyb_switch_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { +void pyb_switch_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { pyb_switch_obj_t *self = self_in; - print(env, "Switch(%u)", SWITCH_ID(self)); + mp_printf(print, "Switch(%u)", SWITCH_ID(self)); } STATIC mp_obj_t pyb_switch_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { -- cgit v1.2.3