add ringswitch stuff
This commit is contained in:
@@ -11,6 +11,30 @@ void switchToUsermode(void *stackpointer, void *kickoff,
|
||||
(void)stackpointer;
|
||||
(void)kickoff;
|
||||
(void)kickoff_parameter;
|
||||
|
||||
// Segment Selectors for Ring 3
|
||||
constexpr uint16_t user_cs = 3 << 3 | 3;
|
||||
constexpr uint16_t user_ds = 4 << 3 | 3;
|
||||
|
||||
asm volatile ( \
|
||||
"pushq %[user_data] \n" \
|
||||
"pushq %[user_stack] \n" \
|
||||
"pushq %[user_eflags] \n" \
|
||||
"pushq %[user_code] \n" \
|
||||
"pushq %[user_function] \n" \
|
||||
"mov %[user_parameter], %%rdi\n" \
|
||||
"iretq \n" \
|
||||
: \
|
||||
: [user_data] "r"((uint64_t)user_ds),
|
||||
[user_code] "r"((uint64_t)user_cs),
|
||||
[user_stack] "r"((uint64_t)stackpointer),
|
||||
[user_eflags] "r"((uint64_t)1<<9 | 2), // Interrupt Enable Flag
|
||||
[user_function] "r"((uint64_t)kickoff),
|
||||
[user_parameter] "r"((uint64_t)kickoff_parameter)
|
||||
\
|
||||
: "memory", "rdi"\
|
||||
);
|
||||
|
||||
__builtin_unreachable();
|
||||
}
|
||||
} // namespace Ring
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// vim: set noet ts=4 sw=4:
|
||||
|
||||
#include "thread.h"
|
||||
#include "../arch/core_ring.h"
|
||||
|
||||
#include "../debug/kernelpanic.h"
|
||||
#include "../interrupt/guard.h"
|
||||
@@ -17,11 +18,26 @@ void Thread::kickoff(uintptr_t param1, uintptr_t param2, uintptr_t param3) {
|
||||
// The core must have entered level 1/2 to cause a thread to be scheduled.
|
||||
Guard::leave();
|
||||
|
||||
thread->action();
|
||||
if(!thread->isKernel)
|
||||
Core::Ring::switchToUsermode(thread->StackPointer.user, reinterpret_cast<void*>(kickoffUsermode), thread);
|
||||
else
|
||||
if(thread->start == nullptr)
|
||||
thread->action();
|
||||
else
|
||||
((void(*)())thread->start)();
|
||||
|
||||
}
|
||||
|
||||
void Thread::kickoffUsermode (Thread *object){
|
||||
(void) object;
|
||||
if(object->start == nullptr)
|
||||
object->action();
|
||||
else
|
||||
((void(*)())object->start)();
|
||||
}
|
||||
|
||||
Thread::Thread (bool kernel, void * start): queue_link(nullptr), isKernel(kernel), start(start), id(idCounter++), kill_flag(false){
|
||||
void *tos = reinterpret_cast<void *>(reserved_stack_space_isr + STACK_SIZE);
|
||||
prepareContext(tos, context, kickoff, reinterpret_cast<uintptr_t>(this), 0, 0);
|
||||
}
|
||||
|
||||
Thread::Thread() : queue_link(nullptr), id(idCounter++), kill_flag(false) {
|
||||
|
||||
@@ -28,12 +28,15 @@ class Thread {
|
||||
/*! \brief pointer to the next element of the readylist
|
||||
*/
|
||||
Thread* queue_link;
|
||||
bool isKernel;
|
||||
void* start;
|
||||
|
||||
friend class Queue<Thread>;
|
||||
friend class Semaphore;
|
||||
/*! \brief Memory reserved for this threads stack
|
||||
*/
|
||||
alignas(16) char reserved_stack_space[STACK_SIZE];
|
||||
alignas(16) char reserved_stack_space_user[STACK_SIZE];
|
||||
alignas(16) char reserved_stack_space_isr[STACK_SIZE];
|
||||
|
||||
struct{
|
||||
void* user;
|
||||
@@ -80,6 +83,7 @@ class Thread {
|
||||
*
|
||||
*/
|
||||
explicit Thread();
|
||||
explicit Thread(bool kernel, void * start = nullptr);
|
||||
|
||||
/*! \brief Activates the first thread on this CPU.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user