RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 16:44:57 +00:00
Code Issues Activity Actions

Kernel: Push ARCH specific ifdef's down into RegisterState functions

Browse source 
The non CPU specific code of the kernel shouldn't need to deal with
architecture specific registers, and should instead deal with an
abstract view of the machine. This allows us to remove a variety of
architecture specific ifdefs and helps keep the code slightly more
portable.

We do this by exposing the abstract representation of instruction
pointer, stack pointer, base pointer, return register, etc on the
RegisterState struct.
This commit is contained in:
Brian Gianforcaro 2021-07-18 16:50:08 -07:00 • committed by Gunnar Beutner
parent ff8429a749
commit 1cffecbe8d
9 changed files with 119 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Kernel/Scheduler.cpp
View file

@ -235,7 +235,7 @@ bool Scheduler::pick_next()
dbgln("Scheduler[{}]: Switch to {} @ {:04x}:{:08x}",
Processor::id(),
thread_to_schedule,
thread_to_schedule.regs().cs, thread_to_schedule.regs().eip);
thread_to_schedule.regs().cs, thread_to_schedule.regs().ip());
#else
dbgln("Scheduler[{}]: Switch to {} @ {:04x}:{:016x}",
Processor::id(),
@ -295,13 +295,16 @@ bool Scheduler::context_switch(Thread* thread)
from_thread->set_state(Thread::Runnable);
#ifdef LOG_EVERY_CONTEXT_SWITCH
const auto msg =
# if ARCH(I386)
dbgln("Scheduler[{}]: {} -> {} [prio={}] {:04x}:{:08x}", Processor::id(), from_thread->tid().value(),
thread->tid().value(), thread->priority(), thread->regs().cs, thread->regs().eip);
"Scheduler[{}]: {} -> {} [prio={}] {:04x}:{:08x}";
# else
dbgln("Scheduler[{}]: {} -> {} [prio={}] {:04x}:{:16x}", Processor::id(), from_thread->tid().value(),
thread->tid().value(), thread->priority(), thread->regs().cs, thread->regs().rip);
"Scheduler[{}]: {} -> {} [prio={}] {:04x}:{:16x}";
# endif
dbgln(msg,
Processor::id(), from_thread->tid().value(),
thread->tid().value(), thread->priority(), thread->regs().cs, thread->regs().ip());
#endif
}
@ -322,14 +325,8 @@ bool Scheduler::context_switch(Thread* thread)
VERIFY(thread == Thread::current());
if (thread->process().is_user_process()) {
FlatPtr flags;
auto& regs = Thread::current()->get_register_dump_from_stack();
#if ARCH(I386)
flags = regs.eflags;
#else
flags = regs.rflags;
#endif
auto iopl = get_iopl_from_eflags(flags);
auto iopl = get_iopl_from_eflags(regs.flags());
if (iopl != 0) {
PANIC("Switched to thread {} with non-zero IOPL={}", Thread::current()->tid().value(), iopl);
}
@ -604,15 +601,9 @@ void dump_thread_list(bool with_stack_traces)
};
auto get_eip = [](Thread& thread) -> u32 {
#if ARCH(I386)
if (!thread.current_trap())
return thread.regs().eip;
return thread.get_register_dump_from_stack().eip;
#else
if (!thread.current_trap())
return thread.regs().rip;
return thread.get_register_dump_from_stack().rip;
#endif
return thread.regs().ip();
return thread.get_register_dump_from_stack().ip();
};
Thread::for_each([&](Thread& thread) {