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

Kernel: Make Thread::kernel_stack_base() work for kernel processes.

Browse source
This commit is contained in:
Andreas Kling 2019-05-17 03:43:51 +02:00
parent c414e65498
commit 45ff3a7e6a
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Thread.cpp
View file

@ -44,11 +44,13 @@ Thread::Thread(Process& process)
if (m_process.is_ring0()) {
// FIXME: This memory is leaked.
// But uh, there's also no kernel process termination, so I guess it's not technically leaked...
dword stack_bottom = (dword)kmalloc_eternal(default_kernel_stack_size);
m_tss.esp = (stack_bottom + default_kernel_stack_size) & 0xfffffff8u;
m_kernel_stack_base = (dword)kmalloc_eternal(default_kernel_stack_size);
m_tss.esp = (m_kernel_stack_base + default_kernel_stack_size) & 0xfffffff8u;
} else {
// Ring3 processes need a separate stack for Ring0.
m_kernel_stack_region = MM.allocate_kernel_region(default_kernel_stack_size, String::format("Kernel Stack (Thread %d)", m_tid));
m_kernel_stack_base = m_kernel_stack_region->laddr().get();
m_tss.ss0 = 0x10;
m_tss.esp0 = m_kernel_stack_region->laddr().offset(default_kernel_stack_size).get() & 0xfffffff8u;
}

3
Kernel/Thread.h
View file

@ -101,7 +101,7 @@ public:
void set_ticks_left(dword t) { m_ticks_left = t; }
dword ticks_left() const { return m_ticks_left; }
dword kernel_stack_base() const { return m_kernel_stack_region->laddr().get(); }
dword kernel_stack_base() const { return m_kernel_stack_base; }
dword kernel_stack_for_signal_handler_base() const { return m_kernel_stack_for_signal_handler_region ? m_kernel_stack_for_signal_handler_region->laddr().get() : 0; }
void set_selector(word s) { m_far_ptr.selector = s; }
@ -145,6 +145,7 @@ private:
dword m_times_scheduled { 0 };
dword m_pending_signals { 0 };
dword m_signal_mask { 0 };
dword m_kernel_stack_base { 0 };
RetainPtr<Region> m_kernel_stack_region;
RetainPtr<Region> m_kernel_stack_for_signal_handler_region;
pid_t m_waitee_pid { -1 };