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

Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6

Browse source
This commit is contained in:
Robert Morris 2011-09-01 13:26:03 -04:00
commit 1eadf4a8fc
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
entry.S
View file

@ -17,8 +17,7 @@
#include "asm.h" #include "asm.h"
#include "memlayout.h" #include "memlayout.h"
#include "mmu.h" #include "mmu.h"
#include "param.h"
#define STACK 4096
# Multiboot header. Data to direct multiboot loader. # Multiboot header. Data to direct multiboot loader.
.p2align 2 .p2align 2
@ -52,7 +51,7 @@ entry:
movl %eax, %cr0 movl %eax, %cr0
# Set up the stack pointer. # Set up the stack pointer.
movl $(stack + STACK), %esp movl $(stack + KSTACKSIZE), %esp
# Jump to main(), and switch to executing at # Jump to main(), and switch to executing at
# high addresses. The indirect call is needed because # high addresses. The indirect call is needed because
@ -61,4 +60,4 @@ entry:
mov $main, %eax mov $main, %eax
jmp *%eax jmp *%eax
.comm stack, STACK .comm stack, KSTACKSIZE

1
x86.h
View file

@ -170,7 +170,6 @@ xchg(volatile uint *addr, uint newval)
return result; return result;
} }
//PAGEBREAK!
static inline void static inline void
lcr0(uint val) lcr0(uint val)
{ {