Merge pull request qclic#4 from qclic/dev/new

Dev/new

.cargo/config.toml

@@ -3,4 +3,3 @@ runner = "ostool cargo-test"
 
 [build]
 target = "aarch64-unknown-none"
-

.github/workflows/ci.yml

@@ -16,15 +16,21 @@ jobs:
       run: sudo apt update && sudo apt install qemu-system -y 
     - name: Install libudev-dev
       run: sudo apt update && sudo apt install libudev-dev -y
-    - name: Install cargo-binutils
-      run: cargo install cargo-binutils
-    - name: Install ostool
-      run: cargo install ostool
-
     - name: Install toolchain
       run: rustup show
     - name: Check rust version
       run: rustc --version --verbose
+
+    - uses: Swatinem/rust-cache@v2
+      with:
+          workspaces: "."
+
+    - name: Install cargo-binutils
+      run: cargo install cargo-binutils
+    - name: Install ostool
+      run: cargo install ostool
+    - name: Add Target
+      run: rustup target add aarch64-unknown-none
     - name: Check code format
       run: cargo fmt --all -- --check
 
@@ -62,7 +68,7 @@ jobs:
     - name: Test sparreal-macros
       if: ${{ always() }}
       working-directory: crates/sparreal-macros
-      run: cargo test
+      run: cargo test --target x86_64-unknown-linux-gnu
 
     - name: Test page-table-arm
       if: ${{ always() }}

.gitignore

@@ -1,3 +1,2 @@
 /target
-/*.log
 .project*

.vscode/launch.json

@@ -4,31 +4,19 @@
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "xtask",
-            "cargo": {
-                "args": [
-                    "build",
-                    "-p",
-                    "xtask"
-                ]
-            },
-            "args": ["elf", "kernel/hal/bsp/aarch64/raspi4.toml"]
-        },
         // lldb 不支持 riscv，需要用此配置调试
         {
             "type": "cppdbg",
-            "name": "KDebug Riscv",
+            "name": "KDebug cppdbg",
             "request": "launch",
             "miDebuggerServerAddress": "localhost:1234",
-            "program": "${workspaceFolder}/target/riscv64gc-unknown-none-elf/debug/kernel",
-            "miDebuggerPath": "gdb-multiarch.exe",
+            "program": "${workspaceFolder}/target/kernel.elf",
+            "miDebuggerPath": "gdb-multiarch",
             "cwd": "${workspaceRoot}",
+            "preLaunchTask": "qemu debug"
         },
         {
-            "name": "KDebug",
+            "name": "KDebug lldb",
             "type": "lldb",
             "request": "custom",
             "initCommands": [
@@ -39,7 +27,8 @@
             ],
             "processCreateCommands": [
                 "gdb-remote localhost:1234" // Connect to the GDB Server
-            ]
+            ],
+            "preLaunchTask": "qemu debug"
         }
     ]
 }

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "rust-analyzer.cargo.allTargets": false,
-    "rust-analyzer.checkOnSave": false,
+    "rust-analyzer.checkOnSave": true,
     "rust-analyzer.check.command": "clippy",
     "lldb.displayFormat": "auto",
     "lldb.dereferencePointers": true,

.vscode/tasks.json

@@ -1,12 +1,33 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "qemu debug",
             "type": "shell",
-            "command": "cargo xtask -d"
+            "label": "qemu debug",
+            "command": "ostool",
+            "args": [
+                "run",
+                "qemu",
+                "-d"
+            ],
+
+            "options": {
+                "cwd": "${workspaceFolder}",
+            },
+            "problemMatcher": {
+                "base": "$rustc",
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^.*",
+                    "endsPattern": "^qemu-system.*"
+                }
+            },
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "detail": "断点调试 test 测试用例",
+            "isBackground": true,
         }
     ]
 }