RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 15:27:35 +00:00
Code Issues Activity Actions

Kernel: Rename some ProcessorInfo members to match Intel manual

Browse source 
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.
This commit is contained in:
Linus Groh 2022-04-03 16:38:45 +01:00 • committed by Andreas Kling
parent ebe2cf8995
commit 53a95a5347
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Arch/x86/ProcessorInfo.h
View file

@ -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 };

10
Kernel/Arch/x86/common/ProcessorInfo.cpp
View file

@ -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();