summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ports/unix/coverage.c2
-rw-r--r--py/bc.c2
-rw-r--r--py/bc.h9
-rw-r--r--py/objgenerator.c4
-rw-r--r--py/vm.c14
5 files changed, 19 insertions, 12 deletions
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index b6ebc9fb7..6623cb464 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -385,7 +385,7 @@ STATIC mp_obj_t extra_coverage(void) {
code_state->fun_bc = &fun_bc;
code_state->ip = (const byte*)"\x00"; // just needed for an invalid opcode
code_state->sp = &code_state->state[0];
- code_state->exc_sp = NULL;
+ code_state->exc_sp_idx = 0;
code_state->old_globals = NULL;
mp_vm_return_kind_t ret = mp_execute_bytecode(code_state, MP_OBJ_NULL);
mp_printf(&mp_plat_print, "%d %d\n", ret, mp_obj_get_type(code_state->state[0]) == &mp_type_NotImplementedError);
diff --git a/py/bc.c b/py/bc.c
index 6887dc438..c32d5c415 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -133,7 +133,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
size_t n_def_pos_args = *code_state->ip++;
code_state->sp = &code_state->state[0] - 1;
- code_state->exc_sp = (mp_exc_stack_t*)(code_state->state + n_state) - 1;
+ code_state->exc_sp_idx = 0;
// zero out the local stack to begin with
memset(code_state->state, 0, n_state * sizeof(*code_state->state));
diff --git a/py/bc.h b/py/bc.h
index dafd74376..1d28dcc4f 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -60,6 +60,13 @@
// const0 : obj
// constN : obj
+// Sentinel value for mp_code_state_t.exc_sp_idx
+#define MP_CODE_STATE_EXC_SP_IDX_SENTINEL ((uint16_t)-1)
+
+// To convert mp_code_state_t.exc_sp_idx to/from a pointer to mp_exc_stack_t
+#define MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp) ((exc_sp) + 1 - (exc_stack))
+#define MP_CODE_STATE_EXC_SP_IDX_TO_PTR(exc_stack, exc_sp_idx) ((exc_stack) + (exc_sp_idx) - 1)
+
typedef struct _mp_bytecode_prelude_t {
uint n_state;
uint n_exc_stack;
@@ -92,7 +99,7 @@ typedef struct _mp_code_state_t {
mp_obj_fun_bc_t *fun_bc;
const byte *ip;
mp_obj_t *sp;
- mp_exc_stack_t *exc_sp;
+ uint16_t exc_sp_idx;
mp_obj_dict_t *old_globals;
#if MICROPY_STACKLESS
struct _mp_code_state_t *prev;
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 62e644616..d32a74f3f 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -102,7 +102,7 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
mp_setup_code_state(&o->code_state, n_args, n_kw, args);
// Indicate we are a native function, which doesn't use this variable
- o->code_state.exc_sp = NULL;
+ o->code_state.exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_SENTINEL;
// Prepare the generator instance for execution
uintptr_t start_offset = ((uintptr_t*)self_fun->bytecode)[1];
@@ -172,7 +172,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
mp_vm_return_kind_t ret_kind;
#if MICROPY_EMIT_NATIVE
- if (self->code_state.exc_sp == NULL) {
+ if (self->code_state.exc_sp_idx == MP_CODE_STATE_EXC_SP_IDX_SENTINEL) {
// A native generator, with entry point 2 words into the "bytecode" pointer
typedef uintptr_t (*mp_fun_native_gen_t)(void*, mp_obj_t);
mp_fun_native_gen_t fun = MICROPY_MAKE_POINTER_CALLABLE((const void*)(self->code_state.fun_bc->bytecode + 2 * sizeof(uintptr_t)));
diff --git a/py/vm.c b/py/vm.c
index 16b1348b4..c0cd9ffbf 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -234,7 +234,7 @@ FRAME_SETUP();
}
// variables that are visible to the exception handler (declared volatile)
- mp_exc_stack_t *volatile exc_sp = MP_TAGPTR_PTR(code_state->exc_sp); // stack grows up, exc_sp points to top of stack
+ mp_exc_stack_t *volatile exc_sp = MP_CODE_STATE_EXC_SP_IDX_TO_PTR(exc_stack, code_state->exc_sp_idx); // stack grows up, exc_sp points to top of stack
#if MICROPY_PY_THREAD_GIL && MICROPY_PY_THREAD_GIL_VM_DIVISOR
// This needs to be volatile and outside the VM loop so it persists across handling
@@ -953,7 +953,7 @@ unwind_jump:;
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
code_state->ip = ip;
code_state->sp = sp;
- code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, 0);
+ code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
mp_code_state_t *new_state = mp_obj_fun_bc_prepare_codestate(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1);
#if !MICROPY_ENABLE_PYSTACK
if (new_state == NULL) {
@@ -990,7 +990,7 @@ unwind_jump:;
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
code_state->ip = ip;
code_state->sp = sp;
- code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, 0);
+ code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
mp_call_args_t out_args;
mp_call_prepare_args_n_kw_var(false, unum, sp, &out_args);
@@ -1034,7 +1034,7 @@ unwind_jump:;
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
code_state->ip = ip;
code_state->sp = sp;
- code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, 0);
+ code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
size_t n_args = unum & 0xff;
size_t n_kw = (unum >> 8) & 0xff;
@@ -1075,7 +1075,7 @@ unwind_jump:;
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
code_state->ip = ip;
code_state->sp = sp;
- code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, 0);
+ code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
mp_call_args_t out_args;
mp_call_prepare_args_n_kw_var(true, unum, sp, &out_args);
@@ -1197,7 +1197,7 @@ yield:
nlr_pop();
code_state->ip = ip;
code_state->sp = sp;
- code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, 0);
+ code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
FRAME_LEAVE();
return MP_VM_RETURN_YIELD;
@@ -1503,7 +1503,7 @@ unwind_loop:
fastn = &code_state->state[n_state - 1];
exc_stack = (mp_exc_stack_t*)(code_state->state + n_state);
// variables that are visible to the exception handler (declared volatile)
- exc_sp = MP_TAGPTR_PTR(code_state->exc_sp); // stack grows up, exc_sp points to top of stack
+ exc_sp = MP_CODE_STATE_EXC_SP_IDX_TO_PTR(exc_stack, code_state->exc_sp_idx); // stack grows up, exc_sp points to top of stack
goto unwind_loop;
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-30 03:38:43 +0000