Skip to content

X
xv6-public
提交 5bf3fbee 创建 作者: Frans Kaashoek's avatar Frans Kaashoek
浏览文件
操作

Make runoff happy

上级 b7fed77b
显示空白字符变更
内嵌 并排
正在显示 包含 18 行增加 和 18 行删除
README
浏览文件 @ 5bf3fbee
...@@ -15,20 +15,17 @@ xv6 borrows code from the following sources: ...@@ -15,20 +15,17 @@ xv6 borrows code from the following sources:
FreeBSD (ioapic.c) FreeBSD (ioapic.c)
NetBSD (console.c) NetBSD (console.c)
The following people have made contributions: The following people have made contributions: Russ Cox (context switching,
Russ Cox (context switching, locking) locking), Cliff Frey (MP), Xiao Yu (MP), Nickolai Zeldovich, and Austin
Cliff Frey (MP) Clements.
Xiao Yu (MP)
Nickolai Zeldovich We are also grateful for the bug reports and patches contributed by Silas
Austin Clements Boyd-Wickizer, Mike CAT, Nelson Elhage, Nathaniel Filardo, Peter Froehlich,
Yakir Goaran, Shivam Handa, Bryan Henry, Jim Huang, Anders Kaseorg, kehao95,
In addition, we are grateful for the bug reports and patches contributed by Eddie Kohler, Imbar Marinescu, Yandong Mao, Hitoshi Mitake, Carmi Merimovich,
Silas Boyd-Wickizer, Mike CAT, Nelson Elhage, Nathaniel Filardo, Peter Joel Nider, Greg Price, Ayan Shafqat, Eldar Sehayek, Yongming Shen, Cam Tenny,
Froehlich, Yakir Goaran, Shivam Handa, Bryan Henry, Jim Huang, Anders Kaseorg, Rafael Ubal, Warren Toomey, Stephen Tu, Pablo Ventura, Xi Wang, Keiichi
kehao95, Eddie Kohler, Imbar Marinescu, Yandong Mao, Hitoshi Mitake, Carmi Watanabe, Nicolas Wolovick, Jindong Zhang, and Zou Chang Wei.
Merimovich, Joel Nider, Greg Price, Ayan Shafqat, Eldar Sehayek, Yongming Shen,
Cam Tenny, Rafael Ubal, Warren Toomey, Stephen Tu, Pablo Ventura, Xi Wang,
Keiichi Watanabe, Nicolas Wolovick, Jindong Zhang, and Zou Chang Wei.
The code in the files that constitute xv6 is The code in the files that constitute xv6 is
Copyright 2006-2016 Frans Kaashoek, Robert Morris, and Russ Cox. Copyright 2006-2016 Frans Kaashoek, Robert Morris, and Russ Cox.
...@@ -43,7 +40,7 @@ BUILDING AND RUNNING XV6 ...@@ -43,7 +40,7 @@ BUILDING AND RUNNING XV6
To build xv6 on an x86 ELF machine (like Linux or FreeBSD), run "make". To build xv6 on an x86 ELF machine (like Linux or FreeBSD), run "make".
On non-x86 or non-ELF machines (like OS X, even on x86), you will On non-x86 or non-ELF machines (like OS X, even on x86), you will
need to install a cross-compiler gcc suite capable of producing x86 ELF need to install a cross-compiler gcc suite capable of producing x86 ELF
binaries. See http://pdos.csail.mit.edu/6.828/2014/tools.html. binaries. See http://pdos.csail.mit.edu/6.828/2016/tools.html.
Then run "make TOOLPREFIX=i386-jos-elf-". Then run "make TOOLPREFIX=i386-jos-elf-".
To run xv6, install the QEMU PC simulators. To run in QEMU, run "make qemu". To run xv6, install the QEMU PC simulators. To run in QEMU, run "make qemu".
......
elf.h
浏览文件 @ 5bf3fbee
...@@ -40,3 +40,6 @@ struct proghdr { ...@@ -40,3 +40,6 @@ struct proghdr {
#define ELF_PROG_FLAG_EXEC 1 #define ELF_PROG_FLAG_EXEC 1
#define ELF_PROG_FLAG_WRITE 2 #define ELF_PROG_FLAG_WRITE 2
#define ELF_PROG_FLAG_READ 4 #define ELF_PROG_FLAG_READ 4
//PAGEBREAK!
// Blank page.
main.c
浏览文件 @ 5bf3fbee
...@@ -113,6 +113,3 @@ pde_t entrypgdir[NPDENTRIES] = { ...@@ -113,6 +113,3 @@ pde_t entrypgdir[NPDENTRIES] = {
//PAGEBREAK! //PAGEBREAK!
// Blank page. // Blank page.
//PAGEBREAK! //PAGEBREAK!
// Blank page.
//PAGEBREAK!
// Blank page.
picirq.c
浏览文件 @ 5bf3fbee
...@@ -82,3 +82,6 @@ picinit(void) ...@@ -82,3 +82,6 @@ picinit(void)
if(irqmask != 0xFFFF) if(irqmask != 0xFFFF)
picsetmask(irqmask); picsetmask(irqmask);
} }
//PAGEBREAK!
// Blank page.
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论