second commit

commit the final version of last term
lqhl · May 26, 2011 · 79fb0db · 79fb0db
1 parent 6d024a8
commit 79fb0db
Show file tree

Hide file tree

Showing 305 changed files with 16,264 additions and 0 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>nachos</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Sat Oct 02 22:34:02 CST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/bin/nachos/ag/AutoGrader.class b/bin/nachos/ag/AutoGrader.class
diff --git a/bin/nachos/ag/BasicTestGrader$ThreadHandler.class b/bin/nachos/ag/BasicTestGrader$ThreadHandler.class
diff --git a/bin/nachos/ag/BasicTestGrader.class b/bin/nachos/ag/BasicTestGrader.class
diff --git a/bin/nachos/ag/BoatGrader.class b/bin/nachos/ag/BoatGrader.class
diff --git a/bin/nachos/ag/CoffGrader$1.class b/bin/nachos/ag/CoffGrader$1.class
diff --git a/bin/nachos/ag/CoffGrader$2.class b/bin/nachos/ag/CoffGrader$2.class
diff --git a/bin/nachos/ag/CoffGrader$EmbededConsole.class b/bin/nachos/ag/CoffGrader$EmbededConsole.class
diff --git a/bin/nachos/ag/CoffGrader.class b/bin/nachos/ag/CoffGrader.class
diff --git a/bin/nachos/ag/DonationGrader$1.class b/bin/nachos/ag/DonationGrader$1.class
diff --git a/bin/nachos/ag/DonationGrader$2.class b/bin/nachos/ag/DonationGrader$2.class
diff --git a/bin/nachos/ag/DonationGrader$3.class b/bin/nachos/ag/DonationGrader$3.class
diff --git a/bin/nachos/ag/DonationGrader$4.class b/bin/nachos/ag/DonationGrader$4.class
diff --git a/bin/nachos/ag/DonationGrader.class b/bin/nachos/ag/DonationGrader.class
diff --git a/bin/nachos/ag/FilesysGrader.class b/bin/nachos/ag/FilesysGrader.class
diff --git a/bin/nachos/ag/JoinGrader$1.class b/bin/nachos/ag/JoinGrader$1.class
diff --git a/bin/nachos/ag/JoinGrader.class b/bin/nachos/ag/JoinGrader.class
diff --git a/bin/nachos/ag/LotteryGraderS$LotteryTreeNode.class b/bin/nachos/ag/LotteryGraderS$LotteryTreeNode.class
diff --git a/bin/nachos/ag/LotteryGraderS.class b/bin/nachos/ag/LotteryGraderS.class
diff --git a/bin/nachos/ag/PriorityGrader$1.class b/bin/nachos/ag/PriorityGrader$1.class
diff --git a/bin/nachos/ag/PriorityGrader.class b/bin/nachos/ag/PriorityGrader.class
diff --git a/bin/nachos/ag/PriorityGraderS1$1.class b/bin/nachos/ag/PriorityGraderS1$1.class
diff --git a/bin/nachos/ag/PriorityGraderS1$TreeNode.class b/bin/nachos/ag/PriorityGraderS1$TreeNode.class
diff --git a/bin/nachos/ag/PriorityGraderS1.class b/bin/nachos/ag/PriorityGraderS1.class
diff --git a/bin/nachos/ag/ThreadGrader1$Printer.class b/bin/nachos/ag/ThreadGrader1$Printer.class
diff --git a/bin/nachos/ag/ThreadGrader1.class b/bin/nachos/ag/ThreadGrader1.class
diff --git a/bin/nachos/ag/ThreadGrader2$a.class b/bin/nachos/ag/ThreadGrader2$a.class
diff --git a/bin/nachos/ag/ThreadGrader2$b.class b/bin/nachos/ag/ThreadGrader2$b.class
diff --git a/bin/nachos/ag/ThreadGrader2.class b/bin/nachos/ag/ThreadGrader2.class
diff --git a/bin/nachos/ag/ThreadGrader3$PingTest.class b/bin/nachos/ag/ThreadGrader3$PingTest.class
diff --git a/bin/nachos/ag/ThreadGrader3.class b/bin/nachos/ag/ThreadGrader3.class
diff --git a/bin/nachos/ag/ThreadGrader4$PingTest.class b/bin/nachos/ag/ThreadGrader4$PingTest.class
diff --git a/bin/nachos/ag/ThreadGrader4.class b/bin/nachos/ag/ThreadGrader4.class
diff --git a/bin/nachos/ag/ThreadGrader5$a.class b/bin/nachos/ag/ThreadGrader5$a.class
diff --git a/bin/nachos/ag/ThreadGrader5.class b/bin/nachos/ag/ThreadGrader5.class
diff --git a/bin/nachos/ag/ThreadGrader6$a.class b/bin/nachos/ag/ThreadGrader6$a.class
diff --git a/bin/nachos/ag/ThreadGrader6.class b/bin/nachos/ag/ThreadGrader6.class
diff --git a/bin/nachos/ag/ThreadGrader7$a.class b/bin/nachos/ag/ThreadGrader7$a.class
diff --git a/bin/nachos/ag/ThreadGrader7.class b/bin/nachos/ag/ThreadGrader7.class
diff --git a/bin/nachos/ag/ThreadGrader8$a.class b/bin/nachos/ag/ThreadGrader8$a.class
diff --git a/bin/nachos/ag/ThreadGrader8.class b/bin/nachos/ag/ThreadGrader8.class
diff --git a/bin/nachos/ag/UserGrader1$1.class b/bin/nachos/ag/UserGrader1$1.class
diff --git a/bin/nachos/ag/UserGrader1$2.class b/bin/nachos/ag/UserGrader1$2.class
diff --git a/bin/nachos/ag/UserGrader1.class b/bin/nachos/ag/UserGrader1.class
diff --git a/bin/nachos/ag/VMGrader$1.class b/bin/nachos/ag/VMGrader$1.class
diff --git a/bin/nachos/ag/VMGrader.class b/bin/nachos/ag/VMGrader.class
diff --git a/bin/nachos/ag/package.html b/bin/nachos/ag/package.html
@@ -0,0 +1,3 @@
+<body>
+Provides classes that can be used to automatically grade Nachos projects.
+</body>
diff --git a/bin/nachos/filesys/BitMap.class b/bin/nachos/filesys/BitMap.class
diff --git a/bin/nachos/filesys/File.class b/bin/nachos/filesys/File.class
diff --git a/bin/nachos/filesys/FileStat.class b/bin/nachos/filesys/FileStat.class
diff --git a/bin/nachos/filesys/FilesysKernel.class b/bin/nachos/filesys/FilesysKernel.class
diff --git a/bin/nachos/filesys/FilesysProcess$DescriptorManager.class b/bin/nachos/filesys/FilesysProcess$DescriptorManager.class
diff --git a/bin/nachos/filesys/FilesysProcess.class b/bin/nachos/filesys/FilesysProcess.class
diff --git a/bin/nachos/filesys/Folder.class b/bin/nachos/filesys/Folder.class
diff --git a/bin/nachos/filesys/FolderEntry.class b/bin/nachos/filesys/FolderEntry.class
diff --git a/bin/nachos/filesys/FreeList.class b/bin/nachos/filesys/FreeList.class
diff --git a/bin/nachos/filesys/INode.class b/bin/nachos/filesys/INode.class
diff --git a/bin/nachos/filesys/RealFileSystem$PathResult.class b/bin/nachos/filesys/RealFileSystem$PathResult.class
diff --git a/bin/nachos/filesys/RealFileSystem.class b/bin/nachos/filesys/RealFileSystem.class
diff --git a/bin/nachos/machine/ArrayFile.class b/bin/nachos/machine/ArrayFile.class
diff --git a/bin/nachos/machine/AssertionFailureError.class b/bin/nachos/machine/AssertionFailureError.class
diff --git a/bin/nachos/machine/Coff.class b/bin/nachos/machine/Coff.class
diff --git a/bin/nachos/machine/CoffSection.class b/bin/nachos/machine/CoffSection.class
diff --git a/bin/nachos/machine/Config.class b/bin/nachos/machine/Config.class
diff --git a/bin/nachos/machine/Disk$1.class b/bin/nachos/machine/Disk$1.class
diff --git a/bin/nachos/machine/Disk.class b/bin/nachos/machine/Disk.class
diff --git a/bin/nachos/machine/DiskIntHandler.class b/bin/nachos/machine/DiskIntHandler.class
diff --git a/bin/nachos/machine/FileSystem.class b/bin/nachos/machine/FileSystem.class
diff --git a/bin/nachos/machine/GraphicalConsole$1.class b/bin/nachos/machine/GraphicalConsole$1.class
diff --git a/bin/nachos/machine/GraphicalConsole$2.class b/bin/nachos/machine/GraphicalConsole$2.class
diff --git a/bin/nachos/machine/GraphicalConsole$3.class b/bin/nachos/machine/GraphicalConsole$3.class
diff --git a/bin/nachos/machine/GraphicalConsole$4.class b/bin/nachos/machine/GraphicalConsole$4.class
diff --git a/bin/nachos/machine/GraphicalConsole$5.class b/bin/nachos/machine/GraphicalConsole$5.class
diff --git a/bin/nachos/machine/GraphicalConsole$6.class b/bin/nachos/machine/GraphicalConsole$6.class
diff --git a/bin/nachos/machine/GraphicalConsole.class b/bin/nachos/machine/GraphicalConsole.class
diff --git a/bin/nachos/machine/Interrupt$InterruptPrivilege.class b/bin/nachos/machine/Interrupt$InterruptPrivilege.class
diff --git a/bin/nachos/machine/Interrupt$PendingInterrupt.class b/bin/nachos/machine/Interrupt$PendingInterrupt.class
diff --git a/bin/nachos/machine/Interrupt.class b/bin/nachos/machine/Interrupt.class
diff --git a/bin/nachos/machine/Kernel.class b/bin/nachos/machine/Kernel.class
diff --git a/bin/nachos/machine/Lib.class b/bin/nachos/machine/Lib.class
diff --git a/bin/nachos/machine/Machine$1.class b/bin/nachos/machine/Machine$1.class
diff --git a/bin/nachos/machine/Machine$MachinePrivilege.class b/bin/nachos/machine/Machine$MachinePrivilege.class
diff --git a/bin/nachos/machine/Machine.class b/bin/nachos/machine/Machine.class
diff --git a/bin/nachos/machine/MalformedPacketException.class b/bin/nachos/machine/MalformedPacketException.class
diff --git a/bin/nachos/machine/NetworkLink$1.class b/bin/nachos/machine/NetworkLink$1.class
diff --git a/bin/nachos/machine/NetworkLink$2.class b/bin/nachos/machine/NetworkLink$2.class
diff --git a/bin/nachos/machine/NetworkLink$3.class b/bin/nachos/machine/NetworkLink$3.class
diff --git a/bin/nachos/machine/NetworkLink$4.class b/bin/nachos/machine/NetworkLink$4.class
diff --git a/bin/nachos/machine/NetworkLink.class b/bin/nachos/machine/NetworkLink.class
diff --git a/bin/nachos/machine/OpenFile.class b/bin/nachos/machine/OpenFile.class
diff --git a/bin/nachos/machine/OpenFileWithPosition.class b/bin/nachos/machine/OpenFileWithPosition.class
diff --git a/bin/nachos/machine/Packet.class b/bin/nachos/machine/Packet.class
diff --git a/bin/nachos/machine/Processor$Instruction.class b/bin/nachos/machine/Processor$Instruction.class
diff --git a/bin/nachos/machine/Processor$Mips.class b/bin/nachos/machine/Processor$Mips.class
diff --git a/bin/nachos/machine/Processor$MipsException.class b/bin/nachos/machine/Processor$MipsException.class
diff --git a/bin/nachos/machine/Processor$ProcessorPrivilege.class b/bin/nachos/machine/Processor$ProcessorPrivilege.class
diff --git a/bin/nachos/machine/Processor.class b/bin/nachos/machine/Processor.class
diff --git a/bin/nachos/machine/SerialConsole.class b/bin/nachos/machine/SerialConsole.class
diff --git a/bin/nachos/machine/StandardConsole$1.class b/bin/nachos/machine/StandardConsole$1.class
diff --git a/bin/nachos/machine/StandardConsole$2.class b/bin/nachos/machine/StandardConsole$2.class
diff --git a/bin/nachos/machine/StandardConsole.class b/bin/nachos/machine/StandardConsole.class
diff --git a/bin/nachos/machine/Stats.class b/bin/nachos/machine/Stats.class
diff --git a/bin/nachos/machine/StubFileSystem$FileRemover.class b/bin/nachos/machine/StubFileSystem$FileRemover.class
diff --git a/bin/nachos/machine/StubFileSystem$StubOpenFile$1.class b/bin/nachos/machine/StubFileSystem$StubOpenFile$1.class
diff --git a/bin/nachos/machine/StubFileSystem$StubOpenFile.class b/bin/nachos/machine/StubFileSystem$StubOpenFile.class
diff --git a/bin/nachos/machine/StubFileSystem.class b/bin/nachos/machine/StubFileSystem.class
diff --git a/bin/nachos/machine/SynchDisk.class b/bin/nachos/machine/SynchDisk.class
diff --git a/bin/nachos/machine/SynchDiskIntHandler.class b/bin/nachos/machine/SynchDiskIntHandler.class
diff --git a/bin/nachos/machine/TCB$1.class b/bin/nachos/machine/TCB$1.class
diff --git a/bin/nachos/machine/TCB$2.class b/bin/nachos/machine/TCB$2.class
diff --git a/bin/nachos/machine/TCB$TCBPrivilege.class b/bin/nachos/machine/TCB$TCBPrivilege.class
diff --git a/bin/nachos/machine/TCB.class b/bin/nachos/machine/TCB.class
diff --git a/bin/nachos/machine/Timer$1.class b/bin/nachos/machine/Timer$1.class
diff --git a/bin/nachos/machine/Timer$2.class b/bin/nachos/machine/Timer$2.class
diff --git a/bin/nachos/machine/Timer.class b/bin/nachos/machine/Timer.class
diff --git a/bin/nachos/machine/TranslationEntry.class b/bin/nachos/machine/TranslationEntry.class
diff --git a/bin/nachos/machine/package.html b/bin/nachos/machine/package.html
@@ -0,0 +1,3 @@
+<body>
+Provides classes that implement the Nachos simulated machine.
+</body>
diff --git a/bin/nachos/network/MailMessage.class b/bin/nachos/network/MailMessage.class
diff --git a/bin/nachos/network/NetKernel$1.class b/bin/nachos/network/NetKernel$1.class
diff --git a/bin/nachos/network/NetKernel.class b/bin/nachos/network/NetKernel.class
diff --git a/bin/nachos/network/NetProcess.class b/bin/nachos/network/NetProcess.class
diff --git a/bin/nachos/network/PostOffice$1.class b/bin/nachos/network/PostOffice$1.class
diff --git a/bin/nachos/network/PostOffice$2.class b/bin/nachos/network/PostOffice$2.class
diff --git a/bin/nachos/network/PostOffice$3.class b/bin/nachos/network/PostOffice$3.class
diff --git a/bin/nachos/network/PostOffice.class b/bin/nachos/network/PostOffice.class
diff --git a/bin/nachos/network/package.html b/bin/nachos/network/package.html
@@ -0,0 +1,3 @@
+<body>
+Provides classes that allow Nachos processes to communicate over the network.
+</body>
diff --git a/bin/nachos/security/NachosSecurityManager$1.class b/bin/nachos/security/NachosSecurityManager$1.class
diff --git a/bin/nachos/security/NachosSecurityManager$2.class b/bin/nachos/security/NachosSecurityManager$2.class
diff --git a/bin/nachos/security/NachosSecurityManager$PrivilegeProvider.class b/bin/nachos/security/NachosSecurityManager$PrivilegeProvider.class
diff --git a/bin/nachos/security/NachosSecurityManager.class b/bin/nachos/security/NachosSecurityManager.class
diff --git a/bin/nachos/security/Privilege$InterruptPrivilege.class b/bin/nachos/security/Privilege$InterruptPrivilege.class
diff --git a/bin/nachos/security/Privilege$MachinePrivilege.class b/bin/nachos/security/Privilege$MachinePrivilege.class
diff --git a/bin/nachos/security/Privilege$ProcessorPrivilege.class b/bin/nachos/security/Privilege$ProcessorPrivilege.class
diff --git a/bin/nachos/security/Privilege$TCBPrivilege.class b/bin/nachos/security/Privilege$TCBPrivilege.class
diff --git a/bin/nachos/security/Privilege.class b/bin/nachos/security/Privilege.class
diff --git a/bin/nachos/security/package.html b/bin/nachos/security/package.html
@@ -0,0 +1,4 @@
+<body>
+Provides classes that can be used to protect the host system from malicious
+Nachos kernels.
+</body>
diff --git a/bin/nachos/threads/Alarm$1.class b/bin/nachos/threads/Alarm$1.class
diff --git a/bin/nachos/threads/Alarm$Waiter.class b/bin/nachos/threads/Alarm$Waiter.class
diff --git a/bin/nachos/threads/Alarm.class b/bin/nachos/threads/Alarm.class
diff --git a/bin/nachos/threads/Boat$1.class b/bin/nachos/threads/Boat$1.class
diff --git a/bin/nachos/threads/Boat$2.class b/bin/nachos/threads/Boat$2.class
diff --git a/bin/nachos/threads/Boat.class b/bin/nachos/threads/Boat.class
diff --git a/bin/nachos/threads/Communicator$ThreadInfo.class b/bin/nachos/threads/Communicator$ThreadInfo.class
diff --git a/bin/nachos/threads/Communicator.class b/bin/nachos/threads/Communicator.class
diff --git a/bin/nachos/threads/Condition.class b/bin/nachos/threads/Condition.class
diff --git a/bin/nachos/threads/Condition2.class b/bin/nachos/threads/Condition2.class
diff --git a/bin/nachos/threads/KThread$1.class b/bin/nachos/threads/KThread$1.class
diff --git a/bin/nachos/threads/KThread$2.class b/bin/nachos/threads/KThread$2.class
diff --git a/bin/nachos/threads/KThread$PingTest.class b/bin/nachos/threads/KThread$PingTest.class
diff --git a/bin/nachos/threads/KThread.class b/bin/nachos/threads/KThread.class
diff --git a/bin/nachos/threads/Lock.class b/bin/nachos/threads/Lock.class
diff --git a/bin/nachos/threads/LotteryScheduler$LotteryQueue.class b/bin/nachos/threads/LotteryScheduler$LotteryQueue.class
diff --git a/bin/nachos/threads/LotteryScheduler$LotteryThreadState.class b/bin/nachos/threads/LotteryScheduler$LotteryThreadState.class
diff --git a/bin/nachos/threads/LotteryScheduler.class b/bin/nachos/threads/LotteryScheduler.class
diff --git a/bin/nachos/threads/PriorityScheduler$PriorityQueue.class b/bin/nachos/threads/PriorityScheduler$PriorityQueue.class
diff --git a/bin/nachos/threads/PriorityScheduler$ThreadState.class b/bin/nachos/threads/PriorityScheduler$ThreadState.class
diff --git a/bin/nachos/threads/PriorityScheduler.class b/bin/nachos/threads/PriorityScheduler.class
diff --git a/bin/nachos/threads/ReadWriteLock.class b/bin/nachos/threads/ReadWriteLock.class
diff --git a/bin/nachos/threads/RoundRobinScheduler$FifoQueue.class b/bin/nachos/threads/RoundRobinScheduler$FifoQueue.class
diff --git a/bin/nachos/threads/RoundRobinScheduler.class b/bin/nachos/threads/RoundRobinScheduler.class
diff --git a/bin/nachos/threads/Scheduler.class b/bin/nachos/threads/Scheduler.class
diff --git a/bin/nachos/threads/Semaphore$PingTest.class b/bin/nachos/threads/Semaphore$PingTest.class
diff --git a/bin/nachos/threads/Semaphore.class b/bin/nachos/threads/Semaphore.class
diff --git a/bin/nachos/threads/SynchList$PingTest.class b/bin/nachos/threads/SynchList$PingTest.class
diff --git a/bin/nachos/threads/SynchList.class b/bin/nachos/threads/SynchList.class
diff --git a/bin/nachos/threads/ThreadQueue.class b/bin/nachos/threads/ThreadQueue.class
diff --git a/bin/nachos/threads/ThreadedKernel.class b/bin/nachos/threads/ThreadedKernel.class
diff --git a/bin/nachos/threads/package.html b/bin/nachos/threads/package.html
@@ -0,0 +1,3 @@
+<body>
+Provides classes that support a multithreaded kernel.
+</body>
diff --git a/bin/nachos/userprog/SynchConsole$1.class b/bin/nachos/userprog/SynchConsole$1.class
diff --git a/bin/nachos/userprog/SynchConsole$2.class b/bin/nachos/userprog/SynchConsole$2.class
diff --git a/bin/nachos/userprog/SynchConsole$File.class b/bin/nachos/userprog/SynchConsole$File.class
diff --git a/bin/nachos/userprog/SynchConsole.class b/bin/nachos/userprog/SynchConsole.class
diff --git a/bin/nachos/userprog/UThread$1.class b/bin/nachos/userprog/UThread$1.class
diff --git a/bin/nachos/userprog/UThread.class b/bin/nachos/userprog/UThread.class
diff --git a/bin/nachos/userprog/UserKernel$1.class b/bin/nachos/userprog/UserKernel$1.class
diff --git a/bin/nachos/userprog/UserKernel.class b/bin/nachos/userprog/UserKernel.class
diff --git a/bin/nachos/userprog/UserProcess$DescriptorManager.class b/bin/nachos/userprog/UserProcess$DescriptorManager.class
diff --git a/bin/nachos/userprog/UserProcess.class b/bin/nachos/userprog/UserProcess.class
diff --git a/bin/nachos/userprog/package.html b/bin/nachos/userprog/package.html
@@ -0,0 +1,4 @@
+<body>
+Provides classes that allow Nachos to load and execute single-threaded user
+programs in separate address spaces.
+</body>
diff --git a/bin/nachos/vm/ClockPagingManager.class b/bin/nachos/vm/ClockPagingManager.class
diff --git a/bin/nachos/vm/LazyLoader$CodePage.class b/bin/nachos/vm/LazyLoader$CodePage.class
diff --git a/bin/nachos/vm/LazyLoader.class b/bin/nachos/vm/LazyLoader.class
diff --git a/bin/nachos/vm/MemoryManager.class b/bin/nachos/vm/MemoryManager.class
diff --git a/bin/nachos/vm/Page.class b/bin/nachos/vm/Page.class
diff --git a/bin/nachos/vm/PageItem.class b/bin/nachos/vm/PageItem.class
diff --git a/bin/nachos/vm/SecondChanceMemoryManager.class b/bin/nachos/vm/SecondChanceMemoryManager.class
diff --git a/bin/nachos/vm/SwapFile.class b/bin/nachos/vm/SwapFile.class
diff --git a/bin/nachos/vm/SwapPage.class b/bin/nachos/vm/SwapPage.class
diff --git a/bin/nachos/vm/TLBManager.class b/bin/nachos/vm/TLBManager.class
diff --git a/bin/nachos/vm/VMKernel.class b/bin/nachos/vm/VMKernel.class
diff --git a/bin/nachos/vm/VMProcess.class b/bin/nachos/vm/VMProcess.class
diff --git a/bin/nachos/vm/package.html b/bin/nachos/vm/package.html
@@ -0,0 +1,4 @@
+<body>
+Provides classes that allow Nachos processes to be demand paged, and to use a
+hardware TLB for address translation.
+</body>
diff --git a/conf/proj1.conf b/conf/proj1.conf
@@ -0,0 +1,7 @@
+Machine.stubFileSystem = false
+Machine.processor = false
+Machine.console = false
+Machine.networkLink = false
+NachosSecurityManager.fullySecure = false
+ThreadedKernel.scheduler = nachos.threads.PriorityScheduler
+Kernel.kernel = nachos.threads.ThreadedKernel
diff --git a/conf/proj2.conf b/conf/proj2.conf
@@ -0,0 +1,12 @@
+Machine.stubFileSystem = true
+Machine.processor = true
+Machine.console = true
+Machine.graphicalConsole = false
+Machine.networkLink = false
+Processor.usingTLB = false
+Processor.numPhysPages = 64
+NachosSecurityManager.fullySecure = false
+ThreadedKernel.scheduler = nachos.threads.RoundRobinScheduler #nachos.threads.LotteryScheduler
+Kernel.shellProgram = halt.coff #sh.coff
+Kernel.processClassName = nachos.userprog.UserProcess
+Kernel.kernel = nachos.userprog.UserKernel
diff --git a/conf/proj3.conf b/conf/proj3.conf
@@ -0,0 +1,12 @@
+Machine.stubFileSystem = true
+Machine.processor = true
+Machine.console = true
+Machine.graphicalConsole = false
+Machine.networkLink = false
+Processor.usingTLB = true
+Processor.numPhysPages = 16
+NachosSecurityManager.fullySecure = false
+ThreadedKernel.scheduler = nachos.threads.LotteryScheduler
+Kernel.shellProgram = sh.coff
+Kernel.processClassName = nachos.vm.VMProcess
+Kernel.kernel = nachos.vm.VMKernel
diff --git a/conf/proj4.conf b/conf/proj4.conf
@@ -0,0 +1,13 @@
+Machine.stubFileSystem = true
+Machine.processor = true
+Machine.console = true
+Machine.graphicalConsole = false
+Machine.networkLink = true
+Processor.usingTLB = true
+Processor.numPhysPages = 16
+NetworkLink.reliability = 1.0			# use 0.9 when you're ready
+NachosSecurityManager.fullySecure = false
+ThreadedKernel.scheduler = nachos.threads.RoundRobinScheduler
+Kernel.shellProgram = sh.coff
+Kernel.processClassName = nachos.network.NetProcess
+Kernel.kernel = nachos.network.NetKernel
diff --git a/doc/USAGE b/doc/USAGE
@@ -0,0 +1 @@
+Put your project documents and generated javadoc here.
diff --git a/doc/readme.txt b/doc/readme.txt
@@ -0,0 +1,23 @@
+nachos readme - ���� 5080309105
+1����ɶ�
+	�����4��phase���������ݣ�
+		Phase 1: Build a thread system
+		Phase 2: Multiprogramming
+		Phase 3: Caching and Virtual Memory
+		Phase 5: File System
+2��filesys������
+	a. support absolute and relative path
+	b. support "." and ".."
+	c. support deletion of the current folder
+	d. support exclusive write and concurrent read
+		ģ��Java�е�ReadWriteLockʵ�ֵ�
+	e. ����Ŀ¼ֻ��һ��
+	f. ��ǰ����Ŀ¼��ɾ����������һ��Ŀ¼
+	g. ����symlink��Ŀ����м�飬symlinkָ���ļ�������Ч��
+3��bonus
+	��2.a, 2.b, 2.c, 2.d
+4������
+	ϣ���ܹ��ڿ�ʼдÿ��phase��ʱ����ܵõ����Լ������������������ڷ��ִ���
+	ϣ�����Լ������Ϲ淶�������ܹ�����һ���ط���ʶ�����
+	deadlineӦ����ǰһ�ܡ�
+
diff --git a/nachos-disk.dat b/nachos-disk.dat
diff --git a/nachos.conf b/nachos.conf
@@ -0,0 +1,14 @@
+Machine.stubFileSystem = true
+Machine.processor = true
+Machine.console = true
+Machine.graphicalConsole = false
+Machine.networkLink = false
+Processor.usingTLB = true
+Processor.numPhysPages = 16
+NachosSecurityManager.fullySecure = false
+ThreadedKernel.scheduler = nachos.threads.PriorityScheduler
+Kernel.shellProgram = sh.coff
+Kernel.processClassName = nachos.filesys.FilesysProcess
+Kernel.kernel = nachos.filesys.FilesysKernel
+FilesysKernel.format = true
+Machine.realFileSystem = true
diff --git a/proj4.conf b/proj4.conf
@@ -0,0 +1,14 @@
+Machine.stubFileSystem = true
+Machine.processor = true
+Machine.console = true
+Machine.graphicalConsole = false
+Machine.networkLink = false
+Processor.usingTLB = true
+Processor.numPhysPages = 16
+NachosSecurityManager.fullySecure = false
+ThreadedKernel.scheduler = nachos.threads.PriorityScheduler
+Kernel.shellProgram = sh.coff
+Kernel.processClassName = nachos.filesys.FilesysProcess
+Kernel.kernel = nachos.filesys.FilesysKernel
+FilesysKernel.format = false
+Machine.realFileSystem = true