diff --git a/py/emitbc.c b/py/emitbc.c index 6d9523fe5673bcfccdf33974612c53b03b0e2ca9..d74b0652531748c91b95e7076d08bebb6c292109 100644 --- a/py/emitbc.c +++ b/py/emitbc.c @@ -249,6 +249,7 @@ static void emit_bc_set_stack_size(emit_t *emit, int size) { static void emit_bc_set_source_line(emit_t *emit, int source_line) { //printf("source: line %d -> %d offset %d -> %d\n", emit->last_source_line, source_line, emit->last_source_line_offset, emit->byte_code_offset); +#if MICROPY_ENABLE_SOURCE_LINE if (source_line > emit->last_source_line) { uint bytes_to_skip = emit->byte_code_offset - emit->last_source_line_offset; uint lines_to_skip = source_line - emit->last_source_line; @@ -257,6 +258,7 @@ static void emit_bc_set_source_line(emit_t *emit, int source_line) { emit->last_source_line_offset = emit->byte_code_offset; emit->last_source_line = source_line; } +#endif } static void emit_bc_load_id(emit_t *emit, qstr qstr) { diff --git a/py/mpconfig.h b/py/mpconfig.h index 97e4b138756a8a6ee431bcf24a080d6a7f6e9ba2..38b74b733aeb0ceca19d7e9ea43ee95ad2a8d6bd 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -76,6 +76,12 @@ typedef long long mp_longint_impl_t; #endif +// Whether to include information in the byte code to determine source +// line number (increases RAM usage, but doesn't slow byte code execution) +#ifndef MICROPY_ENABLE_SOURCE_LINE +#define MICROPY_ENABLE_SOURCE_LINE (0) +#endif + // Whether to support float and complex types #ifndef MICROPY_ENABLE_FLOAT #define MICROPY_ENABLE_FLOAT (0) diff --git a/py/obj.c b/py/obj.c index 76a4d8f9b2e56525c25cc10d80d350f078860cc1..ce555efa6dbe1ea05775514a47e53e42806c9bed 100644 --- a/py/obj.c +++ b/py/obj.c @@ -57,7 +57,11 @@ void mp_obj_print_exception(mp_obj_t exc) { if (n > 0) { printf("Traceback (most recent call last):\n"); for (int i = n - 3; i >= 0; i -= 3) { +#if MICROPY_ENABLE_SOURCE_LINE printf(" File \"%s\", line %d, in %s\n", qstr_str(values[i]), (int)values[i + 1], qstr_str(values[i + 2])); +#else + printf(" File \"%s\", in %s\n", qstr_str(values[i]), qstr_str(values[i + 2])); +#endif } } } diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 10abb8ce7500a69752e0ab40234607e67480db43..5eba0df6138b958fc5eebe162c674a950ec6d009 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -12,6 +12,7 @@ #define MICROPY_DEBUG_PRINTERS (1) #define MICROPY_ENABLE_REPL_HELPERS (1) #define MICROPY_ENABLE_LEXER_UNIX (1) +#define MICROPY_ENABLE_SOURCE_LINE (1) #define MICROPY_ENABLE_FLOAT (1) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)