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. --- py/objlist.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'py/objlist.c') diff --git a/py/objlist.c b/py/objlist.c index e1343d9b3..940403212 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -44,19 +44,19 @@ STATIC mp_obj_t list_pop(mp_uint_t n_args, const mp_obj_t *args); /******************************************************************************/ /* list */ -STATIC void list_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { +STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_list_t *o = MP_OBJ_CAST(o_in); if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) { kind = PRINT_REPR; } - print(env, "["); + mp_print_str(print, "["); for (mp_uint_t i = 0; i < o->len; i++) { if (i > 0) { - print(env, ", "); + mp_print_str(print, ", "); } - mp_obj_print_helper(print, env, o->items[i], kind); + mp_obj_print_helper(print, o->items[i], kind); } - print(env, "]"); + mp_print_str(print, "]"); } STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) { -- cgit v1.2.3