test pre-commit

Signed-off-by: Zone.N <[email protected]>
MRNIU · Dec 6, 2024 · e40971a · e40971a
1 parent 65c0d4c
commit e40971a
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 28 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -21,6 +21,5 @@ Checks: >
   -readability-named-parameter,
   -readability-braces-around-statements,
   -readability-magic-numbers
-HeaderFilterRegex: '^${sourceDir}/src/*'
 FormatStyle: google
 ...
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,21 +22,30 @@ repos:
       - id: clang-format
         args:
           - --style=file
-      - id: clang-tidy
-        args:
-          - --checks=.clang-tidy
-          - -p=/root/SimpleKernel/build_riscv64/compiler_commands.json
-          - -extra-arg=--std=c++2b
-      - id: clang-tidy
-        args:
-          - --checks=.clang-tidy
-          - -p=/root/SimpleKernel/build_x86_64/compiler_commands.json
-          - -extra-arg=--std=c++2b
-      - id: clang-tidy
-        args:
-          - --checks=.clang-tidy
-          - -p=/root/SimpleKernel/build_aarch64/compiler_commands.json
-          - -extra-arg=--std=c++2b
+      # - id: clang-tidy
+      #   args:
+      #     - --checks=.clang-tidy
+      #     - -p=/root/SimpleKernel/build_x86_64/build_x86_64/compiler_commands.json
+      #     - -extra-arg=--std=c++2b
+      #     - --fix
+      #     - --header-filter=^(?/root/SimpleKernel/build_x86_64/src/).*
+          # - --exclude-header-filter=^(?/root/SimpleKernel/build_x86_64/src/arch/x86_64|/root/SimpleKernel/build_x86_64/src/arch/aarch64).*
+      # - id: clang-tidy
+      #   args:
+      #     - --checks=.clang-tidy
+      #     - -p=/root/SimpleKernel/build_x86_64/build_x86_64/compiler_commands.json
+      #     - -extra-arg=--std=c++2b
+      #     - --fix
+      #     - --header-filter=^(?/root/SimpleKernel/build_x86_64/src/).*
+      #     - --exclude-header-filter=^(?/root/SimpleKernel/build_x86_64/src/arch/riscv_64|/root/SimpleKernel/build_x86_64/src/arch/aarch64).*
+      # - id: clang-tidy
+      #   args:
+      #     - --checks=.clang-tidy
+      #     - -p=/root/SimpleKernel/build_x86_64/build_aarch64/compiler_commands.json
+      #     - -extra-arg=--std=c++2b
+      #     - --fix
+      #     - --header-filter=^(?/root/SimpleKernel/build_x86_64/src/).*
+      #     - --exclude-header-filter=^(?/root/SimpleKernel/build_x86_64/src/arch/riscv64|/root/SimpleKernel/build_x86_64/src/arch/x86_64).*
 
   - repo: https://github.com/koalaman/shellcheck-precommit
     rev: v0.10.0

diff --git a/cmake/project_config.cmake b/cmake/project_config.cmake
@@ -55,5 +55,5 @@ ENDIF()
 # 生成项目配置头文件，传递给代码
 CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/tools/project_config.h.in
                 ${CMAKE_SOURCE_DIR}/src/project_config.h @ONLY)
-# CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/tools/.pre-commit-config.yaml.in
-# ${CMAKE_SOURCE_DIR}/.pre-commit-config.yaml @ONLY)
+CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/tools/.pre-commit-config.yaml.in
+                ${CMAKE_SOURCE_DIR}/.pre-commit-config.yaml @ONLY)
diff --git a/src/kernel/arch/x86_64/include/cpu/cpu.hpp b/src/kernel/arch/x86_64/include/cpu/cpu.hpp
@@ -37,8 +37,9 @@ namespace cpu {
  * @param  port           要读的端口
  * @return uint8_t         读取到的数据
  */
-static __always_inline uint8_t InByte(const uint32_t port) {
+static __always_inline auto InByte(const uint32_t port) -> uint8_t {
   uint8_t data;
+
   __asm__ volatile("inb %1, %0" : "=a"(data) : "dN"(port));
   return data;
 }
@@ -48,7 +49,7 @@ static __always_inline uint8_t InByte(const uint32_t port) {
  * @param  port           要读的端口
  * @return uint16_t        读取到的数据
  */
-static __always_inline uint16_t InWord(const uint32_t port) {
+static __always_inline auto InWord(const uint32_t port) -> uint16_t {
   uint16_t data;
   __asm__ volatile("inw %1, %0" : "=a"(data) : "dN"(port));
   return data;
@@ -59,7 +60,7 @@ static __always_inline uint16_t InWord(const uint32_t port) {
  * @param  port           要读的端口
  * @return uint32_t        读取到的数据
  */
-static __always_inline uint32_t InLong(const uint32_t port) {
+static __always_inline auto InLong(const uint32_t port) -> uint32_t {
   uint32_t data;
   __asm__ volatile("inl %1, %0" : "=a"(data) : "dN"(port));
   return data;
@@ -170,7 +171,7 @@ class Serial {
    * @return false
    */
   [[nodiscard]] auto SerialReceived() const -> bool {
-    return InByte(port_ + 5) & 1;
+    return bool(InByte(port_ + 5) & 1);
   }
 
   /**
@@ -179,7 +180,7 @@ class Serial {
    * @return false
    */
   [[nodiscard]] auto IsTransmitEmpty() const -> bool {
-    return InByte(port_ + 5) & 0x20;
+    return bool((InByte(port_ + 5) & 0x20) != 0);
   }
 };
 };  // namespace cpu

diff --git a/tools/.pre-commit-config.yaml.in b/tools/.pre-commit-config.yaml.in
@@ -22,11 +22,30 @@ repos:
       - id: clang-format
         args:
           - --style=file
-      - id: clang-tidy
-        args:
-          - --checks=.clang-tidy
-          - -p=@CMAKE_BINARY_DIR@/compiler_commands.json
-          - -extra-arg=--std=c++2b
+      # - id: clang-tidy
+      #   args:
+      #     - --checks=.clang-tidy
+      #     - -p=@CMAKE_BINARY_DIR@/build_x86_64/compiler_commands.json
+      #     - -extra-arg=--std=c++2b
+      #     - --fix
+      #     - --header-filter=^(?@CMAKE_BINARY_DIR@/src/).*
+          # - --exclude-header-filter=^(?@CMAKE_BINARY_DIR@/src/arch/x86_64|@CMAKE_BINARY_DIR@/src/arch/aarch64).*
+      # - id: clang-tidy
+      #   args:
+      #     - --checks=.clang-tidy
+      #     - -p=@CMAKE_BINARY_DIR@/build_x86_64/compiler_commands.json
+      #     - -extra-arg=--std=c++2b
+      #     - --fix
+      #     - --header-filter=^(?@CMAKE_BINARY_DIR@/src/).*
+      #     - --exclude-header-filter=^(?@CMAKE_BINARY_DIR@/src/arch/riscv_64|@CMAKE_BINARY_DIR@/src/arch/aarch64).*
+      # - id: clang-tidy
+      #   args:
+      #     - --checks=.clang-tidy
+      #     - -p=@CMAKE_BINARY_DIR@/build_aarch64/compiler_commands.json
+      #     - -extra-arg=--std=c++2b
+      #     - --fix
+      #     - --header-filter=^(?@CMAKE_BINARY_DIR@/src/).*
+      #     - --exclude-header-filter=^(?@CMAKE_BINARY_DIR@/src/arch/riscv64|@CMAKE_BINARY_DIR@/src/arch/x86_64).*
 
   - repo: https://github.com/koalaman/shellcheck-precommit
     rev: v0.10.0