summaryrefslogtreecommitdiffstatshomepage
path: root/py/modsys.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-04-09 23:56:15 +0100
committerDamien George <damien.p.george@gmail.com>2015-04-16 14:30:16 +0000
commit7f9d1d6ab923096582622b700bedb6a571518eac (patch)
treef97a0d56ba0279dd4ef2a44f00676193c4d49d8b /py/modsys.c
parent56beb01724d4f0027babc5d23f016efbde4c4190 (diff)
downloadmicropython-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 'py/modsys.c')
-rw-r--r--py/modsys.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/py/modsys.c b/py/modsys.c
index 5051e72951..09e72e98ad 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -31,7 +31,6 @@
#include "py/objtuple.h"
#include "py/objstr.h"
#include "py/objint.h"
-#include "py/pfenv.h"
#include "py/stream.h"
#if MICROPY_PY_SYS
@@ -78,12 +77,10 @@ STATIC mp_obj_t mp_sys_print_exception(mp_uint_t n_args, const mp_obj_t *args) {
stream_obj = args[1];
}
- pfenv_t pfenv;
- pfenv.data = stream_obj;
- pfenv.print_strn = (void (*)(void *, const char *, mp_uint_t))mp_stream_write;
- mp_obj_print_exception((void (*)(void *env, const char *fmt, ...))pfenv_printf, &pfenv, args[0]);
+ mp_print_t print = {stream_obj, (mp_print_strn_t)mp_stream_write};
+ mp_obj_print_exception(&print, args[0]);
#else
- mp_obj_print_exception(printf_wrapper, NULL, args[0]);
+ mp_obj_print_exception(&mp_plat_print, args[0]);
#endif
return mp_const_none;