Share memory.c and a bit of polish.

tannewt · tannewt · commit 5704bc8c93e3 · 2018-08-02T14:35:46.000-07:00
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
@@ -288,7 +288,8 @@ SRC_C = \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
 	$(BUILD)/autogen_usb_descriptor.c \
-	freetouch/adafruit_ptc.c
+	freetouch/adafruit_ptc.c \
+	supervisor/shared/memory.c
 
 # Choose which flash filesystem impl to use.
 # (Right now INTERNAL_FLASH_FILESYSTEM and SPI_FLASH_FILESYSTEM are mutually exclusive.
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
@@ -118,6 +118,7 @@ SRC_C += \
 	lib/utils/stdout_helpers.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
+	supervisor/shared/memory.c
 
 ifeq ($(MCU_SUB_VARIANT),nrf52840)
 
diff --git a/ports/nrf/supervisor/memory.c b/ports/nrf/supervisor/memory.c
diff --git a/supervisor/memory.h b/supervisor/memory.h
@@ -24,6 +24,10 @@
  * THE SOFTWARE.
  */
 
+// Basic allocations outside them for areas such as the VM heap and stack.
+// supervisor/shared/memory.c has a basic implementation for a continuous chunk of memory. Add it
+// to a SRC_ in a Makefile to use it.
+
 #ifndef MICROPY_INCLUDED_SUPERVISOR_MEMORY_H
 #define MICROPY_INCLUDED_SUPERVISOR_MEMORY_H
 
@@ -38,6 +42,10 @@ typedef struct {
 void memory_init(void);
 void free_memory(supervisor_allocation* allocation);
 supervisor_allocation* allocate_remaining_memory(void);
+
+// Allocate a piece of a given length in bytes. If high_address is true then it should be allocated
+// at a lower address from the top of the stack. Otherwise, addresses will increase starting after
+// statically allocated memory.
 supervisor_allocation* allocate_memory(uint32_t length, bool high_address);
 
 #endif  // MICROPY_INCLUDED_SUPERVISOR_MEMORY_H
diff --git a/supervisor/shared/memory.c b/supervisor/shared/memory.c
@@ -82,7 +82,7 @@ supervisor_allocation* allocate_remaining_memory(void) {
 }
 
 supervisor_allocation* allocate_memory(uint32_t length, bool high) {
-    if ((high_address - low_address) * 4 < (int32_t) length) {
+    if ((high_address - low_address) * 4 < (int32_t) length || length % 4 != 0) {
         return NULL;
     }
     uint8_t index = 0;
diff --git a/supervisor/shared/stack.c b/supervisor/shared/stack.c
@@ -52,11 +52,11 @@ void allocate_stack(void) {
     }
 }
 
-inline void stack_init(void) {
+void stack_init(void) {
     allocate_stack();
 }
 
-inline void stack_resize(void) {
+void stack_resize(void) {
     if (next_stack_size == current_stack_size) {
         return;
     }
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
@@ -1,6 +1,5 @@
 SRC_SUPERVISOR = \
 	main.c \
-	supervisor/memory.c \
 	supervisor/port.c \
 	supervisor/shared/autoreload.c \
 	supervisor/shared/rgb_led_status.c \

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ supervisor_allocation* allocate_remaining_memory(void) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`supervisor_allocation* allocate_memory(uint32_t length, bool high) {`
`85`		`- if ((high_address - low_address) * 4 < (int32_t) length) {`
	`85`	`+ if ((high_address - low_address) * 4 < (int32_t) length \|\| length % 4 != 0) {`
`86`	`86`	`return NULL;`
`87`	`87`	`}`
`88`	`88`	`uint8_t index = 0;`
Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,11 @@ void allocate_stack(void) {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-inline void stack_init(void) {`
	`55`	`+void stack_init(void) {`
`56`	`56`	`allocate_stack();`
`57`	`57`	`}`
`58`	`58`
`59`		`-inline void stack_resize(void) {`
	`59`	`+void stack_resize(void) {`
`60`	`60`	`if (next_stack_size == current_stack_size) {`
`61`	`61`	`return;`
`62`	`62`	`}`