Browse Source

unix: Use printf() implementation in terms of mp_printf().

In other words, unix port now uses overriden printf(), instead of using
libc's. This should remove almost all dependency on libc stdio (which
is bloated).
pull/1638/head
Paul Sokolovsky 9 years ago
parent
commit
c3280d83e7
  1. 7
      lib/utils/printf.c
  2. 1
      unix/Makefile
  3. 8
      unix/main.c
  4. 1
      unix/mpconfigport.h

7
lib/utils/printf.c

@ -51,7 +51,14 @@ int vprintf(const char *fmt, va_list ap) {
int DEBUG_printf(const char *fmt, ...) { int DEBUG_printf(const char *fmt, ...) {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
#if MICROPY_DEBUG_STDERR
// Printing debug to stderr may give a chance tests which
// check stdout to pass, etc.
extern const mp_print_t mp_stderr_print;
int ret = mp_vprintf(&mp_stderr_print, fmt, ap);
#else
int ret = mp_vprintf(&mp_plat_print, fmt, ap); int ret = mp_vprintf(&mp_plat_print, fmt, ap);
#endif
va_end(ap); va_end(ap);
return ret; return ret;
} }

1
unix/Makefile

@ -129,6 +129,7 @@ endif
LIB_SRC_C = $(addprefix lib/,\ LIB_SRC_C = $(addprefix lib/,\
$(LIB_SRC_C_EXTRA) \ $(LIB_SRC_C_EXTRA) \
utils/printf.c \
) )
OBJ = $(PY_O) OBJ = $(PY_O)

8
unix/main.c

@ -574,14 +574,6 @@ uint mp_import_stat(const char *path) {
return MP_IMPORT_STAT_NO_EXIST; return MP_IMPORT_STAT_NO_EXIST;
} }
int DEBUG_printf(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
int ret = mp_vprintf(&mp_stderr_print, fmt, ap);
va_end(ap);
return ret;
}
void nlr_jump_fail(void *val) { void nlr_jump_fail(void *val) {
printf("FATAL: uncaught NLR %p\n", val); printf("FATAL: uncaught NLR %p\n", val);
exit(1); exit(1);

1
unix/mpconfigport.h

@ -50,6 +50,7 @@
#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1) #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
#define MICROPY_MEM_STATS (1) #define MICROPY_MEM_STATS (1)
#define MICROPY_DEBUG_PRINTERS (1) #define MICROPY_DEBUG_PRINTERS (1)
#define MICROPY_DEBUG_STDERR (1)
#define MICROPY_USE_READLINE_HISTORY (1) #define MICROPY_USE_READLINE_HISTORY (1)
#define MICROPY_HELPER_REPL (1) #define MICROPY_HELPER_REPL (1)
#define MICROPY_REPL_EMACS_KEYS (1) #define MICROPY_REPL_EMACS_KEYS (1)

Loading…
Cancel
Save