Skip to content
Snippets Groups Projects
Commit 5773efa1 authored by Federico's avatar Federico
Browse files

Improve process fault logic

parent f930d1a3
No related branches found
No related tags found
No related merge requests found
...@@ -299,16 +299,17 @@ void *Process::start(void *) ...@@ -299,16 +299,17 @@ void *Process::start(void *)
unsigned int entry=proc->program.getEntryPoint(); unsigned int entry=proc->program.getEntryPoint();
Thread::setupUserspaceContext(entry,proc->argc,proc->argvSp,proc->envp, Thread::setupUserspaceContext(entry,proc->argc,proc->argvSp,proc->envp,
proc->image.getProcessBasePointer(),proc->image.getMainStackSize()); proc->image.getProcessBasePointer(),proc->image.getMainStackSize());
SvcResult svcResult=Resume; SvcResult svcResult;
do { do {
SyscallParameters sp=Thread::switchToUserspace(); SyscallParameters sp=Thread::switchToUserspace();
bool fault=proc->fault.faultHappened(); bool fault=proc->fault.faultHappened();
//Handle svc only if no fault occurred if(fault) svcResult=Segfault;
if(fault==false) svcResult=proc->handleSvc(sp); else svcResult=proc->handleSvc(sp); //Handle svc only if no fault
if(Thread::testTerminate() || svcResult==Exit) running=false; if(Thread::testTerminate() || svcResult==Exit) running=false;
if(fault || svcResult==Segfault) //Segfault either because fault==true or handleSvc returned Segfault
if(svcResult==Segfault)
{ {
running=false; running=false;
proc->exitCode=SIGSEGV; //Segfault proc->exitCode=SIGSEGV; //Segfault
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment