Merge pull request #551 from dhalbert/3.0_double_word_stack_align

tannewt · web-flow · commit a1254f125503 · 2018-01-24T18:27:22.000-08:00
3.0 double word stack align
diff --git a/extmod/modure.c b/extmod/modure.c
@@ -144,7 +144,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_obj_t retval = mp_obj_new_list(0, NULL);
-    const char* caps[caps_num];
+    const char **caps = alloca(caps_num * sizeof(char*));
     while (true) {
         // cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
         memset((char**)caps, 0, caps_num * sizeof(char*));
diff --git a/ports/atmel-samd/boards/samd21x18-bootloader-crystalless.ld b/ports/atmel-samd/boards/samd21x18-bootloader-crystalless.ld
@@ -11,7 +11,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd21x18-bootloader-external-flash-crystalless.ld b/ports/atmel-samd/boards/samd21x18-bootloader-external-flash-crystalless.ld
@@ -11,7 +11,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd21x18-bootloader-external-flash.ld b/ports/atmel-samd/boards/samd21x18-bootloader-external-flash.ld
@@ -10,7 +10,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd21x18-bootloader.ld b/ports/atmel-samd/boards/samd21x18-bootloader.ld
@@ -11,7 +11,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd51x18-bootloader-external-flash.ld b/ports/atmel-samd/boards/samd51x18-bootloader-external-flash.ld
@@ -10,7 +10,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd51x19-bootloader-external-flash.ld b/ports/atmel-samd/boards/samd51x19-bootloader-external-flash.ld
@@ -10,7 +10,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd51x19-bootloader.ld b/ports/atmel-samd/boards/samd51x19-bootloader.ld
@@ -10,7 +10,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd51x20-bootloader-external-flash.ld b/ports/atmel-samd/boards/samd51x20-bootloader-external-flash.ld
@@ -10,7 +10,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/ports/atmel-samd/boards/samd51x20-bootloader.ld b/ports/atmel-samd/boards/samd51x20-bootloader.ld
@@ -10,7 +10,8 @@ MEMORY
 }
 
 /* top end of the stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _bootloader_dbl_tap = _estack;
 
 /* define output sections */
diff --git a/py/runtime.c b/py/runtime.c
@@ -1428,10 +1428,9 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
     mp_load_method_maybe(module, MP_QSTR___name__, dest);
     size_t pkg_name_len;
     const char *pkg_name = mp_obj_str_get_data(dest[0], &pkg_name_len);
+
     const uint dot_name_len = pkg_name_len + 1 + qstr_len(name);
-    // Previously dot_name was created using alloca(), but that caused run-time crashes on M4 due to
-    // stack corruption (compiler bug, it appears), so use an array instead.
-    char dot_name[dot_name_len];
+    char *dot_name = alloca(dot_name_len);
     memcpy(dot_name, pkg_name, pkg_name_len);
     dot_name[pkg_name_len] = '.';
     memcpy(dot_name + pkg_name_len + 1, qstr_str(name), qstr_len(name));

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`mp_obj_t retval = mp_obj_new_list(0, NULL);`
`147`		`- const char* caps[caps_num];`
	`147`	`+ const char *caps = alloca(caps_num sizeof(char*));`
`148`	`148`	`while (true) {`
`149`	`149`	`// cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char`
`150`	`150`	`memset((char*)caps, 0, caps_num sizeof(char*));`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ MEMORY`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`/* top end of the stack */`
`14`		`-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;`
	`14`	`+/* stack must be double-word (8 byte) aligned */`
	`15`	`+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;`
`15`	`16`	`_bootloader_dbl_tap = _estack;`
`16`	`17`
`17`	`18`	`/* define output sections */`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ MEMORY`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`/* top end of the stack */`
`13`		`-_estack = ORIGIN(RAM) + LENGTH(RAM) - 4;`
	`13`	`+/* stack must be double-word (8 byte) aligned */`
	`14`	`+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;`
`14`	`15`	`_bootloader_dbl_tap = _estack;`
`15`	`16`
`16`	`17`	`/* define output sections */`