set up compilation for VM project

.gitignore

@@ -4,6 +4,7 @@
 *.o
 *.obj
 userprog/swtch.s
+vm/swtch.s
 
 # Precompiled Headers
 *.gch
@@ -30,8 +31,12 @@ userprog/swtch.s
 *.app
 *.coff
 userprog/nachos
+vm/nachos
 bin/coff2noff
 test/*
 !test/*.c
 !test/*.h
 !test/script.txt
+
+# Nachos-generated
+DISK

Makefile

@@ -7,10 +7,10 @@ MAKE = make
 all: 
 #	cd threads; $(MAKE) depend
 #	cd threads; $(MAKE) nachos
-	cd userprog; $(MAKE) depend 
-	cd userprog; $(MAKE) nachos 
-#	cd vm; $(MAKE) depend
-#	cd vm; $(MAKE) nachos 
+#	cd userprog; $(MAKE) depend 
+#	cd userprog; $(MAKE) nachos 
+	cd vm; $(MAKE) depend
+	cd vm; $(MAKE) nachos 
 #	cd filesys; $(MAKE) depend
 #	cd filesys; $(MAKE) nachos 
 #	cd network; $(MAKE) depend

Makefile.common

@@ -95,12 +95,10 @@ USERPROG_O = addrspace.o bitmap.o exception.o progtest.o console.o machine.o \
 	mipssim.o translate.o synchconsole.o memorymanager.o
 
 VM_H = ../filesys/synchdisk.h \
-        ../userprog/synchconsole.h \
         ../machine/disk.h
 VM_C = ../filesys/synchdisk.cc \
-        ../userprog/synchconsole.cc \
         ../machine/disk.cc
-VM_O = synchdisk.o synchconsole.o disk.o
+VM_O = synchdisk.o disk.o
 
 FILESYS_H =../filesys/directory.h \
 	../filesys/filehdr.h\

threads/system.cc

@@ -24,9 +24,7 @@ Timer *timer;				// the hardware timer device,
 FileSystem  *fileSystem;
 #endif
 
-#ifdef FILESYS
 SynchDisk   *synchDisk;
-#endif
 
 #ifdef USER_PROGRAM	// requires either FILESYS or FILESYS_STUB
 Machine *machine;	// user program memory and registers
@@ -171,9 +169,7 @@ Initialize(int argc, char **argv)
     currentThread->spaceId = 0;
 #endif
 
-#ifdef FILESYS
     synchDisk = new(std::nothrow) SynchDisk("DISK");
-#endif
 
 #ifdef FILESYS_NEEDED
     fileSystem = new(std::nothrow) FileSystem(format);
@@ -204,9 +200,7 @@ Cleanup()
     delete fileSystem;
 #endif
 
-#ifdef FILESYS
     delete synchDisk;
-#endif
 
     delete timer;
     delete scheduler;

threads/system.h

@@ -52,10 +52,8 @@ extern Lock *threadsLock;
 extern FileSystem  *fileSystem;
 #endif
 
-#ifdef FILESYS
 #include "synchdisk.h"
 extern SynchDisk   *synchDisk;
-#endif
 
 #ifdef NETWORK
 #include "post.h"