ch3

Author: Huzhiwen1208

.github/workflows/doc-and-test.yml

@@ -7,25 +7,6 @@ env:
   rust_toolchain: nightly-2024-01-18
 
 jobs:
-  build-doc:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview
-          target: riscv64gc-unknown-none-elf
-      - name: Build doc
-        run: cd os && cargo doc --no-deps --verbose
-      - name: Deploy to Github Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./os/target/riscv64gc-unknown-none-elf/doc
-          destination_dir: ${{ github.ref_name }}
-
   run-tests:
     runs-on: ubuntu-latest
     steps:
@@ -44,25 +25,44 @@ jobs:
       - name: Cache QEMU
         uses: actions/cache@v3
         with:
-          path: qemu-7.0.0
-          key: qemu-7.0.0-x86_64-riscv64
+          path: qemu-8.2.1
+          key: qemu-8.2.1-x86_64-riscv64
       - name: Install QEMU
         run: |
-          sudo apt-get update
-          sudo apt-get install ninja-build -y
-          if [ ! -d qemu-7.0.0 ]; then
-            wget https://download.qemu.org/qemu-7.0.0.tar.xz
-            tar -xf qemu-7.0.0.tar.xz
-            cd qemu-7.0.0
-            ./configure --target-list=riscv64-softmmu
+          wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
+          unzip ninja-linux.zip
+          sudo mv ninja /usr/local/bin/
+          ninja --version
+          if [ ! -d qemu-8.2.1 ]; then
+            wget https://download.qemu.org/qemu-8.2.1.tar.xz
+            tar -xf qemu-8.2.1.tar.xz
+            cd qemu-8.2.1
+            ./configure --target-list=riscv64-softmmu,x86_64-softmmu,loongarch64-softmmu,aarch64-softmmu
             make -j
           else
-            cd qemu-7.0.0
+            cd qemu-8.2.1
           fi
           sudo make install
           qemu-system-riscv64 --version
+          qemu-system-aarch64 --version
+          qemu-system-loongarch64 --version
+          qemu-system-x86_64 --version
 
-      - name: Run usertests
+      - name: Run usertests in RISC-V
         run: cd os && make run TEST=1
         timeout-minutes: 10
 
+      - name: Run usertests in AArch64
+        run: cd os && make run TEST=1 ARCH=aarch64
+        timeout-minutes: 10
+
+      - name: Run usertests in x86_64
+        run: cd os && make run TEST=1 ARCH=x86_64
+        timeout-minutes: 10
+      
+      # - name: Run usertests in LoongArch64
+      #   run: |
+      #     trap 'exit 0' SIGTERM
+      #     cd os && make run TEST=1 ARCH=loongarch64
+      #   timeout-minutes: 2
+

.gitignore

@@ -25,3 +25,6 @@ easy-fs-fuse/target/*
 tools/
 pushall.sh
 *.bak
+
+*log*
+/bin

os/Cargo.toml

@@ -7,15 +7,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 log = "0.4"
 bitflags = "1.2.1"
 buddy_system_allocator = "0.6"
-
-[dependencies.polyhal]
-features = ["kcontext"]
-git = "https://github.com/Byte-OS/polyhal.git"
+polyhal = { git = "https://github.com/Huzhiwen1208/polyhal.git", branch = "feature/libos-sup", features = [
+    "kcontext",
+] }
 
 [profile.release]
 debug = true