diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-08-30 11:29:52 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-08-30 11:29:52 +1000 |
| commit | 39b465ca831d0ec866c2a137dccbfec7f7badfba (patch) | |
| tree | 1c11344c3b55b64cc3cc3410d98da86fac68eb3c /py | |
| parent | 20f1bd0a14181873ffce446d90c6125b66883926 (diff) | |
| download | micropython-39b465ca831d0ec866c2a137dccbfec7f7badfba.tar.gz micropython-39b465ca831d0ec866c2a137dccbfec7f7badfba.zip | |
py/compile2: Optimise emitter label indices to save a word of heap.
A port of d94bc675e8f3bcf37acf2d88d7c0ce0d9de68672
Diffstat (limited to 'py')
| -rw-r--r-- | py/compile2.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/py/compile2.c b/py/compile2.c index 189fa89084..6d162ca53e 100644 --- a/py/compile2.c +++ b/py/compile2.c @@ -43,6 +43,8 @@ // TODO need to mangle __attr names +#define INVALID_LABEL (0xffff) + typedef enum { // define rules with a compile function #define DEF_RULE(rule, comp, kind, ...) PN_##rule, @@ -959,7 +961,7 @@ STATIC void compile_del_stmt(compiler_t *comp, const byte *p, const byte *ptop) STATIC void compile_break_stmt(compiler_t *comp, const byte *p, const byte *ptop) { (void)ptop; - if (comp->break_label == 0) { + if (comp->break_label == INVALID_LABEL) { compile_syntax_error(comp, p, "'break' outside loop"); } assert(comp->cur_except_level >= comp->break_continue_except_level); @@ -968,7 +970,7 @@ STATIC void compile_break_stmt(compiler_t *comp, const byte *p, const byte *ptop STATIC void compile_continue_stmt(compiler_t *comp, const byte *p, const byte *ptop) { (void)ptop; - if (comp->continue_label == 0) { + if (comp->continue_label == INVALID_LABEL) { compile_syntax_error(comp, p, "'continue' outside loop"); } assert(comp->cur_except_level >= comp->break_continue_except_level); @@ -2840,7 +2842,7 @@ STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) { STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) { comp->pass = pass; comp->scope_cur = scope; - comp->next_label = 1; + comp->next_label = 0; EMIT_ARG(start_pass, pass, scope); if (comp->pass == MP_PASS_SCOPE) { @@ -3019,7 +3021,7 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) { STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind_t pass) { comp->pass = pass; comp->scope_cur = scope; - comp->next_label = 1; + comp->next_label = 0; if (scope->kind != SCOPE_FUNCTION) { compile_syntax_error(comp, NULL, "inline assembler must be a function"); @@ -3273,6 +3275,8 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f comp->source_file = source_file; comp->is_repl = is_repl; comp->co_data = parse_tree->co_data; + comp->break_label = INVALID_LABEL; + comp->continue_label = INVALID_LABEL; // create the array of scopes comp->num_scopes = pt_small_int_value(pt_next(parse_tree->root)); |