From 53a95a53470867ee35911cfdd8e94b508459e5fa Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Sun, 3 Apr 2022 16:38:45 +0100
Subject: [PATCH] Kernel: Rename some ProcessorInfo members to match Intel
 manual

Let's use terminology from the the Intel manual to avoid confusion.
Also add `_string` suffixes to better distinguish the numeric values
from the string values.
---
 Kernel/Arch/x86/ProcessorInfo.h          | 16 ++++++++--------
 Kernel/Arch/x86/common/ProcessorInfo.cpp | 10 +++++-----
 Kernel/GlobalProcessExposed.cpp          |  7 ++++---
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Kernel/Arch/x86/ProcessorInfo.h b/Kernel/Arch/x86/ProcessorInfo.h
index 1f8f91f972..3f45a67078 100644
--- a/Kernel/Arch/x86/ProcessorInfo.h
+++ b/Kernel/Arch/x86/ProcessorInfo.h
@@ -20,12 +20,12 @@ class ProcessorInfo {
 public:
     ProcessorInfo(Processor const& processor);
 
-    static NonnullOwnPtr<KString> query_processor_cpuid();
-    static NonnullOwnPtr<KString> query_processor_brand();
+    static NonnullOwnPtr<KString> build_vendor_id_string();
+    static NonnullOwnPtr<KString> build_brand_string();
 
-    StringView cpuid() const { return m_cpuid->view(); }
-    StringView brand() const { return m_brand->view(); }
-    StringView features() const { return m_features->view(); }
+    StringView vendor_id_string() const { return m_vendor_id_string->view(); }
+    StringView brand_string() const { return m_brand_string->view(); }
+    StringView features_string() const { return m_features_string->view(); }
     u32 display_model() const { return m_display_model; }
     u32 display_family() const { return m_display_family; }
     u32 stepping() const { return m_stepping; }
@@ -35,9 +35,9 @@ public:
     void set_apic_id(u32 apic_id) { m_apic_id = apic_id; }
 
 private:
-    NonnullOwnPtr<KString> m_cpuid;
-    NonnullOwnPtr<KString> m_brand;
-    NonnullOwnPtr<KString> m_features;
+    NonnullOwnPtr<KString> m_vendor_id_string;
+    NonnullOwnPtr<KString> m_brand_string;
+    NonnullOwnPtr<KString> m_features_string;
     u32 m_display_model { 0 };
     u32 m_display_family { 0 };
     u32 m_stepping { 0 };
diff --git a/Kernel/Arch/x86/common/ProcessorInfo.cpp b/Kernel/Arch/x86/common/ProcessorInfo.cpp
index ef5ebbed6a..6c66305719 100644
--- a/Kernel/Arch/x86/common/ProcessorInfo.cpp
+++ b/Kernel/Arch/x86/common/ProcessorInfo.cpp
@@ -13,9 +13,9 @@
 namespace Kernel {
 
 ProcessorInfo::ProcessorInfo(Processor const& processor)
-    : m_cpuid(query_processor_cpuid())
-    , m_brand(query_processor_brand())
-    , m_features(processor.features_string())
+    : m_vendor_id_string(build_vendor_id_string())
+    , m_brand_string(build_brand_string())
+    , m_features_string(processor.features_string())
 {
     CPUID cpuid(1);
     m_stepping = cpuid.eax() & 0xf;
@@ -36,7 +36,7 @@ ProcessorInfo::ProcessorInfo(Processor const& processor)
     }
 }
 
-NonnullOwnPtr<KString> ProcessorInfo::query_processor_cpuid()
+NonnullOwnPtr<KString> ProcessorInfo::build_vendor_id_string()
 {
     CPUID cpuid(0);
     StringBuilder builder;
@@ -53,7 +53,7 @@ NonnullOwnPtr<KString> ProcessorInfo::query_processor_cpuid()
     return KString::must_create(builder.string_view());
 }
 
-NonnullOwnPtr<KString> ProcessorInfo::query_processor_brand()
+NonnullOwnPtr<KString> ProcessorInfo::build_brand_string()
 {
     u32 max_extended_leaf = CPUID(0x80000000).eax();
 
diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp
index ea0c333178..d1f312a164 100644
--- a/Kernel/GlobalProcessExposed.cpp
+++ b/Kernel/GlobalProcessExposed.cpp
@@ -582,14 +582,15 @@ private:
                 auto& info = proc.info();
                 auto obj = TRY(array.add_object());
                 TRY(obj.add("processor", proc.id()));
-                TRY(obj.add("cpuid", info.cpuid()));
+                // FIXME: Rename this to use the same name everywhere.
+                TRY(obj.add("cpuid", info.vendor_id_string()));
                 TRY(obj.add("family", info.display_family()));
 
                 auto features_array = TRY(obj.add_array("features"));
                 auto keep_empty = false;
 
                 ErrorOr<void> result; // FIXME: Make this nicer
-                info.features().for_each_split_view(' ', keep_empty, [&](StringView feature) {
+                info.features_string().for_each_split_view(' ', keep_empty, [&](StringView feature) {
                     if (result.is_error())
                         return;
                     result = features_array.add(feature);
@@ -601,7 +602,7 @@ private:
                 TRY(obj.add("model", info.display_model()));
                 TRY(obj.add("stepping", info.stepping()));
                 TRY(obj.add("type", info.type()));
-                TRY(obj.add("brand", info.brand()));
+                TRY(obj.add("brand", info.brand_string()));
 
                 TRY(obj.finish());
                 return {};