py/nlrsetjmp: Use MP_NLR_JUMP_HEAD macro to simplify code.

Signed-off-by: Damien George <[email protected]>
picoscratch · Jun 2, 2023 · 24aa81e · 24aa81e
1 parent a61d40e
commit 24aa81e
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/py/nlrsetjmp.c b/py/nlrsetjmp.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2017 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,14 +29,7 @@
 #if MICROPY_NLR_SETJMP
 
 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);
     longjmp(top->jmpbuf, 1);
 }