Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I have no frickin' clue what's causing these startup crashes. Requires further investigation.

Browse Source
This commit is contained in:
Kevin Lange 2012-02-16 15:09:56 -06:00
parent a1d821de9b
commit 8fb69d44cd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/mem/mem.c
View File

@ -322,11 +322,11 @@ page_fault(
}
#if 1
int present = !(r->err_code & 0x1);
int rw = r->err_code & 0x2;
int user = r->err_code & 0x4;
int reserved = r->err_code & 0x8;
int id = r->err_code & 0x10;
int present = !(r->err_code & 0x1) ? 1 : 0;
int rw = r->err_code & 0x2 ? 1 : 0;
int user = r->err_code & 0x4 ? 1 : 0;
int reserved = r->err_code & 0x8 ? 1 : 0;
int id = r->err_code & 0x10 ? 1 : 0;
kprintf("\033[1;37;41mSegmentation fault. (p:%d,rw:%d,user:%d,res:%d,id:%d) at 0x%x eip:0x%x pid=%d \033[0m\n",
present, rw, user, reserved, id, faulting_address, r->eip, getpid());

2
kernel/misc/elf.c
View File

@ -13,7 +13,7 @@
#include <elf.h>
#include <process.h>
#define USER_STACK_TOP 0x10100000
#define USER_STACK_TOP 0x10010000
#define USER_STACK_BOTTOM 0x10000000
/**

4
userspace/compositor.c
View File

@ -636,14 +636,14 @@ int main(int argc, char ** argv) {
if (!fork()) {
waitabit();
waitabit();
waitabit();
char * args[] = {"/bin/drawlines", "100","100","300","300",NULL};
execve(args[0], args, NULL);
}
if (!fork()) {
waitabit();
waitabit();
waitabit();
char * args[] = {"/bin/julia-win", "200","200","400","400",NULL};
execve(args[0], args, NULL);