RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:17:44 +00:00
Code Issues Activity Actions

Kernel: Consolidate features into CPUFeature enum

Browse source 
This allows us to consolidate printing out all the CPU features
into one log statement. Also expose them in /proc/cpuinfo
This commit is contained in:
Tom 2020-07-03 10:23:09 -06:00 • committed by Andreas Kling
parent e373e5f007
commit 9b4e6f6a23
9 changed files with 197 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Kernel/Arch/i386/CPU.h
View file

@ -265,7 +265,6 @@ struct RegisterState;
const DescriptorTablePointer& get_gdtr();
const DescriptorTablePointer& get_idtr();
void sse_init();
void register_interrupt_handler(u8 number, void (*f)());
void register_user_callable_interrupt_handler(u8 number, void (*f)());
GenericInterruptHandler& get_interrupt_handler(u8 interrupt_number);
@ -599,6 +598,19 @@ private:
SplitQword m_start;
};
enum class CPUFeature : u32 {
NX = (1 << 0),
PAE = (1 << 1),
PGE = (1 << 2),
RDRAND = (1 << 3),
RDSEED = (1 << 4),
SMAP = (1 << 5),
SMEP = (1 << 6),
SSE = (1 << 7),
TSC = (1 << 8),
UMIP = (1 << 9)
};
class Thread;
struct TrapFrame;
@ -614,6 +626,8 @@ class ProcessorInfo;
struct MemoryManagerData;
class Processor {
friend class ProcessorInfo;
Processor* m_self; // must be first field (%fs offset 0x0)
DescriptorTablePointer m_gdtr;
@ -626,6 +640,7 @@ class Processor {
TSS32 m_tss;
static FPUState s_clean_fpu_state;
CPUFeature m_features;
ProcessorInfo* m_info;
MemoryManagerData* m_mm_data;
@ -640,6 +655,11 @@ class Processor {
void write_gdt_entry(u16 selector, Descriptor& descriptor);
static Vector<Processor*>& processors();
void cpu_detect();
void cpu_setup();
String features_string() const;
public:
void early_initialize(u32 cpu);
void initialize(u32 cpu);
@ -740,6 +760,11 @@ public:
return s_clean_fpu_state;
}
ALWAYS_INLINE bool has_feature(CPUFeature f) const
{
return (static_cast<u32>(m_features) & static_cast<u32>(f)) != 0;
}
void check_invoke_scheduler();
void invoke_scheduler_async() { m_invoke_scheduler_async = true; }
@ -846,22 +871,9 @@ public:
}
};
void cpu_setup(u32 cpu);
extern bool g_cpu_supports_nx;
extern bool g_cpu_supports_pae;
extern bool g_cpu_supports_pge;
extern bool g_cpu_supports_rdrand;
extern bool g_cpu_supports_rdseed;
extern bool g_cpu_supports_smap;
extern bool g_cpu_supports_smep;
extern bool g_cpu_supports_sse;
extern bool g_cpu_supports_tsc;
extern bool g_cpu_supports_umip;
ALWAYS_INLINE void stac()
{
if (!g_cpu_supports_smap)
if (!Processor::current().has_feature(CPUFeature::SMAP))
return;
asm volatile("stac" ::
: "cc");
@ -869,7 +881,7 @@ ALWAYS_INLINE void stac()
ALWAYS_INLINE void clac()
{
if (!g_cpu_supports_smap)
if (!Processor::current().has_feature(CPUFeature::SMAP))
return;
asm volatile("clac" ::
: "cc");