Skip to content

X
xv6-public
提交 1eadf4a8 创建 作者: Robert Morris's avatar Robert Morris
浏览文件
操作

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

上级 371ab7fa 6bb92213
显示空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 5 行删除
entry.S
浏览文件 @ 1eadf4a8
...@@ -17,8 +17,7 @@ ...@@ -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: ...@@ -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: ...@@ -61,4 +60,4 @@ entry:
mov $main, %eax mov $main, %eax
jmp *%eax jmp *%eax
.comm stack, STACK .comm stack, KSTACKSIZE
x86.h
浏览文件 @ 1eadf4a8
...@@ -170,7 +170,6 @@ xchg(volatile uint *addr, uint newval) ...@@ -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)
{ {
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论