py: Fix some macros defines; cleanup some includes.
This commit is contained in:
parent
be8e99c7d4
commit
7860c2a68a
1
py/bc.c
1
py/bc.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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
3
py/gc.c
3
py/gc.c
|
@ -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'; }
|
||||
|
|
2
py/map.c
2
py/map.c
|
@ -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) {
|
||||
|
|
|
@ -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,
|
||||
|
|
2
py/nlr.h
2
py/nlr.h
|
@ -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__)
|
||||
|
|
|
@ -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__))
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue