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/objcomplex.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'py/objcomplex.c') diff --git a/py/objcomplex.c b/py/objcomplex.c index f4a68851a5..12f10ec10b 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -48,36 +48,36 @@ typedef struct _mp_obj_complex_t { mp_float_t imag; } mp_obj_complex_t; -STATIC void complex_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { +STATIC void complex_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { (void)kind; mp_obj_complex_t *o = o_in; #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT char buf[16]; if (o->real == 0) { mp_format_float(o->imag, buf, sizeof(buf), 'g', 7, '\0'); - print(env, "%sj", buf); + mp_printf(print, "%sj", buf); } else { mp_format_float(o->real, buf, sizeof(buf), 'g', 7, '\0'); - print(env, "(%s", buf); + mp_printf(print, "(%s", buf); if (o->imag >= 0) { - print(env, "+"); + mp_print_str(print, "+"); } mp_format_float(o->imag, buf, sizeof(buf), 'g', 7, '\0'); - print(env, "%sj)", buf); + mp_printf(print, "%sj)", buf); } #else char buf[32]; if (o->real == 0) { sprintf(buf, "%.16g", (double)o->imag); - print(env, "%sj", buf); + mp_printf(print, "%sj", buf); } else { sprintf(buf, "%.16g", (double)o->real); - print(env, "(%s", buf); + mp_printf(print, "(%s", buf); if (o->imag >= 0) { - print(env, "+"); + mp_print_str(print, "+"); } sprintf(buf, "%.16g", (double)o->imag); - print(env, "%sj)", buf); + mp_printf(print, "%sj)", buf); } #endif } -- cgit v1.2.3