From 97575a239b8f4d87a8f7ad5bb324c8e71c02d4d9 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 26 Mar 2021 10:26:10 +0200
Subject: clang-tidy fixes

---
 src/cpu/cpu.h | 14 +++++++-------
 src/kernel.cc |  4 ++--
 src/makefile  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 2dc9cbe..5b4763f 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -75,14 +75,14 @@ public:
   CPU();
   ~CPU() = default;
 
-  const char* manufacturer() const { return m_manufacturer; }
-  uint8_t family() const { return m_info.family == 15 ? m_info.family + m_info.family_ex : m_info.family; }
-  uint8_t model() const {
+  [[nodiscard]] const char* manufacturer() const { return m_manufacturer; }
+  [[nodiscard]] uint8_t family() const { return m_info.family == 15 ? m_info.family + m_info.family_ex : m_info.family; }
+  [[nodiscard]] uint8_t model() const {
     return (m_info.model == 6 || m_info.model == 15) ? (static_cast<uint8_t>(m_info.model_ex << 4) + m_info.model)
                                                      : m_info.model;
   }
-  uint8_t stepping() const { return m_info.stepping; }
-  auto features() const { return m_features; }
+  [[nodiscard]] uint8_t stepping() const { return m_info.stepping; }
+  [[nodiscard]] auto features() const { return m_features; }
 
 private:
   char m_manufacturer[13] = {'\0'};
@@ -91,10 +91,10 @@ private:
     uint8_t model : 4 = 0;
     uint8_t family : 4 = 0;
     uint8_t type : 2 = 0;
-    uint8_t reserved_1 : 2 = 0;
+    [[maybe_unused]] uint8_t unused_1 : 2 = 0;
     uint8_t model_ex : 4 = 0;
     uint8_t family_ex : 8 = 0;
-    uint8_t reserved_2 : 4 = 0;
+    [[maybe_unused]] uint8_t unused_2 : 4 = 0;
   } __attribute__((packed)) m_info;
 
   features_t m_features;
diff --git a/src/kernel.cc b/src/kernel.cc
index 53500bc..578344c 100644
--- a/src/kernel.cc
+++ b/src/kernel.cc
@@ -32,7 +32,7 @@ extern "C" {
 void dump_multiboot(uint32_t mb_magic, uint32_t mb_addr);
 void dump_gdt();
 
-void kernel_main(uint32_t mb_magic, const uint32_t mb_addr) {
+[[noreturn]] void kernel_main(uint32_t mb_magic, const uint32_t mb_addr) {
 #ifdef HAS_SERIAL0
   if constexpr (serial0_console)
     if (serial0.self_check()) Console::set(&serial0);
@@ -53,7 +53,7 @@ void kernel_main(uint32_t mb_magic, const uint32_t mb_addr) {
   runtime_assert(core0.features().cx8, "CPU lacks cx8");
 
   dump_address();
-  // dump_gdt();
+   dump_gdt();
 
   {
     printk("Multiboot2 header at ", uhex{mb_addr}, '\n');
diff --git a/src/makefile b/src/makefile
index 96507ce..1d85f4b 100644
--- a/src/makefile
+++ b/src/makefile
@@ -41,7 +41,7 @@ $(CXX_OBJ) : $(OBJ_DIR)/%.o : %.cc
 	@$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) -MMD -MJ$(subst .o,.json,$@) -c $< -o $@
 
 $(OBJ_DIR)/glitch.elf: $(autogen) $(AS_OBJ) $(CXX_OBJ) linker.ld
-	@echo "  LD   $@"
+	@echo "  LD   $(@F)"
 	@$(LD) $(LD_FLAGS) -o $@ $(AS_OBJ) $(CXX_OBJ) -lk -ld
 
 # constexpr tests
-- 
cgit v1.2.1