Skip to content

Linked in fb_alloc_mark #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2017
Merged

Linked in fb_alloc_mark #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion py/nlr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,32 @@ NORETURN void nlr_jump(void *val);
void nlr_jump_fail(void *val);

// use nlr_raise instead of nlr_jump so that debugging is easier
extern void fb_alloc_free_till_mark();
#ifndef DEBUG
#define nlr_raise(val) nlr_jump(MP_OBJ_TO_PTR(val))
#define nlr_raise(val) \
do { \
fb_alloc_free_till_mark(); \
nlr_jump(MP_OBJ_TO_PTR(val)); \
} while (0)
// fb_alloc_mark() is the only allowed caller.
#define nlr_raise_for_fb_alloc_mark(val) \
do { \
nlr_jump(MP_OBJ_TO_PTR(val)); \
} while (0)
#else
#include "mpstate.h"
#define nlr_raise(val) \
do { \
fb_alloc_free_till_mark(); \
/*printf("nlr_raise: nlr_top=%p\n", MP_STATE_VM(nlr_top)); \
fflush(stdout);*/ \
void *_val = MP_OBJ_TO_PTR(val); \
assert(_val != NULL); \
assert(mp_obj_is_exception_instance(val)); \
nlr_jump(_val); \
} while (0)
// fb_alloc_mark() is the only allowed caller.
#define nlr_raise_for_fb_alloc_mark(val) \
do { \
/*printf("nlr_raise: nlr_top=%p\n", MP_STATE_VM(nlr_top)); \
fflush(stdout);*/ \
Expand Down