kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Update kernel/{x64,x86}/process.cpp to current coding conventions.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2014-01-04 01:51:50 +01:00
parent 3fa5fff3f5
commit ccb0f368a3
2 changed files with 85 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
kernel/x64/process.cpp
View file

@ -32,53 +32,54 @@
#include <sortix/kernel/kernel.h> #include <sortix/kernel/kernel.h>
#include <sortix/kernel/process.h> #include <sortix/kernel/process.h>
namespace Sortix namespace Sortix {
void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
addr_t stackpos, addr_t entry,
CPU::InterruptRegisters* regs)
{ {
void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp, const uint64_t CS = 0x18;
addr_t stackpos, addr_t entry, const uint64_t DS = 0x20;
CPU::InterruptRegisters* regs) const uint64_t RPL = 0x3;
{
const uint64_t CS = 0x18;
const uint64_t DS = 0x20;
const uint64_t RPL = 0x3;
regs->rdi = argc; regs->rdi = argc;
regs->rsi = (size_t) argv; regs->rsi = (size_t) argv;
regs->rdx = envc; regs->rdx = envc;
regs->rcx = (size_t) envp; regs->rcx = (size_t) envp;
regs->rip = entry; regs->rip = entry;
regs->userrsp = stackpos & ~(15UL); regs->userrsp = stackpos & ~15UL;
regs->rbp = regs->userrsp; regs->rbp = regs->userrsp;
regs->cs = CS | RPL; regs->cs = CS | RPL;
regs->ds = DS | RPL; regs->ds = DS | RPL;
regs->ss = DS | RPL; regs->ss = DS | RPL;
regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
void InitializeThreadRegisters(CPU::InterruptRegisters* regs,
const tforkregs_t* requested)
{
memset(regs, 0, sizeof(*regs));
regs->rip = requested->rip;
regs->userrsp = requested->rsp;
regs->rax = requested->rax;
regs->rbx = requested->rbx;
regs->rcx = requested->rcx;
regs->rdx = requested->rdx;
regs->rdi = requested->rdi;
regs->rsi = requested->rsi;
regs->rbp = requested->rbp;
regs->r8 = requested->r8;
regs->r9 = requested->r9;
regs->r10 = requested->r10;
regs->r11 = requested->r11;
regs->r12 = requested->r12;
regs->r13 = requested->r13;
regs->r14 = requested->r14;
regs->r15 = requested->r15;
regs->cs = 0x18 | 0x3;
regs->ds = 0x20 | 0x3;
regs->ss = 0x20 | 0x3;
regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
} }
void InitializeThreadRegisters(CPU::InterruptRegisters* regs,
const tforkregs_t* requested)
{
memset(regs, 0, sizeof(*regs));
regs->rip = requested->rip;
regs->userrsp = requested->rsp;
regs->rax = requested->rax;
regs->rbx = requested->rbx;
regs->rcx = requested->rcx;
regs->rdx = requested->rdx;
regs->rdi = requested->rdi;
regs->rsi = requested->rsi;
regs->rbp = requested->rbp;
regs->r8 = requested->r8;
regs->r9 = requested->r9;
regs->r10 = requested->r10;
regs->r11 = requested->r11;
regs->r12 = requested->r12;
regs->r13 = requested->r13;
regs->r14 = requested->r14;
regs->r15 = requested->r15;
regs->cs = 0x18 | 0x3;
regs->ds = 0x20 | 0x3;
regs->ss = 0x20 | 0x3;
regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
} // namespace Sortix

73
kernel/x86/process.cpp
View file

@ -32,41 +32,42 @@
#include <sortix/kernel/kernel.h> #include <sortix/kernel/kernel.h>
#include <sortix/kernel/process.h> #include <sortix/kernel/process.h>
namespace Sortix namespace Sortix {
{
void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
addr_t stackpos, addr_t entry,
CPU::InterruptRegisters* regs)
{
regs->eax = argc;
regs->ebx = (size_t) argv;
regs->edx = envc;
regs->ecx = (size_t) envp;
regs->eip = entry;
regs->useresp = stackpos & ~(15UL);
regs->ebp = regs->useresp;
regs->cs = UCS | URPL;
regs->ds = UDS | URPL;
regs->ss = UDS | URPL;
regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
void InitializeThreadRegisters(CPU::InterruptRegisters* regs, void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
const tforkregs_t* requested) addr_t stackpos, addr_t entry,
{ CPU::InterruptRegisters* regs)
memset(regs, 0, sizeof(*regs)); {
regs->eip = requested->eip; regs->eax = argc;
regs->useresp = requested->esp; regs->ebx = (size_t) argv;
regs->eax = requested->eax; regs->edx = envc;
regs->ebx = requested->ebx; regs->ecx = (size_t) envp;
regs->ecx = requested->ecx; regs->eip = entry;
regs->edx = requested->edx; regs->useresp = stackpos & ~(15UL);
regs->edi = requested->edi; regs->ebp = regs->useresp;
regs->esi = requested->esi; regs->cs = UCS | URPL;
regs->ebp = requested->ebp; regs->ds = UDS | URPL;
regs->cs = UCS | URPL; regs->ss = UDS | URPL;
regs->ds = UDS | URPL; regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
regs->ss = UDS | URPL;
regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
} }
void InitializeThreadRegisters(CPU::InterruptRegisters* regs,
const tforkregs_t* requested)
{
memset(regs, 0, sizeof(*regs));
regs->eip = requested->eip;
regs->useresp = requested->esp;
regs->eax = requested->eax;
regs->ebx = requested->ebx;
regs->ecx = requested->ecx;
regs->edx = requested->edx;
regs->edi = requested->edi;
regs->esi = requested->esi;
regs->ebp = requested->ebp;
regs->cs = UCS | URPL;
regs->ds = UDS | URPL;
regs->ss = UDS | URPL;
regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
} // namespace Sortix