02d830c035
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.
105 lines
3.4 KiB
C
105 lines
3.4 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2014-2017 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.
|
|
*/
|
|
|
|
#include "py/mpstate.h"
|
|
|
|
#if !MICROPY_NLR_SETJMP && defined(__xtensa__)
|
|
|
|
#undef nlr_push
|
|
|
|
// Xtensa calling conventions:
|
|
// a0 = return address
|
|
// a1 = stack pointer
|
|
// a2 = first arg, return value
|
|
// a3-a7 = rest of args
|
|
|
|
unsigned int nlr_push(nlr_buf_t *nlr) {
|
|
|
|
__asm volatile (
|
|
"s32i.n a0, a2, 8 \n" // save regs...
|
|
"s32i.n a1, a2, 12 \n"
|
|
"s32i.n a8, a2, 16 \n"
|
|
"s32i.n a9, a2, 20 \n"
|
|
"s32i.n a10, a2, 24 \n"
|
|
"s32i.n a11, a2, 28 \n"
|
|
"s32i.n a12, a2, 32 \n"
|
|
"s32i.n a13, a2, 36 \n"
|
|
"s32i.n a14, a2, 40 \n"
|
|
"s32i.n a15, a2, 44 \n"
|
|
"j nlr_push_tail \n" // do the rest in C
|
|
);
|
|
|
|
return 0; // needed to silence compiler warning
|
|
}
|
|
|
|
__attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr) {
|
|
nlr_buf_t **top = &MP_STATE_THREAD(nlr_top);
|
|
nlr->prev = *top;
|
|
MP_NLR_SAVE_PYSTACK(nlr);
|
|
*top = nlr;
|
|
return 0; // normal return
|
|
}
|
|
|
|
void nlr_pop(void) {
|
|
nlr_buf_t **top = &MP_STATE_THREAD(nlr_top);
|
|
*top = (*top)->prev;
|
|
}
|
|
|
|
NORETURN 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;
|
|
|
|
__asm volatile (
|
|
"mov.n a2, %0 \n" // a2 points to nlr_buf
|
|
"l32i.n a0, a2, 8 \n" // restore regs...
|
|
"l32i.n a1, a2, 12 \n"
|
|
"l32i.n a8, a2, 16 \n"
|
|
"l32i.n a9, a2, 20 \n"
|
|
"l32i.n a10, a2, 24 \n"
|
|
"l32i.n a11, a2, 28 \n"
|
|
"l32i.n a12, a2, 32 \n"
|
|
"l32i.n a13, a2, 36 \n"
|
|
"l32i.n a14, a2, 40 \n"
|
|
"l32i.n a15, a2, 44 \n"
|
|
"movi.n a2, 1 \n" // return 1, non-local return
|
|
"ret.n \n" // return
|
|
: // output operands
|
|
: "r"(top) // input operands
|
|
: // clobbered registers
|
|
);
|
|
|
|
for (;;); // needed to silence compiler warning
|
|
}
|
|
|
|
#endif // !MICROPY_NLR_SETJMP && defined(__xtensa__)
|