Merge pull request #153 from MRNIU/master

refactor

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
         shell: bash
         run: |
           brew install x86_64-elf-gcc
-          brew tap riscv/riscv
+          brew tap riscv-software-src/riscv
           brew install riscv-tools
 
       - name: make build dir

.gitignore

@@ -1,16 +1,14 @@
 
-# This file is a part of Simple-XX/SimpleKernel (https://github.com/Simple-XX/SimpleKernel).
+# This file is a part of Simple-XX/SimpleKernel
+# (https://github.com/Simple-XX/SimpleKernel).
 #
 # .gitinnore for Simple-XX/SimpleKernel.
 
-bochsout.txt
 *.o
 *.gch
 *.tags*
 .DS_Store
-build
-cmake-build-debug
-cmake-build-debug_simplekernel
+build*
 grub-2.04.tar.xz
 grub-2.04
 tools/opensbi
@@ -20,3 +18,5 @@ iso
 *.bin
 null.d
 tools/aarch64-unknown-linux-gnu*
+.gdbinit
+tools/opensbi/build

CMakeLists.txt

@@ -1,12 +1,12 @@
 
 # This file is a part of Simple-XX/SimpleKernel
 # (https://github.com/Simple-XX/SimpleKernel).
-# Based on https://github.com/SynestiaOS/SynestiaOS
+#
 # CMakeLists.txt for Simple-XX/SimpleKernel.
 # CMake 入口
 
 # 设置最小 cmake 版本
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 
 # 跳过编译器检查
 set(CMAKE_C_COMPILER_WORKS TRUE)

cmake/toolchain_linux_aarch64.cmake

@@ -1,5 +1,6 @@
 
-# This file is a part of Simple-XX/SimpleKernel (https://github.com/Simple-XX/SimpleKernel).
+# This file is a part of Simple-XX/SimpleKernel
+# (https://github.com/Simple-XX/SimpleKernel).
 # 
 # toolchain_linux_aarch64.cmake for Simple-XX/SimpleKernel.
 
@@ -11,13 +12,13 @@ set(CMAKE_SYSTEM_PROCESSOR AARCH64)
 # GCC
 find_program(GCC aarch64-none-eabi-gcc)
 if (NOT GCC)
-    message(FATAL_ERROR "aarch64-none-eabi-gcc not found.\n"
-            "Run `brew install aarch64-none-eabi-gcc` to install the toolchain")
+    message(FATAL_ERROR "gcc-aarch64-linux-gnu not found.\n"
+            "Run `sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu` to install.")
 else ()
-    message(STATUS "Found aarch64-none-eabi-gcc ${GCC}")
+    message(STATUS "Found gcc-aarch64-linux-gnu ${GCC}")
 endif ()
 
-set(TOOLCHAIN_PREFIX   aarch64-none-eabi-)
+set(TOOLCHAIN_PREFIX   aarch64-linux-gnu-)
 set(CMAKE_C_COMPILER   ${TOOLCHAIN_PREFIX}gcc)
 set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++)
 set(CMAKE_READELF      ${TOOLCHAIN_PREFIX}readelf)
@@ -31,7 +32,7 @@ set(CMAKE_RANLIB       ${TOOLCHAIN_PREFIX}ranlib)
 find_program(QEMU qemu-system-aarch64)
 if (NOT QEMU)
     message(FATAL_ERROR "qemu not found.\n"
-            "Please install qemu first.")
+            "Run `sudo apt-get install -y qemu-system` to install.")
 else ()
     message(STATUS "Found qemu ${QEMU}")
 endif ()

cmake/toolchain_linux_riscv.cmake

@@ -1,5 +1,6 @@
 
-# This file is a part of Simple-XX/SimpleKernel (https://github.com/Simple-XX/SimpleKernel).
+# This file is a part of Simple-XX/SimpleKernel
+# (https://github.com/Simple-XX/SimpleKernel).
 # 
 # toolchain_linux_riscv.cmake for Simple-XX/SimpleKernel.
 
