justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

WIP ring3

Browse Source
This commit is contained in:
Justin C. Miller
2018-05-20 01:03:04 -07:00
parent 814d6f1de6
commit 24ccf65aba
4 changed files with 158 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/kernel/scheduler.cpp
View File

@@ -10,25 +10,18 @@ scheduler scheduler::s_instance(nullptr);
static const uint32_t quantum = 5000000;
const int stack_size = 0x1000;
char taskAstack[stack_size];
char taskBstack[stack_size];
char taskAstack0[stack_size];
char taskAstack3[stack_size];
char taskBstack0[stack_size];
char taskBstack3[stack_size];
uint64_t taskAcount = 0;
void taskA()
{
console *cons = console::get();
while(1) {
cons->putc('.');
}
}
extern "C" void taskA();
void taskB()
{
console *cons = console::get();
while(1) {
cons->putc('+');
}
while (1);
}
@@ -40,7 +33,7 @@ scheduler::scheduler(lapic *apic) :
}
static process
create_process(uint16_t pid, void *stack, void (*rip)())
create_process(uint16_t pid, void *stack0, void *stack3, void (*rip)())
{
uint64_t flags;
__asm__ __volatile__ ( "pushf; pop %0" : "=r" (flags) );
@@ -48,21 +41,26 @@ create_process(uint16_t pid, void *stack, void (*rip)())
// This is a hack for now, until we get a lot more set up.
// I just want to see task switching working inside ring0 first
uint16_t kcs = (1 << 3) | 0;
uint16_t cs = (3 << 3) | 3;
uint16_t cs = (5 << 3) | 3;
uint16_t kss = (2 << 3) | 0;
uint16_t ss = (4 << 3) | 3;
void *sp = kutil::offset_pointer(stack, stack_size);
cpu_state *state = reinterpret_cast<cpu_state *>(sp) - 1;
void *sp0 = kutil::offset_pointer(stack0, stack_size);
cpu_state *state = reinterpret_cast<cpu_state *>(sp0) - 1;
kutil::memset(state, 0, sizeof(cpu_state));
state->ds = state->ss = kss;
state->cs = kcs;
state->rflags = 0x202;
state->user_rsp = reinterpret_cast<uint64_t>(sp);
state->ds = state->ss = ss;
state->cs = cs;
state->rflags = 0x202; // testing. TODO: 0x202
state->rip = reinterpret_cast<uint64_t>(rip);
log::debug(logs::task, "Creating a user RSP of %016lx", state->user_rsp);
void *sp3 = kutil::offset_pointer(stack3, stack_size);
state->user_rsp = reinterpret_cast<uint64_t>(sp3);
log::debug(logs::task, "Creating PID %d:", pid);
log::debug(logs::task, " RSP0 %016lx", state);
log::debug(logs::task, " RSP3 %016lx", sp3);
return {pid, reinterpret_cast<addr_t>(state)};
}
@@ -73,8 +71,8 @@ scheduler::start()
m_apic->enable_timer(isr::isrTimer, 128, quantum, false);
m_processes.append({0, 0}); // The kernel idle task
m_processes.append(create_process(1, &taskAstack[0], &taskA));
m_processes.append(create_process(2, &taskBstack[0], &taskB));
m_processes.append(create_process(1, &taskAstack0[0], &taskAstack3[0], &taskA));
m_processes.append(create_process(2, &taskBstack0[0], &taskBstack3[0], &taskB));
}
addr_t
@@ -85,7 +83,9 @@ scheduler::tick(addr_t rsp0)
m_processes[m_current].rsp = rsp0;
m_current = (m_current + 1) % m_processes.count();
rsp0 = m_processes[m_current].rsp;
tss_set_stack(0, rsp0);
// Set rsp0 to after the end of the about-to-be-popped cpu state
tss_set_stack(0, rsp0 + sizeof(cpu_state));
m_apic->reset_timer(quantum);
return rsp0;