diff options
| -rw-r--r-- | py/bc.c | 1 | ||||
| -rw-r--r-- | py/builtinimport.c | 1 | ||||
| -rw-r--r-- | py/gc.c | 3 | ||||
| -rw-r--r-- | py/map.c | 2 | ||||
| -rw-r--r-- | py/mpconfig.h | 4 | ||||
| -rw-r--r-- | py/nlr.h | 2 | ||||
| -rw-r--r-- | py/nlrthumb.S | 4 | ||||
| -rw-r--r-- | py/objfun.c | 1 | ||||
| -rw-r--r-- | py/objtype.c | 1 | ||||
| -rw-r--r-- | stmhal/printf.c | 7 | ||||
| -rw-r--r-- | stmhal/pybstdio.h | 2 |
11 files changed, 14 insertions, 14 deletions
@@ -44,6 +44,7 @@ #if 0 // print debugging info #define DEBUG_PRINT (1) #else // don't print debugging info +#define DEBUG_PRINT (0) #define DEBUG_printf(...) (void)0 #endif diff --git a/py/builtinimport.c b/py/builtinimport.c index af93aace91..f1288744a8 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -50,6 +50,7 @@ #define DEBUG_PRINT (1) #define DEBUG_printf DEBUG_printf #else // don't print debugging info +#define DEBUG_PRINT (0) #define DEBUG_printf(...) (void)0 #endif @@ -44,6 +44,7 @@ #define DEBUG_PRINT (1) #define DEBUG_printf DEBUG_printf #else // don't print debugging info +#define DEBUG_PRINT (0) #define DEBUG_printf(...) (void)0 #endif @@ -746,7 +747,9 @@ void gc_dump_alloc_table(void) { if (*ptr == (mp_uint_t)&mp_type_tuple) { c = 'T'; } else if (*ptr == (mp_uint_t)&mp_type_list) { c = 'L'; } else if (*ptr == (mp_uint_t)&mp_type_dict) { c = 'D'; } + #if MICROPY_PY_BUILTINS_FLOAT else if (*ptr == (mp_uint_t)&mp_type_float) { c = 'F'; } + #endif else if (*ptr == (mp_uint_t)&mp_type_fun_bc) { c = 'B'; } else if (*ptr == (mp_uint_t)&mp_type_module) { c = 'M'; } else { c = 'h'; } @@ -358,7 +358,7 @@ void mp_set_clear(mp_set_t *set) { set->table = NULL; } -#if DEBUG_PRINT +#if defined(DEBUG_PRINT) && DEBUG_PRINT void mp_map_dump(mp_map_t *map) { for (mp_uint_t i = 0; i < map->alloc; i++) { if (map->table[i].key != NULL) { diff --git a/py/mpconfig.h b/py/mpconfig.h index 8ef3e62fec..02c6674d8b 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -184,8 +184,8 @@ #endif // Whether to enable finalisers in the garbage collector (ie call __del__) -#ifndef MICROPY_ENABLE_GC_FINALISER -#define MICROPY_ENABLE_GC_FINALISER (0) +#ifndef MICROPY_ENABLE_FINALISER +#define MICROPY_ENABLE_FINALISER (0) #endif // Whether to check C stack usage. C stack used for calling Python functions, @@ -36,7 +36,7 @@ struct _nlr_buf_t { // the entries here must all be machine word size nlr_buf_t *prev; void *ret_val; -#if !MICROPY_NLR_SETJMP +#if !defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP #if defined(__i386__) void *regs[6]; #elif defined(__x86_64__) diff --git a/py/nlrthumb.S b/py/nlrthumb.S index 5443edfe84..dcbcc2770d 100644 --- a/py/nlrthumb.S +++ b/py/nlrthumb.S @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -#if !MICROPY_NLR_SETJMP && (defined(__thumb2__) || defined(__thumb__) || defined(__arm__)) +#if (!defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP) && (defined(__thumb2__) || defined(__thumb__) || defined(__arm__)) // We only need the functions here if we are on arm/thumb, and we are not // using setjmp/longjmp. @@ -138,4 +138,4 @@ nlr_jump: nlr_top: .space 4 -#endif // !MICROPY_NLR_SETJMP && (defined(__thumb2__) || defined(__thumb__) || defined(__arm__)) +#endif // (!defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP) && (defined(__thumb2__) || defined(__thumb__) || defined(__arm__)) diff --git a/py/objfun.c b/py/objfun.c index 3adf05e3b0..5f95a015bc 100644 --- a/py/objfun.c +++ b/py/objfun.c @@ -44,6 +44,7 @@ #if 0 // print debugging info #define DEBUG_PRINT (1) #else // don't print debugging info +#define DEBUG_PRINT (0) #define DEBUG_printf(...) (void)0 #endif diff --git a/py/objtype.c b/py/objtype.c index 171ea838f2..70dc226a60 100644 --- a/py/objtype.c +++ b/py/objtype.c @@ -43,6 +43,7 @@ #define DEBUG_PRINT (1) #define DEBUG_printf DEBUG_printf #else // don't print debugging info +#define DEBUG_PRINT (0) #define DEBUG_printf(...) (void)0 #endif diff --git a/stmhal/printf.c b/stmhal/printf.c index 137189b94d..ca9b279cdb 100644 --- a/stmhal/printf.c +++ b/stmhal/printf.c @@ -29,17 +29,10 @@ #include <stdarg.h> #include "mpconfig.h" -#include "std.h" #include "misc.h" -#include "systick.h" #include "qstr.h" #include "obj.h" #include "pfenv.h" -#if 0 -#include "lcd.h" -#endif -#include "uart.h" -#include "usb.h" #include "pybstdio.h" #if MICROPY_PY_BUILTINS_FLOAT diff --git a/stmhal/pybstdio.h b/stmhal/pybstdio.h index cdb7acfe59..08a2d03638 100644 --- a/stmhal/pybstdio.h +++ b/stmhal/pybstdio.h @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -extern pyb_uart_obj_t *pyb_stdio_uart; +extern struct _pyb_uart_obj_t *pyb_stdio_uart; void stdout_tx_str(const char *str); void stdout_tx_strn(const char *str, mp_uint_t len); |