mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py: Make old_globals part of mp_code_state structure. 

Conceptually it is part of code state, so let it be allocated in the same way
as the rest of state.
This commit is contained in:
Paul Sokolovsky 2015-02-15 17:12:58 +08:00
parent e5039c6ff8
commit 53e5e0fa28
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
py/bc.h
View File

@ -45,6 +45,7 @@ typedef struct _mp_code_state {
mp_obj_t *sp; mp_obj_t *sp;
// bit 0 is saved currently_in_except_block value // bit 0 is saved currently_in_except_block value
mp_exc_stack_t *exc_sp; mp_exc_stack_t *exc_sp;
mp_obj_dict_t *old_globals;
mp_uint_t n_state; mp_uint_t n_state;
// Variable-length // Variable-length
mp_obj_t state[0]; mp_obj_t state[0];

6
py/objfun.c
View File

@ -137,7 +137,7 @@ STATIC void dump_args(const mp_obj_t *a, mp_uint_t sz) {
// With this macro you can tune the maximum number of function state bytes // With this macro you can tune the maximum number of function state bytes
// that will be allocated on the stack. Any function that needs more // that will be allocated on the stack. Any function that needs more
// than this will use the heap. // than this will use the heap.
#define VM_MAX_STATE_ON_STACK (10 * sizeof(mp_uint_t)) #define VM_MAX_STATE_ON_STACK (11 * sizeof(mp_uint_t))
// Set this to enable a simple stack overflow check. // Set this to enable a simple stack overflow check.
#define VM_DETECT_STACK_OVERFLOW (0) #define VM_DETECT_STACK_OVERFLOW (0)
@ -183,10 +183,10 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw,
mp_setup_code_state(code_state, self_in, n_args, n_kw, args); mp_setup_code_state(code_state, self_in, n_args, n_kw, args);
// execute the byte code with the correct globals context // execute the byte code with the correct globals context
mp_obj_dict_t *old_globals = mp_globals_get(); code_state->old_globals = mp_globals_get();
mp_globals_set(self->globals); mp_globals_set(self->globals);
mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode(code_state, MP_OBJ_NULL); mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode(code_state, MP_OBJ_NULL);
mp_globals_set(old_globals); mp_globals_set(code_state->old_globals);
#if VM_DETECT_STACK_OVERFLOW #if VM_DETECT_STACK_OVERFLOW
if (vm_return_kind == MP_VM_RETURN_NORMAL) { if (vm_return_kind == MP_VM_RETURN_NORMAL) {