nits in index.txt

add slides for shell, x86 intro, x86 virtual memory  (deleted JOS from slides)

diff --git a/web/Makefile b/web/Makefile
index 7b4977322a2455372ea04db51dd62255ae122257..107d6830c2bca129b89ae1c981f2579446e726e4 100644 (file)
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,3 +1,3 @@
 index.html: index.txt mkhtml
-       mkhtml index.txt >_$@ && mv _$@ $@
+       ./mkhtml index.txt >_$@ && mv _$@ $@
 

diff --git a/web/index.html b/web/index.html
index d5f940cadef3d9aaeaab63839cf428c44e15ab1d..4f8e84c7eb2f3779fbbd4fc0b6f57afc7e06a0fa 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -70,11 +70,10 @@ Intel x86 machines.
 Xv6's use of the x86 makes it more relevant to
 students' experience than V6 was
 and unifies the course around a single architecture.
-Adding multiprocessor support also helps relevance
-and makes it easier to discuss threads and concurrency.
-(In a single processor operating system, concurrency–which only
-happens because of interrupts–is too easy to view as a special case.
-A multiprocessor operating system must attack the problem head on.)
+Adding multiprocessor support requires handling concurrency head on with
+locks and threads (instead of using special-case solutions for
+uniprocessors such as
+enabling/disabling interrupts) and helps relevance.
 Finally, writing a new system allowed us to write cleaner versions
 of the rougher parts of V6, like the scheduler and file system.
 <br><br>
@@ -85,7 +84,8 @@ Since then, xv6 has stabilized, so we are making it
 available in the hopes that others will find it useful too.
 <br><br>
 6.828 uses both xv6 and Jos.
-Courses taught at UCLA, NYU, and Stanford have used
+Courses taught at UCLA, NYU, Peking University, Stanford, Tsinghua,
+and University Texas (Austin) have used
 Jos without xv6; we believe other courses could use
 xv6 without Jos, though we are not aware of any that have.
 
@@ -130,6 +130,7 @@ Jos labs, students implement a Unix-like interface
 and culminating in a Unix shell.
 <br><br>
 <a href="l1.html">lecture notes</a>
+<a href="os-lab-1.pdf">OS abstractions slides</a>
 
 <br><br><b><i>Lecture 2.  PC hardware and x86 programming</i></b>
 <br><br>
@@ -143,6 +144,7 @@ Reading: PC Assembly Language
 Homework: familiarize with Bochs
 <br><br>
 <a href="l2.html">lecture notes</a>
+<a href="os-lab-2.pdf">x86 intro slides</a>
 <a href="x86-intro.html">homework</a>
 
 <br><br><b><i>Lecture 3.  Operating system organization</i></b>
@@ -180,6 +182,7 @@ xv6: bootasm.S, bootother.S, <a href="src/bootmain.c.html">bootmain.c</a>, <a hr
 Homework: Bochs stack introduction
 <br><br>
 <a href="l4.html">lecture notes</a>
+<a href="os-lab-3.pdf">x86 virtual memory slides</a>
 <a href="xv6-intro.html">homework</a>
 
 <br><br><b><i>Lecture 5.  Address spaces using page tables</i></b>

diff --git a/web/index.txt b/web/index.txt
index 41d42a42fad4b36390bc2cbdcf41122565e6d6a5..e3b0c95c8108caff1831e3c2a269b2389fa92267 100644 (file)
--- a/web/index.txt
+++ b/web/index.txt
@@ -36,11 +36,10 @@ Intel x86 machines.
 Xv6's use of the x86 makes it more relevant to
 students' experience than V6 was
 and unifies the course around a single architecture.
-Adding multiprocessor support also helps relevance
-and makes it easier to discuss threads and concurrency.
-(In a single processor operating system, concurrency--which only
-happens because of interrupts--is too easy to view as a special case.
-A multiprocessor operating system must attack the problem head on.)
+Adding multiprocessor support requires handling concurrency head on with
+locks and threads (instead of using special-case solutions for
+uniprocessors such as
+enabling/disabling interrupts) and helps relevance.
 Finally, writing a new system allowed us to write cleaner versions
 of the rougher parts of V6, like the scheduler and file system.
 
@@ -51,7 +50,8 @@ Since then, xv6 has stabilized, so we are making it
 available in the hopes that others will find it useful too.
 
 6.828 uses both xv6 and Jos.  
-Courses taught at UCLA, NYU, and Stanford have used
+Courses taught at UCLA, NYU, Peking University, Stanford, Tsinghua,
+and University Texas (Austin) have used
 Jos without xv6; we believe other courses could use
 xv6 without Jos, though we are not aware of any that have.
 
@@ -101,6 +101,7 @@ Jos labs, students implement a Unix-like interface
 and culminating in a Unix shell.
 
 [l1.html | lecture notes]
+[os-lab-1.pdf | OS abstractions slides]
 
 
 Lecture 2.  PC hardware and x86 programming
@@ -115,6 +116,7 @@ Reading: PC Assembly Language
 Homework: familiarize with Bochs
 
 [l2.html | lecture notes]
+[os-lab-2.pdf | x86 intro slides]
 [x86-intro.html | homework]
 
 
@@ -154,6 +156,7 @@ xv6: bootasm.S, bootother.S, bootmain.c, main.c, init.c, and setupsegs in proc.c
 Homework: Bochs stack introduction
 
 [l4.html | lecture notes]
+[os-lab-3.pdf | x86 virtual memory slides]
 [xv6-intro.html | homework]
  
 

diff --git a/web/os-lab-1.pdf b/web/os-lab-1.pdf
new file mode 100644 (file)
index 0000000..80fc3c4
Binary files /dev/null and b/web/os-lab-1.pdf differ

diff --git a/web/os-lab-1.ppt b/web/os-lab-1.ppt
new file mode 100644 (file)
index 0000000..42e532a
Binary files /dev/null and b/web/os-lab-1.ppt differ

diff --git a/web/os-lab-2.pdf b/web/os-lab-2.pdf
new file mode 100644 (file)
index 0000000..35ad709
Binary files /dev/null and b/web/os-lab-2.pdf differ

diff --git a/web/os-lab-2.ppt b/web/os-lab-2.ppt
new file mode 100644 (file)
index 0000000..fb03327
Binary files /dev/null and b/web/os-lab-2.ppt differ

diff --git a/web/os-lab-3.pdf b/web/os-lab-3.pdf
new file mode 100644 (file)
index 0000000..33e6997
Binary files /dev/null and b/web/os-lab-3.pdf differ

diff --git a/web/os-lab-3.ppt b/web/os-lab-3.ppt
new file mode 100644 (file)
index 0000000..3d45ee2
Binary files /dev/null and b/web/os-lab-3.ppt differ