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

vm: Factor out exception block setup to a macro. 

Will be reused in WITH bytecodes.
This commit is contained in:
Paul Sokolovsky 2014-03-29 02:49:07 +02:00
parent c47fd2da8e
commit 4fff26a35c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
py/vm.c
View File

@ -44,6 +44,14 @@ typedef enum {
#define TOP() (*sp) #define TOP() (*sp)
#define SET_TOP(val) *sp = (val) #define SET_TOP(val) *sp = (val)
#define SETUP_BLOCK() \
DECODE_ULABEL; /* except labels are always forward */ \
++exc_sp; \
exc_sp->opcode = op; \
exc_sp->handler = ip + unum; \
exc_sp->val_sp = MP_TAGPTR_MAKE(sp, currently_in_except_block); \
currently_in_except_block = 0; /* in a try block now */
mp_vm_return_kind_t mp_execute_byte_code(const byte *code, const mp_obj_t *args, uint n_args, const mp_obj_t *args2, uint n_args2, mp_obj_t *ret) { mp_vm_return_kind_t mp_execute_byte_code(const byte *code, const mp_obj_t *args, uint n_args, const mp_obj_t *args2, uint n_args2, mp_obj_t *ret) {
const byte *ip = code; const byte *ip = code;
@ -398,12 +406,7 @@ unwind_jump:
// matched against: POP_BLOCK or POP_EXCEPT (anything else?) // matched against: POP_BLOCK or POP_EXCEPT (anything else?)
case MP_BC_SETUP_EXCEPT: case MP_BC_SETUP_EXCEPT:
case MP_BC_SETUP_FINALLY: case MP_BC_SETUP_FINALLY:
DECODE_ULABEL; // except labels are always forward SETUP_BLOCK();
++exc_sp;
exc_sp->opcode = op;
exc_sp->handler = ip + unum;
exc_sp->val_sp = MP_TAGPTR_MAKE(sp, currently_in_except_block);
currently_in_except_block = 0; // in a try block now
break; break;
case MP_BC_END_FINALLY: case MP_BC_END_FINALLY: