diff options
author | Damien George <damien.p.george@gmail.com> | 2017-12-28 16:46:30 +1100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2017-12-28 16:46:30 +1100 |
commit | b25f92160b318a096c516c430afde5472a944c19 (patch) | |
tree | 18022d1de245f9fca253f2a8076c4e8c79f6fca8 /py/nlrx64.c | |
parent | 5bf8e85fc828974199d469db711aa2f9649c467b (diff) |
py/nlr: Factor out common NLR code to macro and generic funcs in nlr.c.
Each NLR implementation (Thumb, x86, x64, xtensa, setjmp) duplicates a lot
of the NLR code, specifically that dealing with pushing and popping the NLR
pointer to maintain the linked-list of NLR buffers. This patch factors all
of that code out of the specific implementations into generic functions in
nlr.c, along with a helper macro in nlr.h. This eliminates duplicated
code.
Diffstat (limited to 'py/nlrx64.c')
-rw-r--r-- | py/nlrx64.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/py/nlrx64.c b/py/nlrx64.c index 927b21591..663a457b7 100644 --- a/py/nlrx64.c +++ b/py/nlrx64.c @@ -88,29 +88,8 @@ unsigned int nlr_push(nlr_buf_t *nlr) { return 0; // needed to silence compiler warning } -__attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr) { - nlr_buf_t **top = &MP_STATE_THREAD(nlr_top); - nlr->prev = *top; - MP_NLR_SAVE_PYSTACK(nlr); - *top = nlr; - return 0; // normal return -} - -void nlr_pop(void) { - nlr_buf_t **top = &MP_STATE_THREAD(nlr_top); - *top = (*top)->prev; -} - NORETURN void nlr_jump(void *val) { - nlr_buf_t **top_ptr = &MP_STATE_THREAD(nlr_top); - nlr_buf_t *top = *top_ptr; - if (top == NULL) { - nlr_jump_fail(val); - } - - top->ret_val = val; - MP_NLR_RESTORE_PYSTACK(top); - *top_ptr = top->prev; + MP_NLR_JUMP_HEAD(val, top) __asm volatile ( "movq %0, %%rcx \n" // %rcx points to nlr_buf |