py: Move global variable nlr_top to one place, in a .c file.

This reduces dependency on assembler, and allows to consolidate global
variables in the future.

1 files changed, 5 insertions, 4 deletions

diff --git a/py/nlrsetjmp.c b/py/nlrsetjmp.c
index 176138db0..76d718bba 100644
--- a/py/nlrsetjmp.c
+++ b/py/nlrsetjmp.c
@@ -26,13 +26,14 @@
 
 #include "py/nlr.h"
 
-#if MICROPY_NLR_SETJMP
+// this global variable is used for all nlr implementations
+nlr_buf_t *nlr_top;
 
-nlr_buf_t *nlr_setjmp_top;
+#if MICROPY_NLR_SETJMP
 
 void nlr_setjmp_jump(void *val) {
-    nlr_buf_t *buf = nlr_setjmp_top;
-    nlr_setjmp_top = buf->prev;
+    nlr_buf_t *buf = nlr_top;
+    nlr_top = buf->prev;
     buf->ret_val = val;
     longjmp(buf->jmpbuf, 1);
 }