@@ -11,7 +12,7 @@ set(CMAKE_SYSTEM_PROCESSOR RISCV)
 find_program(RISCV riscv64-linux-gnu-g++)
 if (NOT RISCV)
     message(FATAL_ERROR "riscv64-linux-gnu-gcc not found.\n"
-            "Run `sudo apt-get install -y gcc-riscv64-linux-gnu g++-riscv64-linux-gnu` to install the toolchain. Then add the bin path to you PATH.")
+            "Run `sudo apt-get install -y gcc-riscv64-linux-gnu g++-riscv64-linux-gnu` to install.")
 else ()
     message(STATUS "Found riscv64-linux-gnu-gcc ${RISCV}.")
 endif ()
@@ -30,7 +31,7 @@ set(CMAKE_RANLIB       ${TOOLCHAIN_PREFIX}ranlib)
 find_program(QEMU qemu-system-riscv64)
 if (NOT QEMU)
     message(FATAL_ERROR "qemu not found.\n"
-            "Please install qemu-system-riscv64 first.")
+            "Run `sudo apt-get install -y qemu-system` to install.")
 else ()
     message(STATUS "Found qemu ${QEMU}")
 endif ()

cmake/toolchain_linux_x86_64.cmake

@@ -1,5 +1,6 @@
 
-# This file is a part of Simple-XX/SimpleKernel (https://github.com/Simple-XX/SimpleKernel).
+# This file is a part of Simple-XX/SimpleKernel
+# (https://github.com/Simple-XX/SimpleKernel).
 # 
 # toolchain_linux_x86_64.cmake for Simple-XX/SimpleKernel.
 
@@ -11,7 +12,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
 find_program(G++ g++)
 if (NOT G++)
     message(FATAL_ERROR "g++ not found.\n"
-            "Run `sudo apt-get install -y gcc g++` to install the toolchain")
+            "Run `sudo apt-get install -y gcc g++` to install.")
 else ()
     message(STATUS "Found g++ ${G++}")
 endif ()
@@ -20,7 +21,7 @@ endif ()
 find_program(XORRISO xorriso)
 if (NOT XORRISO)
     message(FATAL_ERROR "xorriso not found.\n"
-            "Run `sudo apt-get install -y xorriso` to install the toolchain")
+            "Run `sudo apt-get install -y xorriso` to install.")
 else ()
     message(STATUS "Found xorriso ${XORRISO}")
 endif ()
@@ -29,25 +30,16 @@ endif ()
 find_program(GRUB grub-file)
 if (NOT GRUB)
     message(FATAL_ERROR "grub-file not found.\n"
-            "Please install grub2 common first.")
+            "Run `sudo apt-get install -y grub2` to install.")
 else ()
     message(STATUS "Found grub-file ${GRUB}")
 endif ()
 
-# bochs
-find_program(BOCHS bochs)
-if (NOT BOCHS)
-    message(FATAL_ERROR "bochs not found.\n"
-            "Please install bochs and bochs-x first.")
-else ()
-    message(STATUS "Found bochs ${BOCHS}")
-endif ()
-
 # qemu
 find_program(QEMU qemu-system-x86_64)
 if (NOT QEMU)
     message(FATAL_ERROR "qemu not found.\n"
-            "Please install qemu first.")
+            "Run `sudo apt-get install -y qemu-system` to install.")
 else ()
     message(STATUS "Found qemu ${QEMU}")
 endif ()

cmake/toolchain_mac_riscv.cmake

@@ -19,7 +19,7 @@ endif ()
 find_program(RISCV riscv64-unknown-elf-gcc)
 if (NOT RISCV)
     message(FATAL_ERROR "riscv64-unknown-elf-gcc not found.\n"
-            "Run `brew tap riscv/riscv` and `brew install riscv-tools` to install the toolchain. Then add the bin path to you PATH.")
+            "Run `brew tap riscv-software-src/riscv` and `brew install riscv-tools` to install the toolchain. Then add the bin path to you PATH.")
 else ()
     message(STATUS "Found riscv64-unknown-elf-gcc ${RISCV}.")
 endif ()

cmake/toolchain_mac_x86_64.cmake

@@ -52,15 +52,6 @@ else ()
     message(STATUS "Found grub-file ${GRUB}")
 endif ()
 
-# bochs
-find_program(BOCHS bochs)
-if (NOT BOCHS)
-    message(FATAL_ERROR "bochs not found.\n"
-            "run `brew install bochs` to install the toolchain")
-else ()
-    message(STATUS "Found bochs ${BOCHS}")
-endif ()
-
 # qemu
 find_program(QEMU qemu-system-x86_64)
 if (NOT QEMU)