Merge pull request rcore-os#229 from equation314/refactor-kernel-hal

Refactor kernel-hal

Author: equation314

.github/workflows/rustc20210727.yml

@@ -1,6 +1,6 @@
 name: current CI
 
-on: 
+on:
   push:
   pull_request:
   schedule:
@@ -11,21 +11,29 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: nightly-2021-07-27
           override: true
-          components: rustfmt, clippy
+          components: rust-src, rustfmt, clippy
       - name: Check code format
         uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: --all -- --check
-      - name: Clippy x86_64
+      - name: Clippy LibOS
         run: arch=x86_64 cargo clippy
-      - name: Clippy riscv64
-        run: arch=riscv64 cargo clippy
+      - name: Clippy x86_64 bare-metal
+        run: |
+          cd zCore
+          make clippy arch=x86_64
+      - name: Clippy riscv64 bare-metal
+        run: |
+          cd zCore
+          make clippy arch=riscv64 linux=1
 #        uses: actions-rs/cargo@v1
 #        with:
 #          command: clippy
@@ -52,7 +60,7 @@ jobs:
       - name: Build zCore
         run: |
           cd zCore
-          make build arch=x86_64 
+          make build arch=x86_64
       # FIX LATER
       # - name: Build zCore with hypervisor
       #   run: |
@@ -203,6 +211,7 @@ jobs:
       - name: Run libc-tests
         run: |
           cd scripts
+          pip3 install -r requirements.txt
           python3 libc-tests.py
           cat linux/test-result.txt
 
@@ -275,6 +284,8 @@ jobs:
           tar xJf qemu-share.tar.xz && sudo cp -r qemu /usr/local/share/
       - name: Prepare rootfs and oscomp
         run: make riscv-image
+      - name: Build  kernel
+        run: cd zCore && make build mode=release linux=1 arch=riscv64
       - name: Run baremetal-libc-test
         run: |
           cd scripts

.github/workflows/rustcnightly.yml

@@ -1,6 +1,6 @@
 name: rustcnightly CI
 
-on: 
+on:
   push:
   pull_request:
   schedule:
@@ -55,7 +55,7 @@ jobs:
       - name: Build zCore
         run: |
           cd zCore
-          make build arch=x86_64 
+          make build arch=x86_64
       # FIX LATER
       # - name: Build zCore with hypervisor
       #   run: |
@@ -212,6 +212,7 @@ jobs:
       - name: Run libc-tests
         run: |
           cd scripts
+          pip3 install -r requirements.txt
           python3 libc-tests.py
           cat linux/test-result.txt
 
@@ -289,6 +290,8 @@ jobs:
           tar xJf qemu-share.tar.xz && sudo cp -r qemu /usr/local/share/
       - name: Prepare rootfs and oscomp
         run: make riscv-image
+      - name: Build  kernel
+        run: cd zCore && make build mode=release linux=1 arch=riscv64
       - name: Run baremetal-libc-test
         run: |
           cd scripts

.gitignore

@@ -8,6 +8,8 @@ Cargo.lock
 /prebuilt/linux/riscv64/prebuild*
 .idea
 scripts/linux/test-result.txt
+scripts/zircon/test-result.txt
+scripts/zircon/test-output.txt
 rusty-tags.vi
 *.img
 zCore/src/link_user.S
@@ -17,4 +19,3 @@ stdout-zcore
 scripts/script.sh
 stdout-baremetal-test-rv64
 stdout-rv64
-

Cargo.toml

@@ -1,18 +1,16 @@
 [workspace]
 members = [
     "zircon-object",
+    "zircon-syscall",
     "zircon-loader",
     "linux-object",
-    "zircon-syscall",    
+    "linux-syscall",
     "linux-loader",
-    "kernel-hal-unix",
     "kernel-hal",
 ]
 
 exclude = [
     "zircon-user",
     "zCore",
     "rboot",
-    "linux-syscall",
-    "kernel-hal-bare",    
 ]

Makefile

@@ -67,7 +67,7 @@ riscv-image: rcore-fs-fuse riscv-rootfs
 	@echo building riscv.img
 	@rcore-fs-fuse zCore/riscv64.img riscv_rootfs zip
 	@qemu-img resize -f raw zCore/riscv64.img +5M
-	
+
 clean:
 	cargo clean
 	find zCore -maxdepth 1 -name "*.img" -delete