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

Kernel: Tidy up the ScopedCritical class a little bit

Browse source
This commit is contained in:
Andreas Kling 2020-07-06 11:27:07 +02:00
parent 0d851b1930
commit 3e0020e67d
1 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -776,49 +776,44 @@ public:
else else
cli(); cli();
} }
ALWAYS_INLINE u32& in_critical() { return m_in_critical; } ALWAYS_INLINE u32& in_critical() { return m_in_critical; }
ALWAYS_INLINE const FPUState& clean_fpu_state() const ALWAYS_INLINE const FPUState& clean_fpu_state() const
{ {
return s_clean_fpu_state; return s_clean_fpu_state;
} }
ALWAYS_INLINE bool has_feature(CPUFeature f) const ALWAYS_INLINE bool has_feature(CPUFeature f) const
{ {
return (static_cast<u32>(m_features) & static_cast<u32>(f)) != 0; return (static_cast<u32>(m_features) & static_cast<u32>(f)) != 0;
} }
void check_invoke_scheduler(); void check_invoke_scheduler();
void invoke_scheduler_async() { m_invoke_scheduler_async = true; } void invoke_scheduler_async() { m_invoke_scheduler_async = true; }
void enter_trap(TrapFrame& trap, bool raise_irq); void enter_trap(TrapFrame& trap, bool raise_irq);
void exit_trap(TrapFrame& trap); void exit_trap(TrapFrame& trap);
[[noreturn]] void initialize_context_switching(Thread& initial_thread); [[noreturn]] void initialize_context_switching(Thread& initial_thread);
void switch_context(Thread*& from_thread, Thread*& to_thread); void switch_context(Thread*& from_thread, Thread*& to_thread);
[[noreturn]] static void assume_context(Thread& thread, u32 flags); [[noreturn]] static void assume_context(Thread& thread, u32 flags);
u32 init_context(Thread& thread, bool leave_crit); u32 init_context(Thread& thread, bool leave_crit);
static bool get_context_frame_ptr(Thread& thread, u32& frame_ptr, u32& eip); static bool get_context_frame_ptr(Thread& thread, u32& frame_ptr, u32& eip);
void set_thread_specific(u8* data, size_t len); void set_thread_specific(u8* data, size_t len);
}; };
class ScopedCritical class ScopedCritical {
{ AK_MAKE_NONCOPYABLE(ScopedCritical);
u32 m_prev_flags;
bool m_valid;
public: public:
ScopedCritical(const ScopedCritical&) = delete;
ScopedCritical& operator=(const ScopedCritical&) = delete;
ScopedCritical() ScopedCritical()
{ {
m_valid = true; m_valid = true;
Processor::current().enter_critical(m_prev_flags); Processor::current().enter_critical(m_prev_flags);
} }
~ScopedCritical() ~ScopedCritical()
{ {
if (m_valid) { if (m_valid) {
@ -827,30 +822,30 @@ public:
} }
} }
ScopedCritical(ScopedCritical&& from): ScopedCritical(ScopedCritical&& from)
m_prev_flags(from.m_prev_flags), : m_prev_flags(exchange(from.m_prev_flags, 0))
m_valid(from.m_valid) , m_valid(exchange(from.m_valid, false))
{ {
from.m_prev_flags = 0;
from.m_valid = false;
} }
ScopedCritical& operator=(ScopedCritical&& from) ScopedCritical& operator=(ScopedCritical&& from)
{ {
if (&from != this) { if (&from != this) {
m_prev_flags = from.m_prev_flags; m_prev_flags = exchange(from.m_prev_flags, 0);
m_valid = from.m_valid; m_valid = exchange(from.m_valid, false);
from.m_prev_flags = 0;
from.m_valid = false;
} }
return *this; return *this;
} }
private:
u32 m_prev_flags { 0 };
bool m_valid { false };
}; };
struct TrapFrame { struct TrapFrame {
u32 prev_irq_level; u32 prev_irq_level;
RegisterState* regs; // must be last RegisterState* regs; // must be last
TrapFrame() = delete; TrapFrame() = delete;
TrapFrame(const TrapFrame&) = delete; TrapFrame(const TrapFrame&) = delete;
TrapFrame(TrapFrame&&) = delete; TrapFrame(TrapFrame&&) = delete;