greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

set only PG and WP in vminit; the rest don't seem to be needed and are confusing

Browse source
This commit is contained in:
Robert Morris 2010-08-30 06:38:58 -04:00
parent 789b508d53
commit 5ab868fd90
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.c
View file

@ -41,7 +41,7 @@ void
mainc(void) mainc(void)
{ {
cprintf("\ncpu%d: starting xv6\n\n", cpu->id); cprintf("\ncpu%d: starting xv6\n\n", cpu->id);
kvmalloc(); // initialze the kernel page table kvmalloc(); // initialize the kernel page table
pinit(); // process table pinit(); // process table
tvinit(); // trap vectors tvinit(); // trap vectors
binit(); // buffer cache binit(); // buffer cache

1
user.h
View file

@ -21,6 +21,7 @@ int dup(int);
int getpid(); int getpid();
char* sbrk(int); char* sbrk(int);
int sleep(int); int sleep(int);
int uptime();
// ulib.c // ulib.c
int stat(char*, struct stat*); int stat(char*, struct stat*);

5
vm.c
View file

@ -375,8 +375,9 @@ vminit(void)
lcr3(PADDR(kpgdir)); lcr3(PADDR(kpgdir));
cr0 = rcr0(); cr0 = rcr0();
cr0 |= CR0_PE|CR0_PG|CR0_AM|CR0_WP|CR0_NE|CR0_TS|CR0_EM|CR0_MP; // cr0 |= CR0_PE|CR0_PG|CR0_AM|CR0_WP|CR0_NE|CR0_TS|CR0_EM|CR0_MP;
cr0 &= ~(CR0_TS|CR0_EM); // cr0 &= ~(CR0_TS|CR0_EM);
cr0 |= CR0_PG | CR0_WP;
lcr0(cr0); lcr0(cr0);
} }