cc3200: Use common gchelper_m3.s code from lib/utils.

5 files changed, 3 insertions, 77 deletions

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 19abe6616..7bfd43d62 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -128,7 +128,6 @@ APP_UTIL_SRC_C = $(addprefix util/,\
 	)
 	
 APP_UTIL_SRC_S = $(addprefix util/,\
-	gchelper.s \
 	sleeprestore.s \
 	)
 	
@@ -159,6 +158,7 @@ APP_STM_SRC_C = $(addprefix ports/stm32/,\
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_CC3100_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
+OBJ += $(BUILD)/lib/utils/gchelper_m3.o
 OBJ += $(BUILD)/pins.o
 
 # List of sources for qstr extraction
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index 6143f72a7..9b6169342 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -50,8 +50,8 @@
 #include "pybpin.h"
 #include "pybrtc.h"
 #include "lib/utils/pyexec.h"
+#include "lib/utils/gchelper.h"
 #include "gccollect.h"
-#include "gchelper.h"
 #include "mperror.h"
 #include "simplelink.h"
 #include "modnetwork.h"
diff --git a/ports/cc3200/util/gccollect.c b/ports/cc3200/util/gccollect.c
index 6e2a9081c..65b2f1605 100644
--- a/ports/cc3200/util/gccollect.c
+++ b/ports/cc3200/util/gccollect.c
@@ -30,8 +30,8 @@
 
 #include "py/gc.h"
 #include "py/mpthread.h"
+#include "lib/utils/gchelper.h"
 #include "gccollect.h"
-#include "gchelper.h"
 
 /******************************************************************************
 DECLARE PUBLIC FUNCTIONS
diff --git a/ports/cc3200/util/gchelper.h b/ports/cc3200/util/gchelper.h
deleted file mode 100644
index 48e81bc61..000000000
--- a/ports/cc3200/util/gchelper.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2015 Daniel Campora
- *
- * 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_CC3200_UTIL_GCHELPER_H
-#define MICROPY_INCLUDED_CC3200_UTIL_GCHELPER_H
-
-extern mp_uint_t gc_helper_get_sp(void);
-extern mp_uint_t gc_helper_get_regs_and_sp(mp_uint_t *regs);
-
-#endif // MICROPY_INCLUDED_CC3200_UTIL_GCHELPER_H
diff --git a/ports/cc3200/util/gchelper.s b/ports/cc3200/util/gchelper.s
deleted file mode 100644
index aa8fb499e..000000000
--- a/ports/cc3200/util/gchelper.s
+++ /dev/null
@@ -1,41 +0,0 @@
-    .syntax unified
-    .cpu cortex-m4
-    .thumb
-    .text
-    .align  2
-
-
-
-@ uint gc_helper_get_sp(void)
-    .global gc_helper_get_sp
-    .thumb
-    .thumb_func
-    .type   gc_helper_get_sp, %function
-gc_helper_get_sp:
-    @ return the sp
-    mov     r0, sp
-    bx      lr
-
-
-
-@ uint gc_helper_get_regs_and_sp(r0=uint regs[10])
-    .global gc_helper_get_regs_and_sp
-    .thumb
-    .thumb_func
-    .type   gc_helper_get_regs_and_sp, %function
-gc_helper_get_regs_and_sp:
-    @ store registers into given array
-    str     r4, [r0], #4
-    str     r5, [r0], #4
-    str     r6, [r0], #4
-    str     r7, [r0], #4
-    str     r8, [r0], #4
-    str     r9, [r0], #4
-    str     r10, [r0], #4
-    str     r11, [r0], #4
-    str     r12, [r0], #4
-    str     r13, [r0], #4
-
-    @ return the sp
-    mov     r0, sp
-    bx      lr