diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-01-09 00:10:55 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-01-09 00:10:55 +0000 |
| commit | 4a5895c4eba98f9c5e698d48f58cbf3682ed0db1 (patch) | |
| tree | 831e31e7ca8910d560f529b093feac29a07e1e24 | |
| parent | 85e8e2ed5b1954b042b2157a27c6f06090cd0511 (diff) | |
py: Disable stack checking by default; enable on most ports.
| -rw-r--r-- | bare-arm/main.c | 2 | ||||
| -rw-r--r-- | esp8266/mpconfigport.h | 1 | ||||
| -rw-r--r-- | py/mpconfig.h | 2 | ||||
| -rw-r--r-- | qemu-arm/mpconfigport.h | 1 | ||||
| -rw-r--r-- | stmhal/mpconfigport.h | 1 | ||||
| -rw-r--r-- | teensy/mpconfigport.h | 1 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 1 |
7 files changed, 6 insertions, 3 deletions
diff --git a/bare-arm/main.c b/bare-arm/main.c index fb9ec6037..a1e94313c 100644 --- a/bare-arm/main.c +++ b/bare-arm/main.c @@ -6,7 +6,6 @@ #include "py/parsehelper.h" #include "py/compile.h" #include "py/runtime.h" -#include "py/stackctrl.h" #include "py/repl.h" #include "py/pfenv.h" @@ -48,7 +47,6 @@ void do_str(const char *src) { } int main(int argc, char **argv) { - mp_stack_set_limit(10240); mp_init(); do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\n')"); mp_deinit(); diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h index 7d1d6e1b7..2782ceace 100644 --- a/esp8266/mpconfigport.h +++ b/esp8266/mpconfigport.h @@ -9,6 +9,7 @@ #define MICROPY_MEM_STATS (0) #define MICROPY_DEBUG_PRINTERS (0) #define MICROPY_ENABLE_GC (1) +#define MICROPY_STACK_CHECK (1) #define MICROPY_HELPER_REPL (1) #define MICROPY_HELPER_LEXER_UNIX (0) #define MICROPY_ENABLE_SOURCE_LINE (1) diff --git a/py/mpconfig.h b/py/mpconfig.h index 491fa5ea5..57f54a590 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -205,7 +205,7 @@ // Whether to check C stack usage. C stack used for calling Python functions, // etc. Not checking means segfault on overflow. #ifndef MICROPY_STACK_CHECK -#define MICROPY_STACK_CHECK (1) +#define MICROPY_STACK_CHECK (0) #endif // Whether to have an emergency exception buffer diff --git a/qemu-arm/mpconfigport.h b/qemu-arm/mpconfigport.h index 32ed77c1d..f9f048655 100644 --- a/qemu-arm/mpconfigport.h +++ b/qemu-arm/mpconfigport.h @@ -9,6 +9,7 @@ #define MICROPY_MEM_STATS (0) #define MICROPY_DEBUG_PRINTERS (0) #define MICROPY_ENABLE_GC (0) +#define MICROPY_STACK_CHECK (1) #define MICROPY_HELPER_REPL (0) #define MICROPY_HELPER_LEXER_UNIX (0) #define MICROPY_ENABLE_SOURCE_LINE (0) diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h index 15d84e85f..86682d87b 100644 --- a/stmhal/mpconfigport.h +++ b/stmhal/mpconfigport.h @@ -35,6 +35,7 @@ #define MICROPY_EMIT_INLINE_THUMB (1) #define MICROPY_ENABLE_GC (1) #define MICROPY_ENABLE_FINALISER (1) +#define MICROPY_STACK_CHECK (1) #define MICROPY_HELPER_REPL (1) #define MICROPY_ENABLE_SOURCE_LINE (1) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) diff --git a/teensy/mpconfigport.h b/teensy/mpconfigport.h index 63f0ee7b7..57e4c36b0 100644 --- a/teensy/mpconfigport.h +++ b/teensy/mpconfigport.h @@ -7,6 +7,7 @@ #define MICROPY_EMIT_INLINE_THUMB (1) #define MICROPY_ENABLE_GC (1) #define MICROPY_ENABLE_FINALISER (1) +#define MICROPY_STACK_CHECK (1) #define MICROPY_HELPER_REPL (1) #define MICROPY_ENABLE_SOURCE_LINE (1) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 29492a7f9..463907eb8 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -41,6 +41,7 @@ #endif #define MICROPY_ENABLE_GC (1) #define MICROPY_ENABLE_FINALISER (1) +#define MICROPY_STACK_CHECK (1) #define MICROPY_MEM_STATS (1) #define MICROPY_DEBUG_PRINTERS (1) #define MICROPY_HELPER_REPL (1) |