TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Put all global state together in state structures.

Browse Source 
This patch consolidates all global variables in py/ core into one place,
in a global structure.  Root pointers are all located together to make
GC tracing easier and more efficient.
This commit is contained in:
Damien George
2015-01-01 23:30:53 +00:00
parent ad2307c92c
commit b4b10fd350
34 changed files with 464 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py/stackctrl.c
View File

@@ -24,34 +24,30 @@
* THE SOFTWARE.
*/
#include "py/mpstate.h"
#include "py/nlr.h"
#include "py/obj.h"
#include "py/stackctrl.h"
// Stack top at the start of program
char *stack_top;
void mp_stack_ctrl_init(void) {
volatile int stack_dummy;
stack_top = (char*)&stack_dummy;
MP_STATE_VM(stack_top) = (char*)&stack_dummy;
}
mp_uint_t mp_stack_usage(void) {
// Assumes descending stack
volatile int stack_dummy;
return stack_top - (char*)&stack_dummy;
return MP_STATE_VM(stack_top) - (char*)&stack_dummy;
}
#if MICROPY_STACK_CHECK
static mp_uint_t stack_limit = 10240;
void mp_stack_set_limit(mp_uint_t limit) {
stack_limit = limit;
MP_STATE_VM(stack_limit) = limit;
}
void mp_stack_check(void) {
if (mp_stack_usage() >= stack_limit) {
if (mp_stack_usage() >= MP_STATE_VM(stack_limit)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_RuntimeError, "maximum recursion depth exceeded"));
}
}