feat: reimplement Lab3 and add anticheat

.gitignore

@@ -46,3 +46,5 @@ infer-out/
 book/
 **mermaid**
 **/index.html
+compile_commands.json
+.cache/

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "Lab3/user/chcore-libc/musl-libc"]
+	path = Lab3/user/chcore-libc/musl-libc
+	url = git://git.musl-libc.org/musl
+[submodule "Lab4/user/chcore-libc/musl-libc"]
+	path = Lab4/user/chcore-libc/musl-libc
+	url = git://git.musl-libc.org/musl
+[submodule "Lab5/user/chcore-libc/musl-libc"]
+	path = Lab5/user/chcore-libc/musl-libc
+	url = git://git.musl-libc.org/musl
+[submodule "Lab6/user/chcore-libc/musl-libc"]
+	path = Lab6/user/chcore-libc/musl-libc
+	url = git://git.musl-libc.org/musl
+[submodule "Thirdparty/musl-libc"]
+	path = Thirdparty/musl-libc
+	url = git://git.musl-libc.org/musl

Lab1/kernel/arch/aarch64/boot/linker.tpl.ld

@@ -46,6 +46,12 @@ SECTIONS
     }
     . = ALIGN(4K);
 
+    .init.serial : {
+        *(.init.serial*)
+    }
+    . = ALIGN(4K);
+    _serial_end = . - KERNEL_VADDR;
+
     .rodata : {
         *(.rodata*)
     }

Lab1/scores.json

@@ -1,7 +1,8 @@
 [
   {
-    "capture": "Jump to kernel main",
+    "capture": "Welcome to ChCore shell!",
     "msg": "Jump to kernel main",
-    "proposed": 100
+    "proposed": 100,
+    "userland": true
   }
 ]

Lab2/kernel/arch/aarch64/boot/linker.tpl.ld

@@ -43,6 +43,12 @@ SECTIONS
     }
     . = ALIGN(4K);
 
+    .init.serial : {
+        *(.init.serial*)
+    }
+    . = ALIGN(4K);
+    _serial_end = . - KERNEL_VADDR;
+
     .rodata : {
         *(.rodata*)
         . = ALIGN(4K);

Lab2/kernel/arch/aarch64/main.c

@@ -35,6 +35,10 @@ struct lock big_kernel_lock;
 ALIGN(PAGE_SIZE)
 char empty_page[4096] = {0};
 
+__attribute__((section(".init.serial")))
+ALIGN(PAGE_SIZE)
+char serial_number[4096] = "0xDEADBEEF";
+
 /* Kernel Test */
 void run_test(void);
 
@@ -120,6 +124,7 @@ void main(paddr_t boot_flag, void *info)
 	/* Create initial thread here, which use the `init.bin` */
 	create_root_thread();
 	kinfo("[ChCore] create initial thread done\n");
+	kinfo("End of Kernel Checkpoints: %s\n", serial_number);
 
 	/* Leave the scheduler to do its job */
 	sched();

Lab2/kernel/tests/runtime/lab2.c

@@ -202,7 +202,7 @@ TEST_SUITE(lab2, test_page_table)
 
                 free_page_table(pgtbl);
         }
-        TEST("Map & unmap huge pages")
+        TEST("Map & unmap huge range")
         {
                 void *pgtbl = get_pages(0);
                 paddr_t pa;

Lab2/kernel/tests/runtime/tests.h

@@ -13,10 +13,11 @@
 #ifndef KERNEL_TESTS_RUNTIME_TESTS_H
 #define KERNEL_TESTS_RUNTIME_TESTS_H
 
+extern char serial_number[4096];
 #define TEST_SUITE(lab, name) void lab##_##name(void)
 #define TEST(name)                           \
         for (const char *test_name = (name); \
-             printk("[TEST] %s: OK\n", test_name),0;)
+             printk("[TEST] %s: OK: %s\n", test_name, serial_number),0;)
 #define ASSERT(expr)                                                       \
         do {                                                               \
                 if (!(expr))                                               \

Lab2/scores.json

@@ -57,6 +57,7 @@
   {
     "capture": "Welcome to ChCore shell!",
     "msg": "Page fault",
-    "proposed": 30
+    "proposed": 30,
+    "userland": true
   }
 ]

Lab3/.clangd

@@ -0,0 +1,2 @@
+CompileFlags:
+  CompilationDatabase: ./

