Allow for resizing the stack area.

3 files changed, 117 insertions, 1 deletions

diff --git a/supervisor/shared/stack.c b/supervisor/shared/stack.c
new file mode 100755
index 000000000..f6c74e6d8
--- /dev/null
+++ b/supervisor/shared/stack.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * 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 "stack.h"
+
+#include "py/mpconfig.h"
+#include "supervisor/cpu.h"
+
+extern uint32_t _estack;
+
+static uint32_t next_stack_size = CIRCUITPY_DEFAULT_STACK_SIZE;
+static uint32_t current_stack_size = 0;
+supervisor_allocation* stack_alloc = NULL;
+
+#define EXCEPTION_STACK_SIZE 1024
+
+void allocate_stack(void) {
+    mp_uint_t regs[10];
+    mp_uint_t sp = cpu_get_regs_and_sp(regs);
+
+    mp_uint_t c_size = (uint32_t) &_estack - sp;
+
+    stack_alloc = allocate_memory(c_size + next_stack_size + EXCEPTION_STACK_SIZE, true);
+    if (stack_alloc == NULL) {
+        stack_alloc = allocate_memory(c_size + CIRCUITPY_DEFAULT_STACK_SIZE + EXCEPTION_STACK_SIZE, true);
+        current_stack_size = CIRCUITPY_DEFAULT_STACK_SIZE;
+    } else {
+        current_stack_size = next_stack_size;
+    }
+}
+
+inline void stack_init(void) {
+    allocate_stack();
+}
+
+inline void stack_resize(void) {
+    if (next_stack_size == current_stack_size) {
+        return;
+    }
+    free_memory(stack_alloc);
+    stack_alloc = NULL;
+    allocate_stack();
+}
+
+void set_next_stack_size(uint32_t size) {
+    next_stack_size = size;
+}
+
+uint32_t get_current_stack_size(void) {
+    return current_stack_size;
+}
diff --git a/supervisor/shared/stack.h b/supervisor/shared/stack.h
new file mode 100755
index 000000000..3a5c18e7d
--- /dev/null
+++ b/supervisor/shared/stack.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * 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.
+ */
+
+#ifndef MICROPY_INCLUDED_SUPERVISOR_STACK_H
+#define MICROPY_INCLUDED_SUPERVISOR_STACK_H
+
+#include <stddef.h>
+
+#include "supervisor/memory.h"
+
+extern supervisor_allocation* stack_alloc;
+
+void stack_init(void);
+void stack_resize(void);
+void set_next_stack_size(uint32_t size);
+uint32_t get_current_stack_size(void);
+
+#endif  // MICROPY_INCLUDED_SUPERVISOR_STACK_H
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index ea6afae29..ba5ffb3f3 100755
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -3,7 +3,8 @@ SRC_SUPERVISOR = \
 	supervisor/memory.c \
 	supervisor/port.c \
 	supervisor/shared/autoreload.c \
-	supervisor/shared/rgb_led_status.c
+	supervisor/shared/rgb_led_status.c \
+	supervisor/shared/stack.c
 
 ifeq ($(wildcard atmel-samd/supervisor/filesystem.c),)
 	SRC_SUPERVISOR += supervisor/filesystem.c