summaryrefslogtreecommitdiffstatshomepage
path: root/unix
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-07-01 02:13:42 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-07-01 02:14:08 +0300
commitcaa7334141e6d67ab6f3064b250e6729095ae56c (patch)
tree8100c9c8d828aa51a1a3f0bbbb958e9f5c549ff7 /unix
parente95b6b5e0761d8fa40cc31d62888e503812db72a (diff)
downloadmicropython-caa7334141e6d67ab6f3064b250e6729095ae56c.tar.gz
micropython-caa7334141e6d67ab6f3064b250e6729095ae56c.zip
stackctrl: Add "mp_" prefix.
Diffstat (limited to 'unix')
-rw-r--r--unix/gccollect.c2
-rw-r--r--unix/main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/unix/gccollect.c b/unix/gccollect.c
index be05ff3ebc..d04e5d87fb 100644
--- a/unix/gccollect.c
+++ b/unix/gccollect.c
@@ -32,7 +32,7 @@
#if MICROPY_ENABLE_GC
-extern void *stack_top;
+extern char *stack_top;
#if MICROPY_GCREGS_SETJMP
#include <setjmp.h>
diff --git a/unix/main.c b/unix/main.c
index 1bee639eb2..176cbc6ec3 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -214,7 +214,7 @@ int usage(char **argv) {
mp_obj_t mem_info(void) {
printf("mem: total=%d, current=%d, peak=%d\n",
m_get_total_bytes_allocated(), m_get_current_bytes_allocated(), m_get_peak_bytes_allocated());
- printf("stack: %u\n", stack_usage());
+ printf("stack: %u\n", mp_stack_usage());
#if MICROPY_ENABLE_GC
gc_dump_info();
#endif
@@ -265,7 +265,7 @@ void pre_process_options(int argc, char **argv) {
#endif
int main(int argc, char **argv) {
- stack_set_limit(32768);
+ mp_stack_set_limit(32768);
pre_process_options(argc, argv);