优化代码结构

2024-11-17 10:45:51 +08:00
parent 77a38ebd8c
commit e9cba510eb
475 changed files with 13 additions and 12 deletions
--- a/mkrtos_user/server/CMakeLists.txt
+++ b/mkrtos_user/server/CMakeLists.txt
@@ -2,9 +2,7 @@ cmake_minimum_required(VERSION 3.13)


 add_subdirectory(init)
-add_subdirectory(coremark)
 add_subdirectory(shell)
-add_subdirectory(tinycc-arm-thumb)
 add_subdirectory(fs)
 add_subdirectory(drv)
 # add_subdirectory(net)
--- a/mkrtos_user/user/app/CMakeLists.txt
+++ b/mkrtos_user/user/app/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.13)

+
+add_subdirectory(coremark)
+add_subdirectory(tinycc-arm-thumb)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIG_BOARD_NAME})
    add_subdirectory(${CONFIG_BOARD_NAME})
 endif()
--- a/mkrtos_user/user/app/coremark/CMakeLists.txt
+++ b/mkrtos_user/user/app/coremark/CMakeLists.txt
@@ -28,8 +28,8 @@ target_include_directories(
    ${CMAKE_SOURCE_DIR}/mkrtos_user/lib/sys/inc
    ${CMAKE_SOURCE_DIR}/mkrtos_user/lib/sys_svr/inc

-    ${CMAKE_SOURCE_DIR}/mkrtos_user/server/coremark/coremark_src
-    ${CMAKE_SOURCE_DIR}/mkrtos_user/server/coremark/
+    ${CMAKE_CURRENT_SOURCE_DIR}/coremark/coremark_src
+    ${CMAKE_CURRENT_SOURCE_DIR}/coremark/
 )
 add_dependencies(
    coremark.elf
--- a/mkrtos_user/user/app/coremark/aarch64/link.lds
+++ b/mkrtos_user/user/app/coremark/aarch64/link.lds
--- a/mkrtos_user/user/app/coremark/armv7_8m/link.lds
+++ b/mkrtos_user/user/app/coremark/armv7_8m/link.lds
--- a/mkrtos_user/user/app/coremark/coremark_src/LICENSE.md
+++ b/mkrtos_user/user/app/coremark/coremark_src/LICENSE.md
--- a/mkrtos_user/user/app/coremark/coremark_src/README.md
+++ b/mkrtos_user/user/app/coremark/coremark_src/README.md
--- a/mkrtos_user/user/app/coremark/coremark_src/SConscript
+++ b/mkrtos_user/user/app/coremark/coremark_src/SConscript
--- a/mkrtos_user/user/app/coremark/coremark_src/core_list_join.c
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_list_join.c
--- a/mkrtos_user/user/app/coremark/coremark_src/core_main.c
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_main.c
--- a/mkrtos_user/user/app/coremark/coremark_src/core_matrix.c
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_matrix.c
--- a/mkrtos_user/user/app/coremark/coremark_src/core_portme.c
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_portme.c
--- a/mkrtos_user/user/app/coremark/coremark_src/core_portme.h
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_portme.h
--- a/mkrtos_user/user/app/coremark/coremark_src/core_state.c
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_state.c
--- a/mkrtos_user/user/app/coremark/coremark_src/core_util.c
+++ b/mkrtos_user/user/app/coremark/coremark_src/core_util.c
--- a/mkrtos_user/user/app/coremark/coremark_src/coremark.h
+++ b/mkrtos_user/user/app/coremark/coremark_src/coremark.h
--- a/mkrtos_user/user/app/coremark/coremark_src/iteration.png
+++ b/mkrtos_user/user/app/coremark/coremark_src/iteration.png
--- a/mkrtos_user/user/app/coremark/heap_stack.c
+++ b/mkrtos_user/user/app/coremark/heap_stack.c
--- a/mkrtos_user/user/app/coremark/main.c
+++ b/mkrtos_user/user/app/coremark/main.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/.gitignore
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/.gitignore
--- a/mkrtos_user/user/app/tinycc-arm-thumb/CMakeLists.txt
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/CMakeLists.txt
--- a/mkrtos_user/user/app/tinycc-arm-thumb/COPYING
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/COPYING
--- a/mkrtos_user/user/app/tinycc-arm-thumb/Changelog
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/Changelog
--- a/mkrtos_user/user/app/tinycc-arm-thumb/CodingStyle
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/CodingStyle
--- a/mkrtos_user/user/app/tinycc-arm-thumb/Makefile
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/Makefile
--- a/mkrtos_user/user/app/tinycc-arm-thumb/README
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/README
--- a/mkrtos_user/user/app/tinycc-arm-thumb/RELICENSING
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/RELICENSING
--- a/mkrtos_user/user/app/tinycc-arm-thumb/TODO
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/TODO
--- a/mkrtos_user/user/app/tinycc-arm-thumb/VERSION
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/VERSION
--- a/mkrtos_user/user/app/tinycc-arm-thumb/aarch64/link.lds
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/aarch64/link.lds
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm-asm.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm-asm.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm-link.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm-link.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm-thumb-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm-thumb-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm-thumb-instructions.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm-thumb-instructions.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm64-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm64-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/arm64-link.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/arm64-link.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/armv7_8m/link.lds
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/armv7_8m/link.lds
--- a/mkrtos_user/user/app/tinycc-arm-thumb/c67-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/c67-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/c67-link.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/c67-link.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/coff.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/coff.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/config.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/config.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/configure
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/configure
--- a/mkrtos_user/user/app/tinycc-arm-thumb/elf.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/elf.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex1.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex1.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex2.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex2.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex3.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex3.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex4.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex4.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex5.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/examples/ex5.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/heap_stack.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/heap_stack.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/i386-asm.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/i386-asm.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/i386-asm.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/i386-asm.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/i386-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/i386-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/i386-link.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/i386-link.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/i386-tok.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/i386-tok.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/il-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/il-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/il-opcodes.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/il-opcodes.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/float.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/float.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/stdalign.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/stdalign.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/stdarg.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/stdarg.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/stdbool.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/stdbool.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/stddef.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/stddef.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/stdnoreturn.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/stdnoreturn.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/include/varargs.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/include/varargs.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/Makefile
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/Makefile
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca-arm.S
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca-arm.S
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86-bt.S
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86-bt.S
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86.S
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86.S
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86_64-bt.S
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86_64-bt.S
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86_64.S
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/alloca86_64.S
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/armeabi.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/armeabi.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/armflush.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/armflush.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/bcheck.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/bcheck.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/bt-dll.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/bt-dll.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/bt-exe.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/bt-exe.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/bt-log.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/bt-log.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/dsohandle.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/dsohandle.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/lib-arm64.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/lib-arm64.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/libtcc1.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/libtcc1.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/lib/va_list.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/lib/va_list.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/libtcc.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/libtcc.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/libtcc.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/libtcc.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/riscv64-gen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/riscv64-gen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/riscv64-link.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/riscv64-link.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/stab.def
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/stab.def
--- a/mkrtos_user/user/app/tinycc-arm-thumb/stab.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/stab.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcc-doc.texi
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcc-doc.texi
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcc.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcc.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcc.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcc.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tccasm.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tccasm.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcccoff.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcccoff.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tccelf.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tccelf.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tccgen.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tccgen.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcclib.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcclib.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tccpe.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tccpe.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tccpp.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tccpp.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tccrun.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tccrun.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcctok.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcctok.h
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tcctools.c
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tcctools.c
--- a/mkrtos_user/user/app/tinycc-arm-thumb/tests/42test.h
+++ b/mkrtos_user/user/app/tinycc-arm-thumb/tests/42test.h
--- a/Show More
+++ b/Show More