7c1584aef1
When := is used in a comprehension the target variable is bound to the
parent scope, so it's either a global or a nonlocal. Prior to this commit
that was handled by simply using the parent scope's id_info for the
target variable. That's completely wrong because it uses the slot number
for the parent's Python stack to store the variable, rather than the slot
number for the comprehension. This will in most cases lead to incorrect
behaviour or memory faults.
This commit fixes the scoping of the target variable by explicitly
declaring it a global or nonlocal, depending on whether the parent is the
global scope or not. Then the id_info of the comprehension can be used to
access the target variable. This fixes a lot of cases of using := in a
comprehension.
Code size change for this commit:
bare-arm: +0 +0.000%
minimal x86: +0 +0.000%
unix x64: +152 +0.019% standard
stm32: +96 +0.024% PYBV10
cc3200: +96 +0.052%
esp8266: +196 +0.028% GENERIC
esp32: +156 +0.010% GENERIC[incl +8(data)]
mimxrt: +96 +0.027% TEENSY40
renesas-ra: +88 +0.014% RA6M2_EK
nrf: +88 +0.048% pca10040
rp2: +104 +0.020% PICO
samd: +88 +0.033% ADAFRUIT_ITSYBITSY_M4_EXPRESS
Fixes issue #10895.
Signed-off-by: Damien George <damien@micropython.org>
314 lines
14 KiB
C
314 lines
14 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#ifndef MICROPY_INCLUDED_PY_EMIT_H
|
|
#define MICROPY_INCLUDED_PY_EMIT_H
|
|
|
|
#include "py/lexer.h"
|
|
#include "py/scope.h"
|
|
|
|
/* Notes on passes:
|
|
* We don't know exactly the opcodes in pass 1 because they depend on the
|
|
* closing over of variables (LOAD_CLOSURE, BUILD_TUPLE, MAKE_CLOSURE), which
|
|
* depends on determining the scope of variables in each function, and this
|
|
* is not known until the end of pass 1.
|
|
* As a consequence, we don't know the maximum stack size until the end of pass 2.
|
|
* This is problematic for some emitters (x64) since they need to know the maximum
|
|
* stack size to compile the entry to the function, and this affects code size.
|
|
*/
|
|
|
|
typedef enum {
|
|
MP_PASS_SCOPE = 1, // work out id's and their kind, and number of labels
|
|
MP_PASS_STACK_SIZE = 2, // work out maximum stack size
|
|
MP_PASS_CODE_SIZE = 3, // work out code size and label offsets
|
|
MP_PASS_EMIT = 4, // emit code (may be run multiple times if the emitter requests it)
|
|
} pass_kind_t;
|
|
|
|
#define MP_EMIT_STAR_FLAG_SINGLE (0x01)
|
|
#define MP_EMIT_STAR_FLAG_DOUBLE (0x02)
|
|
|
|
#define MP_EMIT_BREAK_FROM_FOR (0x8000)
|
|
|
|
// Kind for emit_id_ops->local()
|
|
#define MP_EMIT_IDOP_LOCAL_FAST (0)
|
|
#define MP_EMIT_IDOP_LOCAL_DEREF (1)
|
|
|
|
// Kind for emit_id_ops->global()
|
|
#define MP_EMIT_IDOP_GLOBAL_NAME (0)
|
|
#define MP_EMIT_IDOP_GLOBAL_GLOBAL (1)
|
|
|
|
// Kind for emit->import()
|
|
#define MP_EMIT_IMPORT_NAME (0)
|
|
#define MP_EMIT_IMPORT_FROM (1)
|
|
#define MP_EMIT_IMPORT_STAR (2)
|
|
|
|
// Kind for emit->subscr()
|
|
#define MP_EMIT_SUBSCR_LOAD (0)
|
|
#define MP_EMIT_SUBSCR_STORE (1)
|
|
#define MP_EMIT_SUBSCR_DELETE (2)
|
|
|
|
// Kind for emit->attr()
|
|
#define MP_EMIT_ATTR_LOAD (0)
|
|
#define MP_EMIT_ATTR_STORE (1)
|
|
#define MP_EMIT_ATTR_DELETE (2)
|
|
|
|
// Kind for emit->setup_block()
|
|
#define MP_EMIT_SETUP_BLOCK_WITH (0)
|
|
#define MP_EMIT_SETUP_BLOCK_EXCEPT (1)
|
|
#define MP_EMIT_SETUP_BLOCK_FINALLY (2)
|
|
|
|
// Kind for emit->build()
|
|
#define MP_EMIT_BUILD_TUPLE (0)
|
|
#define MP_EMIT_BUILD_LIST (1)
|
|
#define MP_EMIT_BUILD_MAP (2)
|
|
#define MP_EMIT_BUILD_SET (3)
|
|
#define MP_EMIT_BUILD_SLICE (4)
|
|
|
|
// Kind for emit->yield()
|
|
#define MP_EMIT_YIELD_VALUE (0)
|
|
#define MP_EMIT_YIELD_FROM (1)
|
|
|
|
typedef struct _emit_t emit_t;
|
|
|
|
typedef struct _mp_emit_common_t {
|
|
pass_kind_t pass;
|
|
uint16_t ct_cur_child;
|
|
mp_raw_code_t **children;
|
|
#if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
|
|
mp_map_t qstr_map;
|
|
#endif
|
|
mp_obj_list_t const_obj_list;
|
|
} mp_emit_common_t;
|
|
|
|
typedef struct _mp_emit_method_table_id_ops_t {
|
|
void (*local)(emit_t *emit, qstr qst, mp_uint_t local_num, int kind);
|
|
void (*global)(emit_t *emit, qstr qst, int kind);
|
|
} mp_emit_method_table_id_ops_t;
|
|
|
|
typedef struct _emit_method_table_t {
|
|
#if MICROPY_DYNAMIC_COMPILER
|
|
emit_t *(*emit_new)(mp_emit_common_t * emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
void (*emit_free)(emit_t *emit);
|
|
#endif
|
|
|
|
void (*start_pass)(emit_t *emit, pass_kind_t pass, scope_t *scope);
|
|
bool (*end_pass)(emit_t *emit);
|
|
void (*adjust_stack_size)(emit_t *emit, mp_int_t delta);
|
|
void (*set_source_line)(emit_t *emit, mp_uint_t line);
|
|
|
|
mp_emit_method_table_id_ops_t load_id;
|
|
mp_emit_method_table_id_ops_t store_id;
|
|
mp_emit_method_table_id_ops_t delete_id;
|
|
|
|
void (*label_assign)(emit_t *emit, mp_uint_t l);
|
|
void (*import)(emit_t *emit, qstr qst, int kind);
|
|
void (*load_const_tok)(emit_t *emit, mp_token_kind_t tok);
|
|
void (*load_const_small_int)(emit_t *emit, mp_int_t arg);
|
|
void (*load_const_str)(emit_t *emit, qstr qst);
|
|
void (*load_const_obj)(emit_t *emit, mp_obj_t obj);
|
|
void (*load_null)(emit_t *emit);
|
|
void (*load_method)(emit_t *emit, qstr qst, bool is_super);
|
|
void (*load_build_class)(emit_t *emit);
|
|
void (*subscr)(emit_t *emit, int kind);
|
|
void (*attr)(emit_t *emit, qstr qst, int kind);
|
|
void (*dup_top)(emit_t *emit);
|
|
void (*dup_top_two)(emit_t *emit);
|
|
void (*pop_top)(emit_t *emit);
|
|
void (*rot_two)(emit_t *emit);
|
|
void (*rot_three)(emit_t *emit);
|
|
void (*jump)(emit_t *emit, mp_uint_t label);
|
|
void (*pop_jump_if)(emit_t *emit, bool cond, mp_uint_t label);
|
|
void (*jump_if_or_pop)(emit_t *emit, bool cond, mp_uint_t label);
|
|
void (*unwind_jump)(emit_t *emit, mp_uint_t label, mp_uint_t except_depth);
|
|
void (*setup_block)(emit_t *emit, mp_uint_t label, int kind);
|
|
void (*with_cleanup)(emit_t *emit, mp_uint_t label);
|
|
void (*end_finally)(emit_t *emit);
|
|
void (*get_iter)(emit_t *emit, bool use_stack);
|
|
void (*for_iter)(emit_t *emit, mp_uint_t label);
|
|
void (*for_iter_end)(emit_t *emit);
|
|
void (*pop_except_jump)(emit_t *emit, mp_uint_t label, bool within_exc_handler);
|
|
void (*unary_op)(emit_t *emit, mp_unary_op_t op);
|
|
void (*binary_op)(emit_t *emit, mp_binary_op_t op);
|
|
void (*build)(emit_t *emit, mp_uint_t n_args, int kind);
|
|
void (*store_map)(emit_t *emit);
|
|
void (*store_comp)(emit_t *emit, scope_kind_t kind, mp_uint_t set_stack_index);
|
|
void (*unpack_sequence)(emit_t *emit, mp_uint_t n_args);
|
|
void (*unpack_ex)(emit_t *emit, mp_uint_t n_left, mp_uint_t n_right);
|
|
void (*make_function)(emit_t *emit, scope_t *scope, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults);
|
|
void (*make_closure)(emit_t *emit, scope_t *scope, mp_uint_t n_closed_over, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults);
|
|
void (*call_function)(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags);
|
|
void (*call_method)(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags);
|
|
void (*return_value)(emit_t *emit);
|
|
void (*raise_varargs)(emit_t *emit, mp_uint_t n_args);
|
|
void (*yield)(emit_t *emit, int kind);
|
|
|
|
// these methods are used to control entry to/exit from an exception handler
|
|
// they may or may not emit code
|
|
void (*start_except_handler)(emit_t *emit);
|
|
void (*end_except_handler)(emit_t *emit);
|
|
} emit_method_table_t;
|
|
|
|
#if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
|
|
qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst);
|
|
#else
|
|
static inline qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst) {
|
|
return qst;
|
|
}
|
|
#endif
|
|
|
|
size_t mp_emit_common_use_const_obj(mp_emit_common_t *emit, mp_obj_t const_obj);
|
|
|
|
static inline size_t mp_emit_common_alloc_const_child(mp_emit_common_t *emit, mp_raw_code_t *rc) {
|
|
if (emit->pass == MP_PASS_EMIT) {
|
|
emit->children[emit->ct_cur_child] = rc;
|
|
}
|
|
return emit->ct_cur_child++;
|
|
}
|
|
|
|
static inline void mp_emit_common_get_id_for_load(scope_t *scope, qstr qst) {
|
|
scope_find_or_add_id(scope, qst, ID_INFO_KIND_GLOBAL_IMPLICIT);
|
|
}
|
|
|
|
id_info_t *mp_emit_common_get_id_for_modification(scope_t *scope, qstr qst);
|
|
void mp_emit_common_id_op(emit_t *emit, const mp_emit_method_table_id_ops_t *emit_method_table, scope_t *scope, qstr qst);
|
|
|
|
extern const emit_method_table_t emit_bc_method_table;
|
|
extern const emit_method_table_t emit_native_x64_method_table;
|
|
extern const emit_method_table_t emit_native_x86_method_table;
|
|
extern const emit_method_table_t emit_native_thumb_method_table;
|
|
extern const emit_method_table_t emit_native_arm_method_table;
|
|
extern const emit_method_table_t emit_native_xtensa_method_table;
|
|
extern const emit_method_table_t emit_native_xtensawin_method_table;
|
|
|
|
extern const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_load_id_ops;
|
|
extern const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_store_id_ops;
|
|
extern const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_delete_id_ops;
|
|
|
|
emit_t *emit_bc_new(mp_emit_common_t *emit_common);
|
|
emit_t *emit_native_x64_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
emit_t *emit_native_x86_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
emit_t *emit_native_thumb_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
emit_t *emit_native_arm_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
emit_t *emit_native_xtensa_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
emit_t *emit_native_xtensawin_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
|
|
|
|
void emit_bc_set_max_num_labels(emit_t *emit, mp_uint_t max_num_labels);
|
|
|
|
void emit_bc_free(emit_t *emit);
|
|
void emit_native_x64_free(emit_t *emit);
|
|
void emit_native_x86_free(emit_t *emit);
|
|
void emit_native_thumb_free(emit_t *emit);
|
|
void emit_native_arm_free(emit_t *emit);
|
|
void emit_native_xtensa_free(emit_t *emit);
|
|
void emit_native_xtensawin_free(emit_t *emit);
|
|
|
|
void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope);
|
|
bool mp_emit_bc_end_pass(emit_t *emit);
|
|
void mp_emit_bc_adjust_stack_size(emit_t *emit, mp_int_t delta);
|
|
void mp_emit_bc_set_source_line(emit_t *emit, mp_uint_t line);
|
|
|
|
void mp_emit_bc_load_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind);
|
|
void mp_emit_bc_load_global(emit_t *emit, qstr qst, int kind);
|
|
void mp_emit_bc_store_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind);
|
|
void mp_emit_bc_store_global(emit_t *emit, qstr qst, int kind);
|
|
void mp_emit_bc_delete_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind);
|
|
void mp_emit_bc_delete_global(emit_t *emit, qstr qst, int kind);
|
|
|
|
void mp_emit_bc_label_assign(emit_t *emit, mp_uint_t l);
|
|
void mp_emit_bc_import(emit_t *emit, qstr qst, int kind);
|
|
void mp_emit_bc_load_const_tok(emit_t *emit, mp_token_kind_t tok);
|
|
void mp_emit_bc_load_const_small_int(emit_t *emit, mp_int_t arg);
|
|
void mp_emit_bc_load_const_str(emit_t *emit, qstr qst);
|
|
void mp_emit_bc_load_const_obj(emit_t *emit, mp_obj_t obj);
|
|
void mp_emit_bc_load_null(emit_t *emit);
|
|
void mp_emit_bc_load_method(emit_t *emit, qstr qst, bool is_super);
|
|
void mp_emit_bc_load_build_class(emit_t *emit);
|
|
void mp_emit_bc_subscr(emit_t *emit, int kind);
|
|
void mp_emit_bc_attr(emit_t *emit, qstr qst, int kind);
|
|
void mp_emit_bc_dup_top(emit_t *emit);
|
|
void mp_emit_bc_dup_top_two(emit_t *emit);
|
|
void mp_emit_bc_pop_top(emit_t *emit);
|
|
void mp_emit_bc_rot_two(emit_t *emit);
|
|
void mp_emit_bc_rot_three(emit_t *emit);
|
|
void mp_emit_bc_jump(emit_t *emit, mp_uint_t label);
|
|
void mp_emit_bc_pop_jump_if(emit_t *emit, bool cond, mp_uint_t label);
|
|
void mp_emit_bc_jump_if_or_pop(emit_t *emit, bool cond, mp_uint_t label);
|
|
void mp_emit_bc_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_depth);
|
|
void mp_emit_bc_setup_block(emit_t *emit, mp_uint_t label, int kind);
|
|
void mp_emit_bc_with_cleanup(emit_t *emit, mp_uint_t label);
|
|
void mp_emit_bc_end_finally(emit_t *emit);
|
|
void mp_emit_bc_get_iter(emit_t *emit, bool use_stack);
|
|
void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label);
|
|
void mp_emit_bc_for_iter_end(emit_t *emit);
|
|
void mp_emit_bc_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler);
|
|
void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op);
|
|
void mp_emit_bc_binary_op(emit_t *emit, mp_binary_op_t op);
|
|
void mp_emit_bc_build(emit_t *emit, mp_uint_t n_args, int kind);
|
|
void mp_emit_bc_store_map(emit_t *emit);
|
|
void mp_emit_bc_store_comp(emit_t *emit, scope_kind_t kind, mp_uint_t list_stack_index);
|
|
void mp_emit_bc_unpack_sequence(emit_t *emit, mp_uint_t n_args);
|
|
void mp_emit_bc_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_right);
|
|
void mp_emit_bc_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults);
|
|
void mp_emit_bc_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_closed_over, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults);
|
|
void mp_emit_bc_call_function(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags);
|
|
void mp_emit_bc_call_method(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags);
|
|
void mp_emit_bc_return_value(emit_t *emit);
|
|
void mp_emit_bc_raise_varargs(emit_t *emit, mp_uint_t n_args);
|
|
void mp_emit_bc_yield(emit_t *emit, int kind);
|
|
void mp_emit_bc_start_except_handler(emit_t *emit);
|
|
void mp_emit_bc_end_except_handler(emit_t *emit);
|
|
|
|
typedef struct _emit_inline_asm_t emit_inline_asm_t;
|
|
|
|
typedef struct _emit_inline_asm_method_table_t {
|
|
#if MICROPY_DYNAMIC_COMPILER
|
|
emit_inline_asm_t *(*asm_new)(mp_uint_t max_num_labels);
|
|
void (*asm_free)(emit_inline_asm_t *emit);
|
|
#endif
|
|
|
|
void (*start_pass)(emit_inline_asm_t *emit, pass_kind_t pass, mp_obj_t *error_slot);
|
|
void (*end_pass)(emit_inline_asm_t *emit, mp_uint_t type_sig);
|
|
mp_uint_t (*count_params)(emit_inline_asm_t *emit, mp_uint_t n_params, mp_parse_node_t *pn_params);
|
|
bool (*label)(emit_inline_asm_t *emit, mp_uint_t label_num, qstr label_id);
|
|
void (*op)(emit_inline_asm_t *emit, qstr op, mp_uint_t n_args, mp_parse_node_t *pn_args);
|
|
} emit_inline_asm_method_table_t;
|
|
|
|
extern const emit_inline_asm_method_table_t emit_inline_thumb_method_table;
|
|
extern const emit_inline_asm_method_table_t emit_inline_xtensa_method_table;
|
|
|
|
emit_inline_asm_t *emit_inline_thumb_new(mp_uint_t max_num_labels);
|
|
emit_inline_asm_t *emit_inline_xtensa_new(mp_uint_t max_num_labels);
|
|
|
|
void emit_inline_thumb_free(emit_inline_asm_t *emit);
|
|
void emit_inline_xtensa_free(emit_inline_asm_t *emit);
|
|
|
|
#if MICROPY_WARNINGS
|
|
void mp_emitter_warning(pass_kind_t pass, const char *msg);
|
|
#else
|
|
#define mp_emitter_warning(pass, msg)
|
|
#endif
|
|
|
|
#endif // MICROPY_INCLUDED_PY_EMIT_H
|