ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Make runoff happy

Browse source
This commit is contained in:
Frans Kaashoek 2016-09-02 15:27:28 -04:00
parent b7fed77b7b
commit 5bf3fbee00
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
README
View file

@ -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
Austin Clements
In addition, we are grateful for the bug reports and patches contributed by We are also grateful for the bug reports and patches contributed by Silas
Silas Boyd-Wickizer, Mike CAT, Nelson Elhage, Nathaniel Filardo, Peter Boyd-Wickizer, Mike CAT, Nelson Elhage, Nathaniel Filardo, Peter Froehlich,
Froehlich, Yakir Goaran, Shivam Handa, Bryan Henry, Jim Huang, Anders Kaseorg, Yakir Goaran, Shivam Handa, Bryan Henry, Jim Huang, Anders Kaseorg, kehao95,
kehao95, Eddie Kohler, Imbar Marinescu, Yandong Mao, Hitoshi Mitake, Carmi Eddie Kohler, Imbar Marinescu, Yandong Mao, Hitoshi Mitake, Carmi Merimovich,
Merimovich, Joel Nider, Greg Price, Ayan Shafqat, Eldar Sehayek, Yongming Shen, Joel Nider, Greg Price, Ayan Shafqat, Eldar Sehayek, Yongming Shen, Cam Tenny,
Cam Tenny, Rafael Ubal, Warren Toomey, Stephen Tu, Pablo Ventura, Xi Wang, Rafael Ubal, Warren Toomey, Stephen Tu, Pablo Ventura, Xi Wang, Keiichi
Keiichi Watanabe, Nicolas Wolovick, Jindong Zhang, and Zou Chang Wei. 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
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".

3
elf.h
View file

@ -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.

3
main.c
View file

@ -113,6 +113,3 @@ pde_t entrypgdir[NPDENTRIES] = {
//PAGEBREAK! //PAGEBREAK!
// Blank page. // Blank page.
//PAGEBREAK! //PAGEBREAK!
// Blank page.
//PAGEBREAK!
// Blank page.

3
picirq.c
View file

@ -82,3 +82,6 @@ picinit(void)
if(irqmask != 0xFFFF) if(irqmask != 0xFFFF)
picsetmask(irqmask); picsetmask(irqmask);
} }
//PAGEBREAK!
// Blank page.