Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This project is archived. Its data is
read-only
.
Show more breadcrumbs
card10
micropython
Commits
eeffbb69
Commit
eeffbb69
authored
Apr 17, 2014
by
Damien George
Browse files
Options
Downloads
Plain Diff
Merge pull request #507 from pfalcon/nlr-setjmp
nlr: Add implementation using setjmp/longjmp.
parents
594d0ddb
3a83b805
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
py/nlr.h
+19
-1
19 additions, 1 deletion
py/nlr.h
py/nlrsetjmp.c
+16
-0
16 additions, 0 deletions
py/nlrsetjmp.c
py/py.mk
+1
-0
1 addition, 0 deletions
py/py.mk
with
36 additions
and
1 deletion
py/nlr.h
+
19
−
1
View file @
eeffbb69
...
@@ -2,12 +2,14 @@
...
@@ -2,12 +2,14 @@
// exception handling, basically a stack of setjmp/longjmp buffers
// exception handling, basically a stack of setjmp/longjmp buffers
#include
<limits.h>
#include
<limits.h>
#include
<setjmp.h>
typedef
struct
_nlr_buf_t
nlr_buf_t
;
typedef
struct
_nlr_buf_t
nlr_buf_t
;
struct
_nlr_buf_t
{
struct
_nlr_buf_t
{
// the entries here must all be machine word size
// the entries here must all be machine word size
nlr_buf_t
*
prev
;
nlr_buf_t
*
prev
;
void
*
ret_val
;
void
*
ret_val
;
#if !MICROPY_NLR_SETJMP
#if defined(__i386__)
#if defined(__i386__)
void
*
regs
[
6
];
void
*
regs
[
6
];
#elif defined(__x86_64__)
#elif defined(__x86_64__)
...
@@ -19,13 +21,29 @@ struct _nlr_buf_t {
...
@@ -19,13 +21,29 @@ struct _nlr_buf_t {
#elif defined(__thumb2__)
#elif defined(__thumb2__)
void
*
regs
[
10
];
void
*
regs
[
10
];
#else
#else
#error Unknown arch in nlr.h
#define MICROPY_NLR_SETJMP (1)
#warning "No native NLR support for this arch, using setjmp implementation"
#endif
#endif
#if MICROPY_NLR_SETJMP
jmp_buf
jmpbuf
;
#endif
#endif
};
};
#if MICROPY_NLR_SETJMP
extern
nlr_buf_t
*
nlr_setjmp_top
;
void
nlr_setjmp_jump
(
void
*
val
)
__attribute__
((
noreturn
));
// nlr_push() must be defined as a macro, because "The stack context will be
// invalidated if the function which called setjmp() returns."
#define nlr_push(buf) ((buf)->prev = nlr_setjmp_top, nlr_setjmp_top = (buf), setjmp((buf)->jmpbuf))
#define nlr_pop() { nlr_setjmp_top = nlr_setjmp_top->prev; }
#define nlr_jump(val) nlr_setjmp_jump(val)
#else
unsigned
int
nlr_push
(
nlr_buf_t
*
);
unsigned
int
nlr_push
(
nlr_buf_t
*
);
void
nlr_pop
(
void
);
void
nlr_pop
(
void
);
void
nlr_jump
(
void
*
val
)
__attribute__
((
noreturn
));
void
nlr_jump
(
void
*
val
)
__attribute__
((
noreturn
));
#endif
// This must be implemented by a port. It's called by nlr_jump
// This must be implemented by a port. It's called by nlr_jump
// if no nlr buf has been pushed. It must not return, but rather
// if no nlr buf has been pushed. It must not return, but rather
...
...
This diff is collapsed.
Click to expand it.
py/nlrsetjmp.c
0 → 100644
+
16
−
0
View file @
eeffbb69
#include
<setjmp.h>
#include
<stdio.h>
#include
"nlr.h"
#if MICROPY_NLR_SETJMP
nlr_buf_t
*
nlr_setjmp_top
;
void
nlr_setjmp_jump
(
void
*
val
)
{
nlr_buf_t
*
buf
=
nlr_setjmp_top
;
nlr_setjmp_top
=
buf
->
prev
;
buf
->
ret_val
=
val
;
longjmp
(
buf
->
jmpbuf
,
1
);
}
#endif
This diff is collapsed.
Click to expand it.
py/py.mk
+
1
−
0
View file @
eeffbb69
...
@@ -10,6 +10,7 @@ PY_O_BASENAME = \
...
@@ -10,6 +10,7 @@ PY_O_BASENAME = \
nlrx86.o
\
nlrx86.o
\
nlrx64.o
\
nlrx64.o
\
nlrthumb.o
\
nlrthumb.o
\
nlrsetjmp.o
\
malloc.o
\
malloc.o
\
gc.o
\
gc.o
\
qstr.o
\
qstr.o
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment