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

19
kernel/x64/process.cpp
View file

@ -32,12 +32,12 @@
#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, void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
addr_t stackpos, addr_t entry, addr_t stackpos, addr_t entry,
CPU::InterruptRegisters* regs) CPU::InterruptRegisters* regs)
{ {
const uint64_t CS = 0x18; const uint64_t CS = 0x18;
const uint64_t DS = 0x20; const uint64_t DS = 0x20;
const uint64_t RPL = 0x3; const uint64_t RPL = 0x3;
@ -47,17 +47,17 @@ namespace Sortix
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, void InitializeThreadRegisters(CPU::InterruptRegisters* regs,
const tforkregs_t* requested) const tforkregs_t* requested)
{ {
memset(regs, 0, sizeof(*regs)); memset(regs, 0, sizeof(*regs));
regs->rip = requested->rip; regs->rip = requested->rip;
regs->userrsp = requested->rsp; regs->userrsp = requested->rsp;
@ -80,5 +80,6 @@ namespace Sortix
regs->ds = 0x20 | 0x3; regs->ds = 0x20 | 0x3;
regs->ss = 0x20 | 0x3; regs->ss = 0x20 | 0x3;
regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
} }
} // namespace Sortix

17
kernel/x86/process.cpp
View file

@ -32,12 +32,12 @@
#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, void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
addr_t stackpos, addr_t entry, addr_t stackpos, addr_t entry,
CPU::InterruptRegisters* regs) CPU::InterruptRegisters* regs)
{ {
regs->eax = argc; regs->eax = argc;
regs->ebx = (size_t) argv; regs->ebx = (size_t) argv;
regs->edx = envc; regs->edx = envc;
@ -49,11 +49,11 @@ namespace Sortix
regs->ds = UDS | URPL; regs->ds = UDS | URPL;
regs->ss = UDS | URPL; regs->ss = UDS | URPL;
regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
} }
void InitializeThreadRegisters(CPU::InterruptRegisters* regs, void InitializeThreadRegisters(CPU::InterruptRegisters* regs,
const tforkregs_t* requested) const tforkregs_t* requested)
{ {
memset(regs, 0, sizeof(*regs)); memset(regs, 0, sizeof(*regs));
regs->eip = requested->eip; regs->eip = requested->eip;
regs->useresp = requested->esp; regs->useresp = requested->esp;
@ -68,5 +68,6 @@ namespace Sortix
regs->ds = UDS | URPL; regs->ds = UDS | URPL;
regs->ss = UDS | URPL; regs->ss = UDS | URPL;
regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID;
}
} }
} // namespace Sortix