a3de776486
Prior to this patch, native code would use a full nlr_buf_t for each exception handler (try-except, try-finally, with). For nested exception handlers this would use a lot of C stack and be rather inefficient. This patch changes how exceptions are handled in native code by setting up only a single nlr_buf_t context for the entire function, and then manages a state machine (using the PC) to work out which exception handler to run when an exception is raised by an nlr_jump. This keeps the C stack usage at a constant level regardless of the depth of Python exception blocks. The patch also fixes an existing bug when local variables are written to within an exception handler, then their value was incorrectly restored if an exception was raised (since the nlr_jump would restore register values, back to the point of the nlr_push). And it also gets nested try-finally+with working with the viper emitter. Broadly speaking, efficiency of executing native code that doesn't use any exception blocks is unchanged, and emitted code size is only slightly increased for such function. C stack usage of all native functions is either equal or less than before. Emitted code size for native functions that use exception blocks is increased by roughly 10% (due in part to fixing of above-mentioned bugs). But, most importantly, this patch allows to implement more Python features in native code, like unwind jumps and yielding from within nested exception blocks.
72 lines
1.9 KiB
C
72 lines
1.9 KiB
C
// x86 specific stuff
|
|
|
|
#include "py/mpconfig.h"
|
|
#include "py/runtime0.h"
|
|
|
|
#if MICROPY_EMIT_X86
|
|
|
|
// This is defined so that the assembler exports generic assembler API macros
|
|
#define GENERIC_ASM_API (1)
|
|
#include "py/asmx86.h"
|
|
|
|
// Word index of REG_LOCAL_1(=ebx) in nlr_buf_t
|
|
#define NLR_BUF_IDX_LOCAL_1 (5)
|
|
|
|
// x86 needs a table to know how many args a given function has
|
|
STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
|
|
[MP_F_CONVERT_OBJ_TO_NATIVE] = 2,
|
|
[MP_F_CONVERT_NATIVE_TO_OBJ] = 2,
|
|
[MP_F_LOAD_NAME] = 1,
|
|
[MP_F_LOAD_GLOBAL] = 1,
|
|
[MP_F_LOAD_BUILD_CLASS] = 0,
|
|
[MP_F_LOAD_ATTR] = 2,
|
|
[MP_F_LOAD_METHOD] = 3,
|
|
[MP_F_LOAD_SUPER_METHOD] = 2,
|
|
[MP_F_STORE_NAME] = 2,
|
|
[MP_F_STORE_GLOBAL] = 2,
|
|
[MP_F_STORE_ATTR] = 3,
|
|
[MP_F_OBJ_SUBSCR] = 3,
|
|
[MP_F_OBJ_IS_TRUE] = 1,
|
|
[MP_F_UNARY_OP] = 2,
|
|
[MP_F_BINARY_OP] = 3,
|
|
[MP_F_BUILD_TUPLE] = 2,
|
|
[MP_F_BUILD_LIST] = 2,
|
|
[MP_F_LIST_APPEND] = 2,
|
|
[MP_F_BUILD_MAP] = 1,
|
|
[MP_F_STORE_MAP] = 3,
|
|
#if MICROPY_PY_BUILTINS_SET
|
|
[MP_F_BUILD_SET] = 2,
|
|
[MP_F_STORE_SET] = 2,
|
|
#endif
|
|
[MP_F_MAKE_FUNCTION_FROM_RAW_CODE] = 3,
|
|
[MP_F_NATIVE_CALL_FUNCTION_N_KW] = 3,
|
|
[MP_F_CALL_METHOD_N_KW] = 3,
|
|
[MP_F_CALL_METHOD_N_KW_VAR] = 3,
|
|
[MP_F_NATIVE_GETITER] = 2,
|
|
[MP_F_NATIVE_ITERNEXT] = 1,
|
|
[MP_F_NLR_PUSH] = 1,
|
|
[MP_F_NLR_POP] = 0,
|
|
[MP_F_NATIVE_RAISE] = 1,
|
|
[MP_F_IMPORT_NAME] = 3,
|
|
[MP_F_IMPORT_FROM] = 2,
|
|
[MP_F_IMPORT_ALL] = 1,
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
|
[MP_F_NEW_SLICE] = 3,
|
|
#endif
|
|
[MP_F_UNPACK_SEQUENCE] = 3,
|
|
[MP_F_UNPACK_EX] = 3,
|
|
[MP_F_DELETE_NAME] = 1,
|
|
[MP_F_DELETE_GLOBAL] = 1,
|
|
[MP_F_NEW_CELL] = 1,
|
|
[MP_F_MAKE_CLOSURE_FROM_RAW_CODE] = 3,
|
|
[MP_F_SETUP_CODE_STATE] = 5,
|
|
[MP_F_SMALL_INT_FLOOR_DIVIDE] = 2,
|
|
[MP_F_SMALL_INT_MODULO] = 2,
|
|
};
|
|
|
|
#define N_X86 (1)
|
|
#define EXPORT_FUN(name) emit_native_x86_##name
|
|
#include "py/emitnative.c"
|
|
|
|
#endif
|