Lab3/.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "QEMU (cppdbg)",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/kernel.img",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "stopAtEntry": true,
+            "stopAtConnect": true,
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+            ],
+            "MIMode": "gdb",
+            "targetArchitecture": "arm64",
+            "miDebuggerServerAddress": "localhost:1234",
+            "miDebuggerPath": "/usr/local/bin/gdb",
+            "preLaunchTask": "Setup QEMU"
+        }
+    ]
+}

Lab3/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "clangd.arguments": [
+        "--compile-commands-dir=./"
+    ],
+    "debug.allowBreakpointsEverywhere": true
+}

Lab3/.vscode/tasks.json

@@ -0,0 +1,21 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Setup QEMU",
+            "type": "shell",
+            "isBackground": true,
+            "command": "make qemu-gdb",
+            "problemMatcher": {
+                "pattern": {
+                    "regexp": "^\\[QEMU\\] Waiting for GDB Connection"
+                },
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^\\[QEMU\\] Waiting for GDB Connection",
+                    "endsPattern": "^\\[QEMU\\] Waiting for GDB Connection",
+                }
+            }
+        }
+    ]
+}

Lab3/CMakeLists.txt

@@ -11,7 +11,7 @@
 cmake_minimum_required(VERSION 3.14)
 project(ChCore)
 
-set(_cmake_script_dir ${CMAKE_CURRENT_SOURCE_DIR}/scripts/build/cmake)
+set(_cmake_script_dir ${CMAKE_CURRENT_SOURCE_DIR}/../Scripts/build/cmake)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_cmake_script_dir}/Modules)
 set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/user)
 
@@ -63,6 +63,7 @@ chcore_add_subproject(
     INSTALL_DIR ${_libc_install_dir}
     CMAKE_ARGS
         ${_common_args}
+        ${_cache_args}
         -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     CMAKE_CACHE_ARGS ${_cache_args}
     INSTALL_COMMAND echo "Performed in CMake"
@@ -166,6 +167,7 @@ chcore_add_subproject(
     INSTALL_DIR ${_system_services_install_dir}
     CMAKE_ARGS
         ${_common_args}
+        ${_cache_args}
         -DCHCORE_MUSL_LIBC_INSTALL_DIR=${_libc_install_dir} # used by user.cmake toolchain to find `musl-gcc`
         -DCHCORE_RAMDISK_DIR=${build_ramdisk_dir}
         # -DCHCORE_CI_CONFIG_DIR=${_ci_config_dir}
@@ -199,13 +201,15 @@ chcore_add_subproject(
     INSTALL_DIR ${_kernel_install_dir}
     CMAKE_ARGS
         ${_common_args}
+        ${_cache_args}
         -DCHCORE_USER_INSTALL_DIR=${_system_services_install_dir} # used by kernel/CMakeLists.txt to incbin cpio files
         -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
         -DCMAKE_TOOLCHAIN_FILE=${_cmake_script_dir}/Toolchains/kernel.cmake
     CMAKE_CACHE_ARGS ${_cache_args}
     DEPENDS system-services kernel-clean-incbin
     BUILD_ALWAYS TRUE)
 
+
 # Generate toolchain file
 configure_file(${_cmake_script_dir}/Toolchains/toolchain_tpl.cmake 
                 toolchain.cmake
@@ -234,17 +238,17 @@ add_dependencies(clean-all libc-clean-trigger system-services-clean-trigger)
 
 # --- Update Submodules (always run in local env) ---
 
-add_custom_target(update-submodules)
-
-macro(_update_submodule _target _subproject_path _module_rel_path)
-    add_custom_target(
-        ${_target}
-        WORKING_DIRECTORY ${_subproject_path}
-        COMMAND echo "Updating ${_subproject_path}/${_module_rel_path}..."
-        COMMAND git submodule update --init
-                --recursive --depth=1 ${_module_rel_path})
-    add_dependencies(update-submodules ${_target})
-endmacro()
+# add_custom_target(update-submodules)
+#
+# macro(_update_submodule _target _subproject_path _module_rel_path)
+#     add_custom_target(
+#         ${_target}
+#         WORKING_DIRECTORY ${_subproject_path}
+#         COMMAND echo "Updating ${_subproject_path}/${_module_rel_path}..."
+#         COMMAND git submodule update --init
+#                 --recursive --depth=1 ${_module_rel_path})
+#     add_dependencies(update-submodules ${_target})
+# endmacro()
 
 # _update_submodule(update-musl-libc ${_system_services_source_dir} chcore-libc/musl-libc)