2014-05-03 23:27:38 +01:00
|
|
|
/*
|
2017-06-30 08:22:17 +01:00
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
2014-05-03 23:27:38 +01:00
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 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
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
all: Unify header guard usage.
The code conventions suggest using header guards, but do not define how
those should look like and instead point to existing files. However, not
all existing files follow the same scheme, sometimes omitting header guards
altogether, sometimes using non-standard names, making it easy to
accidentally pick a "wrong" example.
This commit ensures that all header files of the MicroPython project (that
were not simply copied from somewhere else) follow the same pattern, that
was already present in the majority of files, especially in the py folder.
The rules are as follows.
Naming convention:
* start with the words MICROPY_INCLUDED
* contain the full path to the file
* replace special characters with _
In addition, there are no empty lines before #ifndef, between #ifndef and
one empty line before #endif. #endif is followed by a comment containing
the name of the guard macro.
py/grammar.h cannot use header guards by design, since it has to be
included multiple times in a single C file. Several other files also do not
need header guards as they are only used internally and guaranteed to be
included only once:
* MICROPY_MPHALPORT_H
* mpconfigboard.h
* mpconfigport.h
* mpthreadport.h
* pin_defs_*.h
* qstrdefs*.h
2017-06-29 22:14:58 +01:00
|
|
|
#ifndef MICROPY_INCLUDED_PY_NLR_H
|
|
|
|
#define MICROPY_INCLUDED_PY_NLR_H
|
2014-05-03 23:27:38 +01:00
|
|
|
|
2013-10-15 22:25:17 +01:00
|
|
|
// non-local return
|
|
|
|
// exception handling, basically a stack of setjmp/longjmp buffers
|
|
|
|
|
|
|
|
#include <limits.h>
|
2014-06-19 17:47:38 +01:00
|
|
|
#include <assert.h>
|
2013-10-15 22:25:17 +01:00
|
|
|
|
2015-01-01 20:27:54 +00:00
|
|
|
#include "py/mpconfig.h"
|
|
|
|
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS_X86 (6)
|
|
|
|
#define MICROPY_NLR_NUM_REGS_X64 (8)
|
|
|
|
#define MICROPY_NLR_NUM_REGS_X64_WIN (10)
|
|
|
|
#define MICROPY_NLR_NUM_REGS_ARM_THUMB (10)
|
|
|
|
#define MICROPY_NLR_NUM_REGS_ARM_THUMB_FP (10 + 6)
|
2021-02-17 23:28:42 +00:00
|
|
|
#define MICROPY_NLR_NUM_REGS_AARCH64 (13)
|
2022-01-07 20:57:20 +00:00
|
|
|
#define MICROPY_NLR_NUM_REGS_MIPS (13)
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS_XTENSA (10)
|
2019-09-13 04:15:12 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS_XTENSAWIN (17)
|
2019-09-18 04:39:01 +01:00
|
|
|
|
2020-02-26 00:58:42 +00:00
|
|
|
// *FORMAT-OFF*
|
|
|
|
|
2017-12-28 05:18:39 +00:00
|
|
|
// If MICROPY_NLR_SETJMP is not enabled then auto-detect the machine arch
|
|
|
|
#if !MICROPY_NLR_SETJMP
|
2017-12-26 09:52:09 +00:00
|
|
|
// A lot of nlr-related things need different treatment on Windows
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
|
|
|
#define MICROPY_NLR_OS_WINDOWS 1
|
|
|
|
#else
|
|
|
|
#define MICROPY_NLR_OS_WINDOWS 0
|
|
|
|
#endif
|
2014-02-27 16:01:43 +00:00
|
|
|
#if defined(__i386__)
|
2017-12-28 05:18:39 +00:00
|
|
|
#define MICROPY_NLR_X86 (1)
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_X86)
|
2014-02-27 16:01:43 +00:00
|
|
|
#elif defined(__x86_64__)
|
2017-12-28 05:18:39 +00:00
|
|
|
#define MICROPY_NLR_X64 (1)
|
2017-12-26 09:52:09 +00:00
|
|
|
#if MICROPY_NLR_OS_WINDOWS
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_X64_WIN)
|
2017-12-28 05:18:39 +00:00
|
|
|
#else
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_X64)
|
2017-12-28 05:18:39 +00:00
|
|
|
#endif
|
2014-06-21 23:14:28 +01:00
|
|
|
#elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
|
2017-12-28 05:18:39 +00:00
|
|
|
#define MICROPY_NLR_THUMB (1)
|
2019-06-17 14:19:34 +01:00
|
|
|
#if defined(__SOFTFP__)
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_ARM_THUMB)
|
2019-06-17 14:19:34 +01:00
|
|
|
#else
|
|
|
|
// With hardware FP registers s16-s31 are callee save so in principle
|
|
|
|
// should be saved and restored by the NLR code. gcc only uses s16-s21
|
|
|
|
// so only save/restore those as an optimisation.
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_ARM_THUMB_FP)
|
2019-06-17 14:19:34 +01:00
|
|
|
#endif
|
2021-02-17 23:28:42 +00:00
|
|
|
#elif defined(__aarch64__)
|
|
|
|
#define MICROPY_NLR_AARCH64 (1)
|
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_AARCH64)
|
2014-11-27 20:29:33 +00:00
|
|
|
#elif defined(__xtensa__)
|
2017-12-28 05:18:39 +00:00
|
|
|
#define MICROPY_NLR_XTENSA (1)
|
2019-09-18 04:39:01 +01:00
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_XTENSA)
|
2019-08-22 01:21:48 +01:00
|
|
|
#elif defined(__powerpc__)
|
|
|
|
#define MICROPY_NLR_POWERPC (1)
|
|
|
|
// this could be less but using 128 for safety
|
|
|
|
#define MICROPY_NLR_NUM_REGS (128)
|
2022-01-07 20:57:20 +00:00
|
|
|
#elif defined(__mips__)
|
|
|
|
#define MICROPY_NLR_MIPS (1)
|
|
|
|
#define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_MIPS)
|
2014-02-27 16:01:43 +00:00
|
|
|
#else
|
2014-04-16 22:16:45 +01:00
|
|
|
#define MICROPY_NLR_SETJMP (1)
|
2014-04-30 02:14:31 +01:00
|
|
|
//#warning "No native NLR support for this arch, using setjmp implementation"
|
2014-04-16 22:16:45 +01:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2020-02-26 00:58:42 +00:00
|
|
|
// *FORMAT-ON*
|
|
|
|
|
2014-04-16 22:16:45 +01:00
|
|
|
#if MICROPY_NLR_SETJMP
|
2017-12-28 05:18:39 +00:00
|
|
|
#include <setjmp.h>
|
Revert "py/nlr: Factor out common NLR code to generic functions."
This reverts commit 6a3a742a6c9caaa2be0fd0aac7a5df4ac816081c.
The above commit has number of faults starting from the motivation down
to the actual implementation.
1. Faulty implementation.
The original code contained functions like:
NORETURN void nlr_jump(void *val) {
nlr_buf_t **top_ptr = &MP_STATE_THREAD(nlr_top);
nlr_buf_t *top = *top_ptr;
...
__asm volatile (
"mov %0, %%edx \n" // %edx points to nlr_buf
"mov 28(%%edx), %%esi \n" // load saved %esi
"mov 24(%%edx), %%edi \n" // load saved %edi
"mov 20(%%edx), %%ebx \n" // load saved %ebx
"mov 16(%%edx), %%esp \n" // load saved %esp
"mov 12(%%edx), %%ebp \n" // load saved %ebp
"mov 8(%%edx), %%eax \n" // load saved %eip
"mov %%eax, (%%esp) \n" // store saved %eip to stack
"xor %%eax, %%eax \n" // clear return register
"inc %%al \n" // increase to make 1, non-local return
"ret \n" // return
: // output operands
: "r"(top) // input operands
: // clobbered registers
);
}
Which clearly stated that C-level variable should be a parameter of the
assembly, whcih then moved it into correct register.
Whereas now it's:
NORETURN void nlr_jump_tail(nlr_buf_t *top) {
(void)top;
__asm volatile (
"mov 28(%edx), %esi \n" // load saved %esi
"mov 24(%edx), %edi \n" // load saved %edi
"mov 20(%edx), %ebx \n" // load saved %ebx
"mov 16(%edx), %esp \n" // load saved %esp
"mov 12(%edx), %ebp \n" // load saved %ebp
"mov 8(%edx), %eax \n" // load saved %eip
"mov %eax, (%esp) \n" // store saved %eip to stack
"xor %eax, %eax \n" // clear return register
"inc %al \n" // increase to make 1, non-local return
"ret \n" // return
);
for (;;); // needed to silence compiler warning
}
Which just tries to perform operations on a completely random register (edx
in this case). The outcome is the expected: saving the pure random luck of
the compiler putting the right value in the random register above, there's
a crash.
2. Non-critical assessment.
The original commit message says "There is a small overhead introduced
(typically 1 machine instruction)". That machine instruction is a call
if a compiler doesn't perform tail optimization (happens regularly), and
it's 1 instruction only with the broken code shown above, fixing it
requires adding more. With inefficiencies already presented in the NLR
code, the overhead becomes "considerable" (several times more than 1%),
not "small".
The commit message also says "This eliminates duplicated code.". An
obvious way to eliminate duplication would be to factor out common code
to macros, not introduce overhead and breakage like above.
3. Faulty motivation.
All this started with a report of warnings/errors happening for a niche
compiler. It could have been solved in one the direct ways: a) fixing it
just for affected compiler(s); b) rewriting it in proper assembly (like
it was before BTW); c) by not doing anything at all, MICROPY_NLR_SETJMP
exists exactly to address minor-impact cases like thar (where a) or b) are
not applicable). Instead, a backwards "solution" was put forward, leading
to all the issues above.
The best action thus appears to be revert and rework, not trying to work
around what went haywire in the first place.
2017-12-26 16:39:51 +00:00
|
|
|
#endif
|
2017-12-18 07:57:15 +00:00
|
|
|
|
2017-12-28 05:18:39 +00:00
|
|
|
typedef struct _nlr_buf_t nlr_buf_t;
|
|
|
|
struct _nlr_buf_t {
|
|
|
|
// the entries here must all be machine word size
|
|
|
|
nlr_buf_t *prev;
|
|
|
|
void *ret_val; // always a concrete object (an exception instance)
|
|
|
|
|
|
|
|
#if MICROPY_NLR_SETJMP
|
|
|
|
jmp_buf jmpbuf;
|
|
|
|
#else
|
|
|
|
void *regs[MICROPY_NLR_NUM_REGS];
|
|
|
|
#endif
|
|
|
|
|
py: Introduce a Python stack for scoped allocation.
This patch introduces the MICROPY_ENABLE_PYSTACK option (disabled by
default) which enables a "Python stack" that allows to allocate and free
memory in a scoped, or Last-In-First-Out (LIFO) way, similar to alloca().
A new memory allocation API is introduced along with this Py-stack. It
includes both "local" and "nonlocal" LIFO allocation. Local allocation is
intended to be equivalent to using alloca(), whereby the same function must
free the memory. Nonlocal allocation is where another function may free
the memory, so long as it's still LIFO.
Follow-up patches will convert all uses of alloca() and VLA to the new
scoped allocation API. The old behaviour (using alloca()) will still be
available, but when MICROPY_ENABLE_PYSTACK is enabled then alloca() is no
longer required or used.
The benefits of enabling this option are (or will be once subsequent
patches are made to convert alloca()/VLA):
- Toolchains without alloca() can use this feature to obtain correct and
efficient scoped memory allocation (compared to using the heap instead
of alloca(), which is slower).
- Even if alloca() is available, enabling the Py-stack gives slightly more
efficient use of stack space when calling nested Python functions, due to
the way that compilers implement alloca().
- Enabling the Py-stack with the stackless mode allows for even more
efficient stack usage, as well as retaining high performance (because the
heap is no longer used to build and destroy stackless code states).
- With Py-stack and stackless enabled, Python-calling-Python is no longer
recursive in the C mp_execute_bytecode function.
The micropython.pystack_use() function is included to measure usage of the
Python stack.
2017-11-26 12:28:40 +00:00
|
|
|
#if MICROPY_ENABLE_PYSTACK
|
|
|
|
void *pystack;
|
|
|
|
#endif
|
2013-10-15 22:25:17 +01:00
|
|
|
};
|
|
|
|
|
Revert "py/nlr: Factor out common NLR code to generic functions."
This reverts commit 6a3a742a6c9caaa2be0fd0aac7a5df4ac816081c.
The above commit has number of faults starting from the motivation down
to the actual implementation.
1. Faulty implementation.
The original code contained functions like:
NORETURN void nlr_jump(void *val) {
nlr_buf_t **top_ptr = &MP_STATE_THREAD(nlr_top);
nlr_buf_t *top = *top_ptr;
...
__asm volatile (
"mov %0, %%edx \n" // %edx points to nlr_buf
"mov 28(%%edx), %%esi \n" // load saved %esi
"mov 24(%%edx), %%edi \n" // load saved %edi
"mov 20(%%edx), %%ebx \n" // load saved %ebx
"mov 16(%%edx), %%esp \n" // load saved %esp
"mov 12(%%edx), %%ebp \n" // load saved %ebp
"mov 8(%%edx), %%eax \n" // load saved %eip
"mov %%eax, (%%esp) \n" // store saved %eip to stack
"xor %%eax, %%eax \n" // clear return register
"inc %%al \n" // increase to make 1, non-local return
"ret \n" // return
: // output operands
: "r"(top) // input operands
: // clobbered registers
);
}
Which clearly stated that C-level variable should be a parameter of the
assembly, whcih then moved it into correct register.
Whereas now it's:
NORETURN void nlr_jump_tail(nlr_buf_t *top) {
(void)top;
__asm volatile (
"mov 28(%edx), %esi \n" // load saved %esi
"mov 24(%edx), %edi \n" // load saved %edi
"mov 20(%edx), %ebx \n" // load saved %ebx
"mov 16(%edx), %esp \n" // load saved %esp
"mov 12(%edx), %ebp \n" // load saved %ebp
"mov 8(%edx), %eax \n" // load saved %eip
"mov %eax, (%esp) \n" // store saved %eip to stack
"xor %eax, %eax \n" // clear return register
"inc %al \n" // increase to make 1, non-local return
"ret \n" // return
);
for (;;); // needed to silence compiler warning
}
Which just tries to perform operations on a completely random register (edx
in this case). The outcome is the expected: saving the pure random luck of
the compiler putting the right value in the random register above, there's
a crash.
2. Non-critical assessment.
The original commit message says "There is a small overhead introduced
(typically 1 machine instruction)". That machine instruction is a call
if a compiler doesn't perform tail optimization (happens regularly), and
it's 1 instruction only with the broken code shown above, fixing it
requires adding more. With inefficiencies already presented in the NLR
code, the overhead becomes "considerable" (several times more than 1%),
not "small".
The commit message also says "This eliminates duplicated code.". An
obvious way to eliminate duplication would be to factor out common code
to macros, not introduce overhead and breakage like above.
3. Faulty motivation.
All this started with a report of warnings/errors happening for a niche
compiler. It could have been solved in one the direct ways: a) fixing it
just for affected compiler(s); b) rewriting it in proper assembly (like
it was before BTW); c) by not doing anything at all, MICROPY_NLR_SETJMP
exists exactly to address minor-impact cases like thar (where a) or b) are
not applicable). Instead, a backwards "solution" was put forward, leading
to all the issues above.
The best action thus appears to be revert and rework, not trying to work
around what went haywire in the first place.
2017-12-26 16:39:51 +00:00
|
|
|
// Helper macros to save/restore the pystack state
|
|
|
|
#if MICROPY_ENABLE_PYSTACK
|
|
|
|
#define MP_NLR_SAVE_PYSTACK(nlr_buf) (nlr_buf)->pystack = MP_STATE_THREAD(pystack_cur)
|
|
|
|
#define MP_NLR_RESTORE_PYSTACK(nlr_buf) MP_STATE_THREAD(pystack_cur) = (nlr_buf)->pystack
|
|
|
|
#else
|
|
|
|
#define MP_NLR_SAVE_PYSTACK(nlr_buf) (void)nlr_buf
|
|
|
|
#define MP_NLR_RESTORE_PYSTACK(nlr_buf) (void)nlr_buf
|
|
|
|
#endif
|
|
|
|
|
2017-12-28 05:46:30 +00:00
|
|
|
// Helper macro to use at the start of a specific nlr_jump implementation
|
|
|
|
#define MP_NLR_JUMP_HEAD(val, top) \
|
|
|
|
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; \
|
Revert "py/nlr: Factor out common NLR code to generic functions."
This reverts commit 6a3a742a6c9caaa2be0fd0aac7a5df4ac816081c.
The above commit has number of faults starting from the motivation down
to the actual implementation.
1. Faulty implementation.
The original code contained functions like:
NORETURN void nlr_jump(void *val) {
nlr_buf_t **top_ptr = &MP_STATE_THREAD(nlr_top);
nlr_buf_t *top = *top_ptr;
...
__asm volatile (
"mov %0, %%edx \n" // %edx points to nlr_buf
"mov 28(%%edx), %%esi \n" // load saved %esi
"mov 24(%%edx), %%edi \n" // load saved %edi
"mov 20(%%edx), %%ebx \n" // load saved %ebx
"mov 16(%%edx), %%esp \n" // load saved %esp
"mov 12(%%edx), %%ebp \n" // load saved %ebp
"mov 8(%%edx), %%eax \n" // load saved %eip
"mov %%eax, (%%esp) \n" // store saved %eip to stack
"xor %%eax, %%eax \n" // clear return register
"inc %%al \n" // increase to make 1, non-local return
"ret \n" // return
: // output operands
: "r"(top) // input operands
: // clobbered registers
);
}
Which clearly stated that C-level variable should be a parameter of the
assembly, whcih then moved it into correct register.
Whereas now it's:
NORETURN void nlr_jump_tail(nlr_buf_t *top) {
(void)top;
__asm volatile (
"mov 28(%edx), %esi \n" // load saved %esi
"mov 24(%edx), %edi \n" // load saved %edi
"mov 20(%edx), %ebx \n" // load saved %ebx
"mov 16(%edx), %esp \n" // load saved %esp
"mov 12(%edx), %ebp \n" // load saved %ebp
"mov 8(%edx), %eax \n" // load saved %eip
"mov %eax, (%esp) \n" // store saved %eip to stack
"xor %eax, %eax \n" // clear return register
"inc %al \n" // increase to make 1, non-local return
"ret \n" // return
);
for (;;); // needed to silence compiler warning
}
Which just tries to perform operations on a completely random register (edx
in this case). The outcome is the expected: saving the pure random luck of
the compiler putting the right value in the random register above, there's
a crash.
2. Non-critical assessment.
The original commit message says "There is a small overhead introduced
(typically 1 machine instruction)". That machine instruction is a call
if a compiler doesn't perform tail optimization (happens regularly), and
it's 1 instruction only with the broken code shown above, fixing it
requires adding more. With inefficiencies already presented in the NLR
code, the overhead becomes "considerable" (several times more than 1%),
not "small".
The commit message also says "This eliminates duplicated code.". An
obvious way to eliminate duplication would be to factor out common code
to macros, not introduce overhead and breakage like above.
3. Faulty motivation.
All this started with a report of warnings/errors happening for a niche
compiler. It could have been solved in one the direct ways: a) fixing it
just for affected compiler(s); b) rewriting it in proper assembly (like
it was before BTW); c) by not doing anything at all, MICROPY_NLR_SETJMP
exists exactly to address minor-impact cases like thar (where a) or b) are
not applicable). Instead, a backwards "solution" was put forward, leading
to all the issues above.
The best action thus appears to be revert and rework, not trying to work
around what went haywire in the first place.
2017-12-26 16:39:51 +00:00
|
|
|
|
2017-12-28 05:46:30 +00:00
|
|
|
#if MICROPY_NLR_SETJMP
|
2014-04-16 22:16:45 +01:00
|
|
|
// nlr_push() must be defined as a macro, because "The stack context will be
|
|
|
|
// invalidated if the function which called setjmp() returns."
|
2017-12-28 05:46:30 +00:00
|
|
|
// For this case it is safe to call nlr_push_tail() first.
|
|
|
|
#define nlr_push(buf) (nlr_push_tail(buf), setjmp((buf)->jmpbuf))
|
2014-04-16 22:16:45 +01:00
|
|
|
#else
|
2013-10-15 22:25:17 +01:00
|
|
|
unsigned int nlr_push(nlr_buf_t *);
|
2017-12-28 05:46:30 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
unsigned int nlr_push_tail(nlr_buf_t *top);
|
2013-10-23 20:20:17 +01:00
|
|
|
void nlr_pop(void);
|
2014-04-30 03:35:18 +01:00
|
|
|
NORETURN void nlr_jump(void *val);
|
2014-04-05 18:32:08 +01:00
|
|
|
|
2014-04-08 15:08:14 +01:00
|
|
|
// 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
|
|
|
|
// should bail out with a fatal error.
|
2017-02-16 06:23:06 +00:00
|
|
|
NORETURN void nlr_jump_fail(void *val);
|
2014-04-08 15:08:14 +01:00
|
|
|
|
2014-04-05 18:32:08 +01:00
|
|
|
// use nlr_raise instead of nlr_jump so that debugging is easier
|
2017-04-26 12:17:55 +01:00
|
|
|
#ifndef MICROPY_DEBUG_NLR
|
2015-11-27 17:01:44 +00:00
|
|
|
#define nlr_raise(val) nlr_jump(MP_OBJ_TO_PTR(val))
|
2014-04-05 18:32:08 +01:00
|
|
|
#else
|
2015-02-15 17:23:52 +00:00
|
|
|
#include "mpstate.h"
|
2014-04-05 18:32:08 +01:00
|
|
|
#define nlr_raise(val) \
|
|
|
|
do { \
|
2016-05-30 19:27:26 +01:00
|
|
|
/*printf("nlr_raise: nlr_top=%p\n", MP_STATE_THREAD(nlr_top)); \
|
2015-02-15 17:28:18 +00:00
|
|
|
fflush(stdout);*/ \
|
2015-11-27 17:01:44 +00:00
|
|
|
void *_val = MP_OBJ_TO_PTR(val); \
|
2014-04-05 18:32:08 +01:00
|
|
|
assert(_val != NULL); \
|
2015-11-27 17:01:44 +00:00
|
|
|
assert(mp_obj_is_exception_instance(val)); \
|
2014-04-05 18:32:08 +01:00
|
|
|
nlr_jump(_val); \
|
|
|
|
} while (0)
|
2015-02-15 17:23:52 +00:00
|
|
|
|
2015-03-03 10:15:06 +00:00
|
|
|
#if !MICROPY_NLR_SETJMP
|
2015-02-15 17:23:52 +00:00
|
|
|
#define nlr_push(val) \
|
2016-05-30 19:27:26 +01:00
|
|
|
assert(MP_STATE_THREAD(nlr_top) != val), nlr_push(val)
|
2015-02-15 17:23:52 +00:00
|
|
|
|
2015-02-15 17:28:18 +00:00
|
|
|
/*
|
|
|
|
#define nlr_push(val) \
|
2016-05-30 19:27:26 +01:00
|
|
|
printf("nlr_push: before: nlr_top=%p, val=%p\n", MP_STATE_THREAD(nlr_top), val),assert(MP_STATE_THREAD(nlr_top) != val),nlr_push(val)
|
2015-02-15 17:28:18 +00:00
|
|
|
*/
|
2015-03-03 10:15:06 +00:00
|
|
|
#endif
|
2015-02-15 17:28:18 +00:00
|
|
|
|
2014-04-05 18:32:08 +01:00
|
|
|
#endif
|
2015-01-01 20:27:54 +00:00
|
|
|
|
all: Unify header guard usage.
The code conventions suggest using header guards, but do not define how
those should look like and instead point to existing files. However, not
all existing files follow the same scheme, sometimes omitting header guards
altogether, sometimes using non-standard names, making it easy to
accidentally pick a "wrong" example.
This commit ensures that all header files of the MicroPython project (that
were not simply copied from somewhere else) follow the same pattern, that
was already present in the majority of files, especially in the py folder.
The rules are as follows.
Naming convention:
* start with the words MICROPY_INCLUDED
* contain the full path to the file
* replace special characters with _
In addition, there are no empty lines before #ifndef, between #ifndef and
one empty line before #endif. #endif is followed by a comment containing
the name of the guard macro.
py/grammar.h cannot use header guards by design, since it has to be
included multiple times in a single C file. Several other files also do not
need header guards as they are only used internally and guaranteed to be
included only once:
* MICROPY_MPHALPORT_H
* mpconfigboard.h
* mpconfigport.h
* mpthreadport.h
* pin_defs_*.h
* qstrdefs*.h
2017-06-29 22:14:58 +01:00
|
|
|
#endif // MICROPY_INCLUDED_PY_NLR_H
|