djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "alloca seems buggy on M4" 

This reverts commit 4b1e9d8f92.
This commit is contained in:
Dan Halbert 2018-01-24 16:57:46 -05:00
parent 5de29acbd2
commit 302ad40fb2
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extmod/modure.c
View File

@ -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*));

5
py/runtime.c
View File

@ -1428,10 +1428,9 @@ import_error:
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));