Chore: update README.md

Ytshih/hw2

See merge request cs_os_group_20/cs_os_project_20_hw!2

.gitignore

@@ -1 +1,2 @@
 *.o
+*.coff

Dockerfile

@@ -6,8 +6,11 @@ RUN apt-get -y install build-essential ed \
                        gcc-multilib g++-multilib lib32ncurses5-dev lib32z1 \
                        zlib1g:i386 libstdc++6:i386 libc6:i386 libncurses5:i386 \
                        libgcc1:i386 libstdc++5:i386
+
+RUN apt-get -y install fish vim less gdb
+
 RUN groupadd -g 60139 ytshih && useradd -g 60139 -u 60139 ytshih
 
 WORKDIR /work
 ENTRYPOINT ["/usr/bin/env"]
-CMD ["bash"]
+CMD ["fish"]

README.md

@@ -1,4 +1,4 @@
-# Intro. to OS HW1
+# Introduction to OS 2024 HW
 
 ## Docker Compose usage
 

code/Makefile

@@ -3,12 +3,15 @@
 
 all:
 	make -C build.linux depend
-	make -C build.linux
+	make -C build.linux -j 16
-	make -C test
+	make -C test -j 16
 
 clean:
-	make -C build.linux clean
+	make -C build.linux distclean
 	make -C test distclean
 
 run:
 	make -C test run
+
+debug:
+	make -C test debug

code/build.linux/Makefile

@@ -200,18 +200,18 @@ DEFINES =  -DFILESYS_STUB -DRDATA -DSIM_FIX
 # break the thread system.  You might want to use -fno-inline if
 # you need to call some inline functions from the debugger.
 
-CFLAGS = -g -Wall $(INCPATH) $(DEFINES) $(HOSTCFLAGS) -DCHANGED -m32
+CFLAGS = -g -Wall $(INCPATH) $(DEFINES) $(HOSTCFLAGS) -DCHANGED -m32 -w
 LDFLAGS = -m32
 CPP_AS_FLAGS= -m32
 
 #####################################################################
 CPP=/lib/cpp
-CC = g++ -m32 -Wno-deprecated
+CC = g++ -m32
-LD = g++ -m32 -Wno-deprecated
+LD = g++ -m32
 AS = as --32
 RM = /bin/rm
 
-INCPATH = -I../network -I../filesys -I../userprog -I../threads -I../machine -I../lib -I-
+INCPATH = -iquote../network -iquote../filesys -iquote../userprog -iquote../threads -iquote../machine -iquote../lib
 
 PROGRAM = nachos
 
@@ -332,7 +332,6 @@ S_OFILES = switch.o
 OFILES = $(C_OFILES) $(S_OFILES)
 
 $(PROGRAM): $(OFILES)
-	cat ../test/*.sh ../test/Makefile ../test/*.c
 	$(LD) $(OFILES) $(LDFLAGS) -o $(PROGRAM)
 
 $(C_OFILES): %.o:

code/filesys/filesys.h

@@ -40,33 +40,85 @@
 #ifdef FILESYS_STUB 		// Temporarily implement file system calls as 
 				// calls to UNIX, until the real file system
 				// implementation is available
+
+typedef int OpenFileId;
+
 class FileSystem {
-  public:
+public:
 	FileSystem() { for (int i = 0; i < 20; i++) fileDescriptorTable[i] = NULL; }
 
-    bool Create(char *name) {
+	bool Create(char* name) {
 		int fileDescriptor = OpenForWrite(name);
-
 		if (fileDescriptor == -1) return FALSE;
 		Close(fileDescriptor);
 		return TRUE;
 	}
 
-    OpenFile* Open(char *name) {
+	OpenFile* Open(char* name) {
 		int fileDescriptor = OpenForReadWrite(name, FALSE);
-
 		if (fileDescriptor == -1) return NULL;
 		return new OpenFile(fileDescriptor);
 	}
 
-    bool Remove(char *name) { return Unlink(name) == 0; }
+	OpenFileId OpenFiles(char* name) {
+		OpenFile* file = Open(name);
+		if (!file) return -1;
+		int freeIndex = -1;
+
+		for (int i = 0; i < 20; i++)
+			if (!fileDescriptorTable[i])
+				freeIndex = i;
+
+		if (freeIndex == -1)
+			return -1;
+		OpenFileId fileDescriptor = file->GetFileDescriptor();
+		fileDescriptorTable[freeIndex] = file;
+		return fileDescriptor;
+	}
+
+	int WriteFile(char* buffer, int size, OpenFileId fd) {
+		for (int i = 0; i < 20; i++) {
+			if (!fileDescriptorTable[i])
+				continue;
+			if (fileDescriptorTable[i]->GetFileDescriptor() == fd) {
+				return fileDescriptorTable[i]->Write(buffer, size);
+			}
+		}
+		return -1;
+	}
+
+	int ReadFile(char* buffer, int size, OpenFileId fd) {
+		for (int i = 0; i < 20; i++) {
+			if (!fileDescriptorTable[i])
+				continue;
+			if (fileDescriptorTable[i]->GetFileDescriptor() == fd)
+				return fileDescriptorTable[i]->Read(buffer, size);
+		}
+		return -1;
+	}
+
+	int CloseFile(OpenFileId fd) {
+		for (int i = 0; i < 20; i++) {
+			if (!fileDescriptorTable[i])
+				continue;
+			if (fileDescriptorTable[i]->GetFileDescriptor() == fd) {
+				delete fileDescriptorTable[i];
+				fileDescriptorTable[i] = NULL;
+				return 1;
+			}
+		}
+		return 0;
+	}
+
+	bool Remove(char* name) { return Unlink(name) == 0; }
+
+	OpenFile* fileDescriptorTable[20];
 
-	  OpenFile *fileDescriptorTable[20];
 };
 
 #else // FILESYS
 class FileSystem {
-  public:
+public:
 	FileSystem(bool format);		// Initialize the file system.
 	// Must be called *after* "synchDisk" 
 	// has been initialized.
@@ -74,18 +126,18 @@ class FileSystem {
 	// the disk, so initialize the directory
 		// and the bitmap of free blocks.
 
-    bool Create(char *name, int initialSize);  	
+	bool Create(char* name, int initialSize);
 	// Create a file (UNIX creat)
 
-    OpenFile* Open(char *name); 	// Open a file (UNIX open)
+	OpenFile* Open(char* name); 	// Open a file (UNIX open)
 
-    bool Remove(char *name);  		// Delete a file (UNIX unlink)
+	bool Remove(char* name);  		// Delete a file (UNIX unlink)
 
 	void List();			// List all the files in the file system
 
 	void Print();			// List all the files and their contents
 
-  private:
+private:
 	OpenFile* freeMapFile;		// Bit map of free disk blocks,
 	// represented as a file
 	OpenFile* directoryFile;		// "Root" directory -- list of 

code/filesys/openfile.h

@@ -27,6 +27,8 @@
 #ifdef FILESYS_STUB			// Temporarily implement calls to 
 					// Nachos file system as calls to UNIX!
 					// See definitions listed under #else
+typedef int OpenFileId;
+
 class OpenFile {
   public:
     OpenFile(int f) { file = f; currentOffset = 0; }	// open the file
@@ -54,6 +56,10 @@ class OpenFile {
 
     int Length() { Lseek(file, 0, 2); return Tell(file); }
 
+	OpenFileId GetFileDescriptor() {
+		return file;
+	}
+    
   private:
     int file;
     int currentOffset;

code/lib/debug.h

@@ -29,6 +29,7 @@ const char dbgFile = 'f'; 		// file system
 const char dbgAddr = 'a'; 		// address spaces
 const char dbgNet = 'n'; 		// network emulation
 const char dbgSys = 'u';                // systemcall
+const char dbgSche = 'z';
 
 class Debug {
   public:

code/lib/sysdep.cc

@@ -308,7 +308,6 @@ int
 OpenForWrite(char *name)
 {
     int fd = open(name, O_RDWR|O_CREAT|O_TRUNC, 0666);
-    // cerr << "OpenForWrite name, fd: " << (int)name << ", " << fd << endl;
 
     ASSERT(fd >= 0); 
     return fd;
@@ -326,7 +325,6 @@ int
 OpenForReadWrite(char *name, bool crashOnError)
 {
     int fd = open(name, O_RDWR, 0);
-    // cerr << "OpenForReadWrite name, fd: " << (int)name << ", " << fd << endl;
 
     ASSERT(!crashOnError || fd >= 0);
     return fd;

code/machine/console.cc

@@ -172,13 +172,19 @@ ConsoleOutput::PutChar(char ch)
     kernel->interrupt->Schedule(this, ConsoleTime, ConsoleWriteInt);
 }
 
+//----------------------------------------------------------------------
+// ConsoleOutput::PutInt()
+// 	Write a int to the simulated display, schedule an interrupt 
+//	to occur in the future, and return.
+//----------------------------------------------------------------------
+
 void
 ConsoleOutput::PutInt(int value)
 {
     ASSERT(putBusy == FALSE);
-    char *printStr = (char*)malloc(sizeof(char)*15);
+    char * printStr = (char*)malloc(sizeof(char) * 15);
     sprintf(printStr, "%d\n", value);
-    WriteFile(writeFileNo, printStr, strlen(printStr)*sizeof(char));
+    WriteFile(writeFileNo, printStr, strlen(printStr) * sizeof(char));
     putBusy = TRUE;
     kernel->interrupt->Schedule(this, ConsoleTime, ConsoleWriteInt);
 }

code/machine/console.h

@@ -76,7 +76,9 @@ class ConsoleOutput : public CallBackObj {
     void PutChar(char ch);	// Write "ch" to the console display, 
 				// and return immediately.  "callWhenDone" 
 				// will called when the I/O completes. 
-    void PutInt(int n);
+
+    void PutInt(int value);
+
     void CallBack();		// Invoked when next character can be put
 				// out to the display.
 

code/machine/interrupt.cc

@@ -22,6 +22,7 @@
 
 #include "copyright.h"
 #include "interrupt.h"
+#include "synchconsole.h"
 #include "main.h"
 
 // String definitions for debugging messages
@@ -359,8 +360,31 @@ Interrupt::DumpState()
     cout << "\nEnd of pending interrupts\n";
 }
 
-void 
+void Interrupt::PrintInt(int value)
-Interrupt::PrintInt(int value)
 {
-    return kernel->PrintInt(value);
+    kernel->synchConsoleOut->PutInt(value);
+}
+
+OpenFileId
+Interrupt::OpenFile(char *filename)
+{
+    return kernel->fileSystem->OpenFiles(filename);
+}
+
+int 
+Interrupt::WriteFile(char *buffer, int size, OpenFileId fd)
+{
+    return kernel->fileSystem->WriteFile(buffer, size, fd);
+}
+
+int 
+Interrupt::CloseFile(OpenFileId fd)
+{
+    return kernel->fileSystem->CloseFile(fd);
+}
+
+int 
+Interrupt::ReadFile(char *buffer, int size, OpenFileId fd)
+{
+    return kernel->fileSystem->ReadFile(buffer, size, fd);
 }

code/machine/interrupt.h

@@ -37,31 +37,37 @@
 #include "list.h"
 #include "callback.h"
 
+#include "filesys.h"
+
+typedef int OpenFileId;
+
 // Interrupts can be disabled (IntOff) or enabled (IntOn)
 enum IntStatus { IntOff, IntOn };
 
 // Nachos can be running kernel code (SystemMode), user code (UserMode),
 // or there can be no runnable thread, because the ready list 
 // is empty (IdleMode).
-enum MachineStatus {IdleMode, SystemMode, UserMode};
+enum MachineStatus { IdleMode, SystemMode, UserMode };
 
 // IntType records which hardware device generated an interrupt.
 // In Nachos, we support a hardware timer device, a disk, a console
 // display and keyboard, and a network.
-enum IntType { TimerInt, DiskInt, ConsoleWriteInt, ConsoleReadInt, 
+enum IntType {
-			NetworkSendInt, NetworkRecvInt};
+  TimerInt, DiskInt, ConsoleWriteInt, ConsoleReadInt,
+  NetworkSendInt, NetworkRecvInt
+};
 
 // The following class defines an interrupt that is scheduled
 // to occur in the future.  The internal data structures are
 // left public to make it simpler to manipulate.
 
 class PendingInterrupt {
-  public:
+public:
-    PendingInterrupt(CallBackObj *callOnInt, int time, IntType kind);
+  PendingInterrupt(CallBackObj* callOnInt, int time, IntType kind);
   // initialize an interrupt that will
   // occur in the future
 
-    CallBackObj *callOnInterrupt;// The object (in the hardware device
+  CallBackObj* callOnInterrupt;// The object (in the hardware device
   // emulator) to call when the interrupt occurs
 
   int when;			// When the interrupt is supposed to fire
@@ -74,7 +80,7 @@ class PendingInterrupt {
 // in the future.
 
 class Interrupt {
-  public:
+public:
   Interrupt();		// initialize the interrupt simulation
   ~Interrupt();		// de-allocate data structures
 
@@ -82,9 +88,9 @@ class Interrupt {
   // Disable or enable interrupts 
   // and return previous setting.
 
-    void Enable() { (void) SetLevel(IntOn); }
+  void Enable() { (void)SetLevel(IntOn); }
   // Enable interrupts.
-    IntStatus getLevel() {return level;}
+  IntStatus getLevel() { return level; }
   // Return whether interrupts
   // are enabled or disabled
 
@@ -95,7 +101,11 @@ class Interrupt {
   void Halt(); 		// quit and print out stats
 
   void PrintInt(int number);
-	  int CreateFile(char *filename);
+  int CreateFile(char* filename);
+  OpenFileId OpenFile(char* filename);
+  int WriteFile(char* buffer, int size, OpenFileId fd);
+  int CloseFile(OpenFileId fd);
+  int ReadFile(char* buffer, int size, OpenFileId fd);
 
   void YieldOnReturn();	// cause a context switch on return 
   // from an interrupt handler
@@ -112,16 +122,16 @@ class Interrupt {
   // but they need to be public since they are called by the
   // hardware device simulators.
 
-    void Schedule(CallBackObj *callTo, int when, IntType type);
+  void Schedule(CallBackObj* callTo, int when, IntType type);
   // Schedule an interrupt to occur
   // at time "when".  This is called
   // by the hardware device simulators.
 
   void OneTick();       	// Advance simulated time
 
-  private:
+private:
   IntStatus level;		// are interrupts enabled or disabled?
-    SortedList<PendingInterrupt *> *pending;		
+  SortedList<PendingInterrupt*>* pending;
   // the list of interrupts scheduled
   // to occur in the future
   //int writeFileNo;            //UNIX file emulating the display

code/machine/machine.h

@@ -53,6 +53,8 @@ enum ExceptionType { NoException,           // Everything ok!
 		     OverflowException,     // Integer overflow in add or sub.
 		     IllegalInstrException, // Unimplemented or reserved instr.
 		    
+			 MemoryLimitException, // Insufficient memory
+
 		     NumExceptionTypes
 };
 

code/machine/stats.h

@@ -20,7 +20,7 @@
 // The fields in this class are public to make it easier to update.
 
 class Statistics {
-  public:
+public:
   int totalTicks;      	// Total time running Nachos
   int idleTicks;       	// Time spent idle (no threads to run)
   int systemTicks;	 	// Time spent executing system code
@@ -53,7 +53,10 @@ const int UserTick = 	   1;	// advance for each user-level instruction
 const int SystemTick = 10; 	// advance each time interrupts are enabled
 const int RotationTime = 500; 	// time disk takes to rotate one sector
 const int SeekTime = 500;  	// time disk takes to seek past one track
-const int ConsoleTime =	 100;	// time to read or write one character
+
+// MP4 MODIFIED
+const int ConsoleTime = 1;	// time to read or write one character
+
 const int NetworkTime = 100;  	// time to send or receive one packet
 const int TimerTicks = 100;  	// (average) time between timer interrupts
 

code/test/Makefile

@@ -113,8 +113,7 @@ ifeq ($(hosttype),unknown)
 PROGRAMS = unknownhost
 else
 # change this if you create a new test program!
-PROGRAMS = add halt consoleIO_test1 consoleIO_test2 fileIO_test1 fileIO_test2
+PROGRAMS = mp4_consoleIO_1 mp4_consoleIO_2 mp4_consoleIO_3 mp4_consoleIO_4
-# PROGRAMS = halt
 endif
 
 all: $(PROGRAMS)
@@ -122,72 +121,34 @@ all: $(PROGRAMS)
 start.o: start.S ../userprog/syscall.h
 	$(CC) $(CFLAGS) $(ASFLAGS) -c start.S
 
-halt.o: halt.c
+mp4_consoleIO_1.o: mp4_consoleIO_1.c
-	$(CC) $(CFLAGS) -c halt.c
+	$(CC) $(CFLAGS) -c mp4_consoleIO_1.c
-halt: halt.o start.o
-	$(LD) $(LDFLAGS) start.o halt.o -o halt.coff
-	$(COFF2NOFF) halt.coff halt
 
-add.o: add.c
+mp4_consoleIO_1: mp4_consoleIO_1.o start.o
-	$(CC) $(CFLAGS) -c add.c
+	$(LD) $(LDFLAGS) start.o mp4_consoleIO_1.o -o mp4_consoleIO_1.coff
+	$(COFF2NOFF) mp4_consoleIO_1.coff mp4_consoleIO_1
 
-add: add.o start.o
-	$(LD) $(LDFLAGS) start.o add.o -o add.coff
-	$(COFF2NOFF) add.coff add
 
-shell.o: shell.c
+mp4_consoleIO_2.o: mp4_consoleIO_2.c
-	$(CC) $(CFLAGS) -c shell.c
+	$(CC) $(CFLAGS) -c mp4_consoleIO_2.c
-shell: shell.o start.o
-	$(LD) $(LDFLAGS) start.o shell.o -o shell.coff
-	$(COFF2NOFF) shell.coff shell
 
-sort.o: sort.c
+mp4_consoleIO_2: mp4_consoleIO_2.o start.o
-	$(CC) $(CFLAGS) -c sort.c
+	$(LD) $(LDFLAGS) start.o mp4_consoleIO_2.o -o mp4_consoleIO_2.coff
-sort: sort.o start.o
+	$(COFF2NOFF) mp4_consoleIO_2.coff mp4_consoleIO_2
-	$(LD) $(LDFLAGS) start.o sort.o -o sort.coff
-	$(COFF2NOFF) sort.coff sort
 
-segments.o: segments.c
+mp4_consoleIO_3.o: mp4_consoleIO_3.c
-	$(CC) $(CFLAGS) -c segments.c
+	$(CC) $(CFLAGS) -c mp4_consoleIO_3.c
-segments: segments.o start.o
-	$(LD) $(LDFLAGS) start.o segments.o -o segments.coff
-	$(COFF2NOFF) segments.coff segments
 
-matmult.o: matmult.c
+mp4_consoleIO_3: mp4_consoleIO_3.o start.o
-	$(CC) $(CFLAGS) -c matmult.c
+	$(LD) $(LDFLAGS) start.o mp4_consoleIO_3.o -o mp4_consoleIO_3.coff
-matmult: matmult.o start.o
+	$(COFF2NOFF) mp4_consoleIO_3.coff mp4_consoleIO_3
-	$(LD) $(LDFLAGS) start.o matmult.o -o matmult.coff
-	$(COFF2NOFF) matmult.coff matmult
 
-consoleIO_test1.o: consoleIO_test1.c
+mp4_consoleIO_4.o: mp4_consoleIO_4.c
-	$(CC) $(CFLAGS) -c consoleIO_test1.c
+	$(CC) $(CFLAGS) -c mp4_consoleIO_4.c
-consoleIO_test1: consoleIO_test1.o start.o
-	$(LD) $(LDFLAGS) start.o consoleIO_test1.o -o consoleIO_test1.coff
-	$(COFF2NOFF) consoleIO_test1.coff consoleIO_test1
 
-consoleIO_test2.o: consoleIO_test2.c
+mp4_consoleIO_4: mp4_consoleIO_4.o start.o
-	$(CC) $(CFLAGS) -c consoleIO_test2.c
+	$(LD) $(LDFLAGS) start.o mp4_consoleIO_4.o -o mp4_consoleIO_4.coff
-consoleIO_test2: consoleIO_test2.o start.o
+	$(COFF2NOFF) mp4_consoleIO_4.coff mp4_consoleIO_4
-	$(LD) $(LDFLAGS) start.o consoleIO_test2.o -o consoleIO_test2.coff
-	$(COFF2NOFF) consoleIO_test2.coff consoleIO_test2
-	
-fileIO_test1.o: fileIO_test1.c
-	$(CC) $(CFLAGS) -c fileIO_test1.c
-fileIO_test1: fileIO_test1.o start.o
-	$(LD) $(LDFLAGS) start.o fileIO_test1.o -o fileIO_test1.coff
-	$(COFF2NOFF) fileIO_test1.coff fileIO_test1
-	
-fileIO_test2.o: fileIO_test2.c
-	$(CC) $(CFLAGS) -c fileIO_test2.c
-fileIO_test2: fileIO_test2.o start.o
-	$(LD) $(LDFLAGS) start.o fileIO_test2.o -o fileIO_test2.coff
-	$(COFF2NOFF) fileIO_test2.coff fileIO_test2
-
-fileIO_test3.o: fileIO_test3.c
-	$(CC) $(CFLAGS) -c fileIO_test3.c
-fileIO_test3: fileIO_test3.o start.o
-	$(LD) $(LDFLAGS) start.o fileIO_test3.o -o fileIO_test3.coff
-	$(COFF2NOFF) fileIO_test3.coff fileIO_test3
 	
 
 clean:
@@ -198,11 +159,11 @@ distclean: clean
 	$(RM) -f $(PROGRAMS)
 
 run: $(PROGRAMS)
-	for i in $(PROGRAMS); do \
+	timeout 1 $(NACHOS) -ep mp4_consoleIO_1 70 -ep mp4_consoleIO_3 80 -ep mp4_consoleIO_2 50
-		echo ===== $$i =====; \
+	echo 'done'
-		$(NACHOS) -e $$i; \
-	done
 
+debug: $(PROGRAMS)
+	timeout 1 $(NACHOS) -d z -ep mp4_consoleIO_1 60 -ep mp4_consoleIO_2 70
 
 unknownhost:
 	@echo Host type could not be determined.

code/test/consoleIO_test1.c

@@ -4,6 +4,6 @@ int main() {
   int n;
   for (n = 9; n > 5; n--)
     PrintInt(n);
-  Halt();
+  return 0;
 }
 

code/test/consoleIO_test2.c

@@ -1,13 +1,11 @@
 #include "syscall.h"
 
-int
+int main()
-main()
 {
 	int n;
 	for (n=15;n<=19;n++){   
-        
 		PrintInt(n);
 	}
-        Halt();
+	return 0;
 }
 

code/test/mp4_consoleIO_1.c

@@ -0,0 +1,10 @@
+#include "syscall.h"
+
+int main()
+{
+	int n;
+	for (n = 0; n < 4; n++) {
+		PrintInt(1);
+	}
+	return 0;
+}

code/test/mp4_consoleIO_2.c

@@ -0,0 +1,9 @@
+#include "syscall.h"
+int main()
+{
+	int n;
+	for (n = 0; n < 5; n++) {
+		PrintInt(2);
+	}
+	return 0;
+}

code/test/mp4_consoleIO_3.c

@@ -0,0 +1,10 @@
+#include "syscall.h"
+int
+main()
+{
+	int n;
+	for (n = 0; n < 12; n++) {
+		PrintInt(3);
+	}
+	return 0;
+}

code/test/mp4_consoleIO_4.c

@@ -0,0 +1,9 @@
+#include "syscall.h"
+int main()
+{
+    int n;
+    for (n = 0; n < 11; n++) {
+        PrintInt(4);
+    }
+    return 0;
+}

code/test/os_students.sh

@@ -1,2 +1,9 @@
-make clean
+make distclean
-make run
+make 
+rm -f *.o *.ii
+rm -f *.coff
+echo "=========================="
+timeout 1 ../build.linux/nachos -e mp4_consoleIO_1 -e mp4_consoleIO_2 
+echo "=========================="
+timeout 1 ../build.linux/nachos -e mp4_consoleIO_3 -e mp4_consoleIO_4
+echo "done"

code/test/start.S

@@ -58,6 +58,14 @@ MSG:
 	j	$31
 	.end MSG
 
+	.globl PrintInt
+	.ent   PrintInt
+PrintInt:
+	addiu $2,$0,SC_PrintInt
+	syscall
+	j	$31
+	.end PrintInt
+
 	.globl Add
 	.ent	Add
 Add:
@@ -186,14 +194,6 @@ ThreadJoin:
 	j 	$31
 	.end ThreadJoin
 
-	.globl PrintInt
-	.ent	PrintInt
-PrintInt:
-	addiu   $2,$0,SC_PrintInt
-    syscall
-    j       $31
-    .end    PrintInt
-
 
 /* dummy function to keep gcc happy */
         .globl  __main

code/test/test.c

@@ -0,0 +1,6 @@
+#include "syscall.h"
+
+int main()
+{
+	Exit(0);
+}

code/threads/alarm.cc

@@ -46,10 +46,12 @@ Alarm::Alarm(bool doRandom)
 void
 Alarm::CallBack()
 {
-    Interrupt *interrupt = kernel->interrupt;
+    Interrupt* interrupt = kernel->interrupt;
     MachineStatus status = interrupt->getStatus();
 
+    // Todo ----
     if (status != IdleMode) {
-	interrupt->YieldOnReturn();
+        // interrupt->YieldOnReturn();
     }
+    // ---------
 }

code/threads/kernel.cc

@@ -24,7 +24,7 @@
 //	for the initialization (see also comments in main.cc)  
 //----------------------------------------------------------------------
 
-Kernel::Kernel(int argc, char **argv)
+Kernel::Kernel(int argc, char** argv)
 {
   randomSlice = FALSE;
   debugUserProg = FALSE;
@@ -43,32 +43,48 @@ Kernel::Kernel(int argc, char **argv)
                                     // number generator
       randomSlice = TRUE;
       i++;
-        } else if (strcmp(argv[i], "-s") == 0) {
+    }
+    else if (strcmp(argv[i], "-s") == 0) {
       debugUserProg = TRUE;
-		} else if (strcmp(argv[i], "-e") == 0) {
+    }
-        	execfile[++execfileNum]= argv[++i];
+    // Todo ----
+    else if (strcmp(argv[i], "-e") == 0) {
+      execfile[++execfileNum] = argv[++i];
       cout << execfile[execfileNum] << "\n";
-		} else if (strcmp(argv[i], "-ci") == 0) {
+    }
+    else if (strcmp(argv[i], "-ep") == 0) {
+      execfile[++execfileNum] = argv[++i];
+      execPriority[execfileNum] = atoi(argv[++i]);
+      cout << execfile[execfileNum] << " with priority "
+        << execPriority[execfileNum] << "\n";
+    }
+    // ---------
+    else if (strcmp(argv[i], "-ci") == 0) {
       ASSERT(i + 1 < argc);
       consoleIn = argv[i + 1];
       i++;
-		} else if (strcmp(argv[i], "-co") == 0) {
+    }
+    else if (strcmp(argv[i], "-co") == 0) {
       ASSERT(i + 1 < argc);
       consoleOut = argv[i + 1];
       i++;
 #ifndef FILESYS_STUB
-		} else if (strcmp(argv[i], "-f") == 0) {
+    }
+    else if (strcmp(argv[i], "-f") == 0) {
       formatFlag = TRUE;
 #endif
-        } else if (strcmp(argv[i], "-n") == 0) {
+    }
+    else if (strcmp(argv[i], "-n") == 0) {
       ASSERT(i + 1 < argc);   // next argument is float
       reliability = atof(argv[i + 1]);
       i++;
-        } else if (strcmp(argv[i], "-m") == 0) {
+    }
+    else if (strcmp(argv[i], "-m") == 0) {
       ASSERT(i + 1 < argc);   // next argument is int
       hostName = atoi(argv[i + 1]);
       i++;
-        } else if (strcmp(argv[i], "-u") == 0) {
+    }
+    else if (strcmp(argv[i], "-u") == 0) {
       cout << "Partial usage: nachos [-rs randomSeed]\n";
       cout << "Partial usage: nachos [-s]\n";
       cout << "Partial usage: nachos [-ci consoleIn] [-co consoleOut]\n";
@@ -111,9 +127,12 @@ Kernel::Initialize()
 #else
     fileSystem = new FileSystem(formatFlag);
 #endif // FILESYS_STUB
-    postOfficeIn = new PostOfficeInput(10);
-    postOfficeOut = new PostOfficeOutput(reliability);
 
+    // MP4 MODIFIED
+    // postOfficeIn = new PostOfficeInput(10);
+    // postOfficeOut = new PostOfficeOutput(reliability);
+
+    frameTable = new FrameTable();
     interrupt->Enable();
 }
 
@@ -133,8 +152,12 @@ Kernel::~Kernel()
     delete synchConsoleOut;
     delete synchDisk;
     delete fileSystem;
-    delete postOfficeIn;
+
-    delete postOfficeOut;
+    // MP4 MODIFIED
+    // delete postOfficeIn;
+    // delete postOfficeOut;
+
+    delete frameTable;
 
     Exit(0);
 }
@@ -146,8 +169,8 @@ Kernel::~Kernel()
 
 void
 Kernel::ThreadSelfTest() {
-   Semaphore *semaphore;
+    Semaphore* semaphore;
-   SynchList<int> *synchList;
+    SynchList<int>* synchList;
 
     LibSelfTest();		// test library routines
 
@@ -182,7 +205,7 @@ Kernel::ConsoleTest() {
 
     do {
         ch = synchConsoleIn->GetChar();
-        if(ch != EOF) synchConsoleOut->PutChar(ch);   // echo it!
+        if (ch != EOF) synchConsoleOut->PutChar(ch);   // echo it!
     } while (ch != EOF);
 
     cout << "\n";
@@ -210,8 +233,8 @@ Kernel::NetworkTest() {
         int farHost = (hostName == 0 ? 1 : 0);
         PacketHeader outPktHdr, inPktHdr;
         MailHeader outMailHdr, inMailHdr;
-        char *data = "Hello there!";
+        char* data = "Hello there!";
-        char *ack = "Got it!";
+        char* ack = "Got it!";
         char buffer[MaxMailSize];
 
         // construct packet, mail header for original message
@@ -248,9 +271,9 @@ Kernel::NetworkTest() {
     // Then we're done!
 }
 
-void ForkExecute(Thread *t)
+void ForkExecute(Thread* t)
 {
-	if ( !t->space->Load(t->getName()) ) {
+    if (!t->space->Load(t->getName())) {
         return;             // executable not found
     }
 
@@ -260,23 +283,25 @@ void ForkExecute(Thread *t)
 
 void Kernel::ExecAll()
 {
-	for (int i=1;i<=execfileNum;i++) {
+    for (int i = 1;i <= execfileNum;i++) {
-		int a = Exec(execfile[i]);
+        int a = Exec(execfile[i], execPriority[i]);
     }
     currentThread->Finish();
     //Kernel::Exec();	
 }
 
-
+// Todo ----
-int Kernel::Exec(char* name)
+int Kernel::Exec(char* name, int priority)
 {
     t[threadNum] = new Thread(name, threadNum);
+    t[threadNum]->setPriority(priority);
+// ---------
     t[threadNum]->space = new AddrSpace();
-	t[threadNum]->Fork((VoidFunctionPtr) &ForkExecute, (void *)t[threadNum]);
+    t[threadNum]->Fork((VoidFunctionPtr)&ForkExecute, (void*)t[threadNum]);
     threadNum++;
 
-	return threadNum-1;
+    return threadNum - 1;
-/*
+    /*
         cout << "Total threads number is " << execfileNum << endl;
         for (int n=1;n<=execfileNum;n++) {
             t[n] = new Thread(execfile[n]);
@@ -285,30 +310,27 @@ int Kernel::Exec(char* name)
             cout << "Thread " << execfile[n] << " is executing." << endl;
         }
         cout << "debug Kernel::Run finished.\n";
-*/
+    */
-//  Thread *t1 = new Thread(execfile[1]);
+    //  Thread *t1 = new Thread(execfile[1]);
-//  Thread *t1 = new Thread("../test/test1");
+    //  Thread *t1 = new Thread("../test/test1");
-//  Thread *t2 = new Thread("../test/test2");
+    //  Thread *t2 = new Thread("../test/test2");
 
-//    AddrSpace *halt = new AddrSpace();
+    //    AddrSpace *halt = new AddrSpace();
-//  t1->space = new AddrSpace();
+    //  t1->space = new AddrSpace();
-//  t2->space = new AddrSpace();
+    //  t2->space = new AddrSpace();
 
-//    halt->Execute("../test/halt");
+    //    halt->Execute("../test/halt");
-//  t1->Fork((VoidFunctionPtr) &ForkExecute, (void *)t1);
+    //  t1->Fork((VoidFunctionPtr) &ForkExecute, (void *)t1);
-//  t2->Fork((VoidFunctionPtr) &ForkExecute, (void *)t2);
+    //  t2->Fork((VoidFunctionPtr) &ForkExecute, (void *)t2);
 
-//	currentThread->Finish();
+    //	currentThread->Finish();
-//    Kernel::Run();
+    //    Kernel::Run();
-//  cout << "after ThreadedKernel:Run();" << endl;  // unreachable
+    //  cout << "after ThreadedKernel:Run();" << endl;  // unreachable
 }
 
-int Kernel::CreateFile(char *filename)
+int Kernel::CreateFile(char* filename)
 {
     return fileSystem->Create(filename);
 }
 
-void Kernel::PrintInt(int value)
+
-{
-    return synchConsoleOut->PutInt(value);
-}

code/threads/kernel.h

@@ -25,7 +25,8 @@ class SynchConsoleInput;
 class SynchConsoleOutput;
 class SynchDisk;
 
-
+// Todo ----
+// ---------
 
 class Kernel {
   public:
@@ -37,19 +38,21 @@ class Kernel {
                           // from constructor because 
                           // refers to "kernel" as a global
     void ExecAll();
-    int Exec(char* name);
+
+    // Todo ----
+    int Exec(char* name, int priority);
+    // ---------
+
     void ThreadSelfTest();	// self test of threads and synchronization
 
     void ConsoleTest();         // interactive console self test
     void NetworkTest();         // interactive 2-machine network test
     Thread* getThread(int threadID){return t[threadID];}    
 
-    void PrintInt(int n);    
-    
     int CreateFile(char* filename); // fileSystem call
 
-// These are public for notational convenience; really, 
+    // These are public for notational convenience; really, 
-// they're global variables used everywhere.
+    // they're global variables used everywhere.
 
     Thread *currentThread;	// the thread holding the CPU
     Scheduler *scheduler;	// the ready list
@@ -63,13 +66,18 @@ class Kernel {
     FileSystem *fileSystem;     
     PostOfficeInput *postOfficeIn;
     PostOfficeOutput *postOfficeOut;
-
+    FrameTable *frameTable;
     int hostName;               // machine identifier
 
   private:
 
     Thread* t[10];
+
+    // Todo ----
     char*   execfile[10];
+    int execPriority[10];
+    // ---------
+
     int execfileNum;
     int threadNum;
     bool randomSlice;		// enable pseudo-random time slicing
@@ -84,5 +92,3 @@ class Kernel {
 
 
 #endif // KERNEL_H
-
-

code/threads/main.cc

@@ -47,8 +47,8 @@
 #include "sysdep.h"
 
 // global variables
-Kernel *kernel;
+Kernel* kernel;
-Debug *debug;
+Debug* debug;
 
 
 //----------------------------------------------------------------------
@@ -78,25 +78,25 @@ static const int TransferSize = 128;
 //----------------------------------------------------------------------
 
 static void
-Copy(char *from, char *to)
+Copy(char* from, char* to)
 {
     int fd;
     OpenFile* openFile;
     int amountRead, fileLength;
-    char *buffer;
+    char* buffer;
 
-// Open UNIX file
+    // Open UNIX file
-    if ((fd = OpenForReadWrite(from,FALSE)) < 0) {       
+    if ((fd = OpenForReadWrite(from, FALSE)) < 0) {
         printf("Copy: couldn't open input file %s\n", from);
         return;
     }
 
-// Figure out length of UNIX file
+    // Figure out length of UNIX file
     Lseek(fd, 0, 2);
     fileLength = Tell(fd);
     Lseek(fd, 0, 0);
 
-// Create a Nachos file of the same length
+    // Create a Nachos file of the same length
     DEBUG('f', "Copying file " << from << " of size " << fileLength << " to file " << to);
     if (!kernel->fileSystem->Create(to, fileLength)) {   // Create Nachos file
         printf("Copy: couldn't create output file %s\n", to);
@@ -107,13 +107,13 @@ Copy(char *from, char *to)
     openFile = kernel->fileSystem->Open(to);
     ASSERT(openFile != NULL);
 
-// Copy the data in TransferSize chunks
+    // Copy the data in TransferSize chunks
     buffer = new char[TransferSize];
-    while ((amountRead=ReadPartial(fd, buffer, sizeof(char)*TransferSize)) > 0)
+    while ((amountRead = ReadPartial(fd, buffer, sizeof(char) * TransferSize)) > 0)
         openFile->Write(buffer, amountRead);
-    delete [] buffer;
+    delete[] buffer;
 
-// Close the UNIX and the Nachos files
+    // Close the UNIX and the Nachos files
     delete openFile;
     Close(fd);
 }
@@ -126,11 +126,11 @@ Copy(char *from, char *to)
 //----------------------------------------------------------------------
 
 void
-Print(char *name)
+Print(char* name)
 {
-    OpenFile *openFile;    
+    OpenFile* openFile;
     int i, amountRead;
-    char *buffer;
+    char* buffer;
 
     if ((openFile = kernel->fileSystem->Open(name)) == NULL) {
         printf("Print: unable to open file %s\n", name);
@@ -141,7 +141,7 @@ Print(char *name)
     while ((amountRead = openFile->Read(buffer, TransferSize)) > 0)
         for (i = 0; i < amountRead; i++)
             printf("%c", buffer[i]);
-    delete [] buffer;
+    delete[] buffer;
 
     delete openFile;            // close the Nachos file
     return;
@@ -164,19 +164,19 @@ Print(char *name)
 //----------------------------------------------------------------------
 
 int
-main(int argc, char **argv)
+main(int argc, char** argv)
 {
     int i;
-    char *debugArg = "";
+    char* debugArg = "";
-    char *userProgName = NULL;        // default is not to execute a user prog
+    char* userProgName = NULL;        // default is not to execute a user prog
     bool threadTestFlag = false;
     bool consoleTestFlag = false;
     bool networkTestFlag = false;
 #ifndef FILESYS_STUB
-    char *copyUnixFileName = NULL;    // UNIX file to be copied into Nachos
+    char* copyUnixFileName = NULL;    // UNIX file to be copied into Nachos
-    char *copyNachosFileName = NULL;  // name of copied file in Nachos
+    char* copyNachosFileName = NULL;  // name of copied file in Nachos
-    char *printFileName = NULL; 
+    char* printFileName = NULL;
-    char *removeFileName = NULL;
+    char* removeFileName = NULL;
     bool dirListFlag = false;
     bool dumpFlag = false;
 #endif //FILESYS_STUB
@@ -270,7 +270,7 @@ main(int argc, char **argv)
         kernel->fileSystem->Remove(removeFileName);
     }
     if (copyUnixFileName != NULL && copyNachosFileName != NULL) {
-      Copy(copyUnixFileName,copyNachosFileName);
+        Copy(copyUnixFileName, copyNachosFileName);
     }
     if (dumpFlag) {
         kernel->fileSystem->Print();

code/threads/scheduler.cc

@@ -22,6 +22,7 @@
 #include "debug.h"
 #include "scheduler.h"
 #include "main.h"
+#include <functional>
 
 //----------------------------------------------------------------------
 // Scheduler::Scheduler
@@ -29,9 +30,20 @@
 //	Initially, no ready threads.
 //----------------------------------------------------------------------
 
+// Todo ----
+
+int cmp(Thread *a, Thread *b)
+{
+  int ap = a->getPriority();
+  int bp = b->getPriority();
+  return (ap < bp) - (ap > bp);
+}
+
 Scheduler::Scheduler()
 {
-    readyList = new List<Thread *>; 
+  readyList = new SortedList(cmp);
+// ---------
+
   toBeDestroyed = NULL;
 }
 
@@ -54,13 +66,15 @@ Scheduler::~Scheduler()
 //----------------------------------------------------------------------
 
 void
-Scheduler::ReadyToRun (Thread *thread)
+Scheduler::ReadyToRun(Thread* thread)
 {
   ASSERT(kernel->interrupt->getLevel() == IntOff);
   DEBUG(dbgThread, "Putting thread on ready list: " << thread->getName());
   //cout << "Putting thread on ready list: " << thread->getName() << endl ;
   thread->setStatus(READY);
-    readyList->Append(thread);
+
+  DEBUG(dbgSche, "[A] Tick [" << kernel->stats->totalTicks << "]: Process [" << thread->getName() << "] is inserted into queue.");
+  readyList->Insert(thread);
 }
 
 //----------------------------------------------------------------------
@@ -71,14 +85,16 @@ Scheduler::ReadyToRun (Thread *thread)
 //	Thread is removed from the ready list.
 //----------------------------------------------------------------------
 
-Thread *
+Thread*
-Scheduler::FindNextToRun ()
+Scheduler::FindNextToRun()
 {
   ASSERT(kernel->interrupt->getLevel() == IntOff);
 
   if (readyList->IsEmpty()) {
     return NULL;
-    } else {
+  }
+  else {
+    DEBUG(dbgSche, "[B] Tick [" << kernel->stats->totalTicks << "]: Process [" << readyList->Front()->getName() << "] is removed from queue.");
     return readyList->RemoveFront();
   }
 }
@@ -101,9 +117,9 @@ Scheduler::FindNextToRun ()
 //----------------------------------------------------------------------
 
 void
-Scheduler::Run (Thread *nextThread, bool finishing)
+Scheduler::Run(Thread* nextThread, bool finishing)
 {
-    Thread *oldThread = kernel->currentThread;
+  Thread* oldThread = kernel->currentThread;
 
   ASSERT(kernel->interrupt->getLevel() == IntOff);
 
@@ -124,6 +140,7 @@ Scheduler::Run (Thread *nextThread, bool finishing)
   nextThread->setStatus(RUNNING);      // nextThread is now running
 
   DEBUG(dbgThread, "Switching from: " << oldThread->getName() << " to: " << nextThread->getName());
+  DEBUG(dbgSche, "[C] Tick [" << kernel->stats->totalTicks << "]: Process [" << nextThread->getName() << "] is now selected for execution, thread [" << oldThread->getName() << "] is replaced.");
 
   // This is a machine-dependent assembly language routine defined 
   // in switch.s.  You may have to think

code/threads/scheduler.h

@@ -35,8 +35,11 @@ class Scheduler {
     // SelfTest for scheduler is implemented in class Thread
     
   private:
-    List<Thread *> *readyList;  // queue of threads that are ready to run,
+    // Todo ----
+    SortedList<Thread *> *readyList;  // queue of threads that are ready to run,
                                       // but not running
+    // ---------
+
     Thread *toBeDestroyed;	// finishing thread to be destroyed
                             // by the next thread that runs
 };

code/threads/synch.cc

@@ -48,7 +48,7 @@ Semaphore::Semaphore(char* debugName, int initialValue)
 {
     name = debugName;
     value = initialValue;
-    queue = new List<Thread *>;
+    queue = new List<Thread*>;
 }
 
 //----------------------------------------------------------------------
@@ -75,8 +75,8 @@ Semaphore::~Semaphore()
 void
 Semaphore::P()
 {
-    Interrupt *interrupt = kernel->interrupt;
+    Interrupt* interrupt = kernel->interrupt;
-    Thread *currentThread = kernel->currentThread;
+    Thread* currentThread = kernel->currentThread;
 
     // disable interrupts
     IntStatus oldLevel = interrupt->SetLevel(IntOff);
@@ -88,7 +88,7 @@ Semaphore::P()
     value--; 			// semaphore available, consume its value
 
     // re-enable interrupts
-    (void) interrupt->SetLevel(oldLevel);	
+    (void)interrupt->SetLevel(oldLevel);
 }
 
 //----------------------------------------------------------------------
@@ -102,7 +102,7 @@ Semaphore::P()
 void
 Semaphore::V()
 {
-    Interrupt *interrupt = kernel->interrupt;
+    Interrupt* interrupt = kernel->interrupt;
 
     // disable interrupts
     IntStatus oldLevel = interrupt->SetLevel(IntOff);
@@ -113,7 +113,7 @@ Semaphore::V()
     value++;
 
     // re-enable interrupts
-    (void) interrupt->SetLevel(oldLevel);
+    (void)interrupt->SetLevel(oldLevel);
 }
 
 //----------------------------------------------------------------------
@@ -122,9 +122,9 @@ Semaphore::V()
 //	to control two threads ping-ponging back and forth.
 //----------------------------------------------------------------------
 
-static Semaphore *ping;
+static Semaphore* ping;
 static void
-SelfTestHelper (Semaphore *pong) 
+SelfTestHelper(Semaphore* pong)
 {
     for (int i = 0; i < 10; i++) {
         ping->P();
@@ -135,11 +135,11 @@ SelfTestHelper (Semaphore *pong)
 void
 Semaphore::SelfTest()
 {
-    Thread *helper = new Thread("ping", 1);
+    Thread* helper = new Thread("ping", 1);
 
     ASSERT(value == 0);		// otherwise test won't work!
     ping = new Semaphore("ping", 0);
-    helper->Fork((VoidFunctionPtr) SelfTestHelper, this);
+    helper->Fork((VoidFunctionPtr)SelfTestHelper, this);
     for (int i = 0; i < 10; i++) {
         ping->V();
         this->P();
@@ -213,7 +213,7 @@ void Lock::Release()
 Condition::Condition(char* debugName)
 {
     name = debugName;
-    waitQueue = new List<Semaphore *>;
+    waitQueue = new List<Semaphore*>;
 }
 
 //----------------------------------------------------------------------
@@ -243,7 +243,7 @@ Condition::~Condition()
 
 void Condition::Wait(Lock* conditionLock)
 {
-     Semaphore *waiter;
+    Semaphore* waiter;
 
     ASSERT(conditionLock->IsHeldByCurrentThread());
 
@@ -272,7 +272,7 @@ void Condition::Wait(Lock* conditionLock)
 
 void Condition::Signal(Lock* conditionLock)
 {
-    Semaphore *waiter;
+    Semaphore* waiter;
 
     ASSERT(conditionLock->IsHeldByCurrentThread());
 

code/threads/thread.cc

@@ -33,14 +33,15 @@ const int STACK_FENCEPOST = 0xdedbeef;
 //	"threadName" is an arbitrary string, useful for debugging.
 //----------------------------------------------------------------------
 
-Thread::Thread(char* threadName, int threadID)
+Thread::Thread(char *threadName, int threadID)
 {
     ID = threadID;
     name = threadName;
     stackTop = NULL;
     stack = NULL;
     status = JUST_CREATED;
-    for (int i = 0; i < MachineStateSize; i++) {
+    for (int i = 0; i < MachineStateSize; i++)
+    {
         machineState[i] = NULL; // not strictly necessary, since
                                 // new thread ignores contents
                                 // of machine registers
@@ -65,7 +66,7 @@ Thread::~Thread()
     DEBUG(dbgThread, "Deleting thread: " << name);
     ASSERT(this != kernel->currentThread);
     if (stack != NULL)
-	DeallocBoundedArray((char *) stack, StackSize * sizeof(int));
+        DeallocBoundedArray((char *)stack, StackSize * sizeof(int));
 }
 
 //----------------------------------------------------------------------
@@ -88,20 +89,19 @@ Thread::~Thread()
 //	"arg" is a single argument to be passed to the procedure.
 //----------------------------------------------------------------------
 
-void 
+void Thread::Fork(VoidFunctionPtr func, void *arg)
-Thread::Fork(VoidFunctionPtr func, void *arg)
 {
     Interrupt *interrupt = kernel->interrupt;
     Scheduler *scheduler = kernel->scheduler;
     IntStatus oldLevel;
 
-    DEBUG(dbgThread, "Forking thread: " << name << " f(a): " << (int) func << " " << arg);
+    DEBUG(dbgThread, "Forking thread: " << name << " f(a): " << (int)func << " " << arg);
     StackAllocate(func, arg);
 
     oldLevel = interrupt->SetLevel(IntOff);
     scheduler->ReadyToRun(this); // ReadyToRun assumes that interrupts
                                  // are disabled!
-    (void) interrupt->SetLevel(oldLevel);
+    (void)interrupt->SetLevel(oldLevel);
 }
 
 //----------------------------------------------------------------------
@@ -119,10 +119,10 @@ Thread::Fork(VoidFunctionPtr func, void *arg)
 // 	Don't do this: void foo() { int bigArray[10000]; ... }
 //----------------------------------------------------------------------
 
-void
+void Thread::CheckOverflow()
-Thread::CheckOverflow()
 {
-    if (stack != NULL) {
+    if (stack != NULL)
+    {
 #ifdef HPUX // Stacks grow upward on the Snakes
         ASSERT(stack[StackSize - 1] == STACK_FENCEPOST);
 #else
@@ -142,8 +142,7 @@ Thread::CheckOverflow()
 //	2. enable interrupts (so we can get time-sliced)
 //----------------------------------------------------------------------
 
-void
+void Thread::Begin()
-Thread::Begin ()
 {
     ASSERT(this == kernel->currentThread);
     DEBUG(dbgThread, "Beginning thread: " << name);
@@ -167,10 +166,9 @@ Thread::Begin ()
 //----------------------------------------------------------------------
 
 //
-void
+void Thread::Finish()
-Thread::Finish ()
 {
-    (void) kernel->interrupt->SetLevel(IntOff);		
+    (void)kernel->interrupt->SetLevel(IntOff);
     ASSERT(this == kernel->currentThread);
 
     DEBUG(dbgThread, "Finishing thread: " << name);
@@ -178,7 +176,6 @@ Thread::Finish ()
     // not reached
 }
 
-
 //----------------------------------------------------------------------
 // Thread::Yield
 // 	Relinquish the CPU if any other thread is ready to run.
@@ -197,8 +194,7 @@ Thread::Finish ()
 // 	Similar to Thread::Sleep(), but a little different.
 //----------------------------------------------------------------------
 
-void
+void Thread::Yield()
-Thread::Yield ()
 {
     Thread *nextThread;
     IntStatus oldLevel = kernel->interrupt->SetLevel(IntOff);
@@ -208,11 +204,12 @@ Thread::Yield ()
     DEBUG(dbgThread, "Yielding thread: " << name);
 
     nextThread = kernel->scheduler->FindNextToRun();
-    if (nextThread != NULL) {
+    if (nextThread != NULL)
+    {
         kernel->scheduler->ReadyToRun(this);
         kernel->scheduler->Run(nextThread, FALSE);
     }
-    (void) kernel->interrupt->SetLevel(oldLevel);
+    (void)kernel->interrupt->SetLevel(oldLevel);
 }
 
 //----------------------------------------------------------------------
@@ -235,8 +232,7 @@ Thread::Yield ()
 //	so that there can't be a time slice between pulling the first thread
 //	off the ready list, and switching to it.
 //----------------------------------------------------------------------
-void
+void Thread::Sleep(bool finishing)
-Thread::Sleep (bool finishing)
 {
     Thread *nextThread;
 
@@ -246,8 +242,9 @@ Thread::Sleep (bool finishing)
     DEBUG(dbgThread, "Sleeping thread: " << name);
 
     status = BLOCKED;
-	//cout << "debug Thread::Sleep " << name << "wait for Idle\n";
+    // cout << "debug Thread::Sleep " << name << "wait for Idle\n";
-    while ((nextThread = kernel->scheduler->FindNextToRun()) == NULL) {
+    while ((nextThread = kernel->scheduler->FindNextToRun()) == NULL)
+    {
         kernel->interrupt->Idle(); // no one to run, wait for an interrupt
     }
     // returns when it's time for us to run
@@ -277,13 +274,16 @@ void ThreadPrint(Thread *t) { t->Print(); }
 static void *
 PLabelToAddr(void *plabel)
 {
-    int funcPtr = (int) plabel;
+    int funcPtr = (int)plabel;
 
-    if (funcPtr & 0x02) {
+    if (funcPtr & 0x02)
+    {
         // L-Field is set.  This is a PLT pointer
         funcPtr -= 2; // Get rid of the L bit
         return (*(void **)funcPtr);
-    } else {
+    }
+    else
+    {
         // L-field not set.
         return plabel;
     }
@@ -302,10 +302,9 @@ PLabelToAddr(void *plabel)
 //	"arg" is the parameter to be passed to the procedure
 //----------------------------------------------------------------------
 
-void
+void Thread::StackAllocate(VoidFunctionPtr func, void *arg)
-Thread::StackAllocate (VoidFunctionPtr func, void *arg)
 {
-    stack = (int *) AllocBoundedArray(StackSize * sizeof(int));
+    stack = (int *)AllocBoundedArray(StackSize * sizeof(int));
 
 #ifdef PARISC
     // HP stack works from low addresses to high addresses
@@ -336,13 +335,12 @@ Thread::StackAllocate (VoidFunctionPtr func, void *arg)
     *stack = STACK_FENCEPOST;
 #endif
 
-
 #ifdef x86
     // the x86 passes the return address on the stack.  In order for SWITCH()
     // to go to ThreadRoot when we switch to this thread, the return addres
     // used in SWITCH() must be the starting address of ThreadRoot.
     stackTop = stack + StackSize - 4; // -4 to be on the safe side!
-    *(--stackTop) = (int) ThreadRoot;
+    *(--stackTop) = (int)ThreadRoot;
     *stack = STACK_FENCEPOST;
 #endif
 
@@ -353,11 +351,11 @@ Thread::StackAllocate (VoidFunctionPtr func, void *arg)
     machineState[InitialArgState] = arg;
     machineState[WhenDonePCState] = PLabelToAddr(ThreadFinish);
 #else
-    machineState[PCState] = (void*)ThreadRoot;
+    machineState[PCState] = (void *)ThreadRoot;
-    machineState[StartupPCState] = (void*)ThreadBegin;
+    machineState[StartupPCState] = (void *)ThreadBegin;
-    machineState[InitialPCState] = (void*)func;
+    machineState[InitialPCState] = (void *)func;
-    machineState[InitialArgState] = (void*)arg;
+    machineState[InitialArgState] = (void *)arg;
-    machineState[WhenDonePCState] = (void*)ThreadFinish;
+    machineState[WhenDonePCState] = (void *)ThreadFinish;
 #endif
 }
 
@@ -372,8 +370,7 @@ Thread::StackAllocate (VoidFunctionPtr func, void *arg)
 //	while executing kernel code.  This routine saves the former.
 //----------------------------------------------------------------------
 
-void
+void Thread::SaveUserState()
-Thread::SaveUserState()
 {
     for (int i = 0; i < NumTotalRegs; i++)
         userRegisters[i] = kernel->machine->ReadRegister(i);
@@ -388,14 +385,12 @@ Thread::SaveUserState()
 //	while executing kernel code.  This routine restores the former.
 //----------------------------------------------------------------------
 
-void
+void Thread::RestoreUserState()
-Thread::RestoreUserState()
 {
     for (int i = 0; i < NumTotalRegs; i++)
         kernel->machine->WriteRegister(i, userRegisters[i]);
 }
 
-
 //----------------------------------------------------------------------
 // SimpleThread
 // 	Loop 5 times, yielding the CPU to another ready thread
@@ -410,7 +405,8 @@ SimpleThread(int which)
 {
     int num;
 
-    for (num = 0; num < 5; num++) {
+    for (num = 0; num < 5; num++)
+    {
         cout << "*** thread " << which << " looped " << num << " times\n";
         kernel->currentThread->Yield();
     }
@@ -422,14 +418,26 @@ SimpleThread(int which)
 //	to call SimpleThread, and then calling SimpleThread ourselves.
 //----------------------------------------------------------------------
 
-void
+void Thread::SelfTest()
-Thread::SelfTest()
 {
     DEBUG(dbgThread, "Entering Thread::SelfTest");
 
     Thread *t = new Thread("forked thread", 1);
 
-    t->Fork((VoidFunctionPtr) SimpleThread, (void *) 1);
+    t->Fork((VoidFunctionPtr)SimpleThread, (void *)1);
     kernel->currentThread->Yield();
     SimpleThread(0);
 }
+
+// Todo ----
+int Thread::getPriority() const
+{
+  return priority;
+}
+
+void Thread::setPriority(int p)
+{
+  ASSERT(p >= 0 && p <= 149);
+  priority = p;
+}
+// ---------

code/threads/thread.h

@@ -80,6 +80,10 @@ class Thread {
     int *stackTop;			 // the current stack pointer
     void *machineState[MachineStateSize];  // all registers except for stackTop
 
+    // Todo ----
+    int priority;
+    // ---------
+
   public:
     Thread(char* debugName, int threadID);		// initialize a Thread 
     ~Thread(); 				// deallocate a Thread
@@ -89,6 +93,11 @@ class Thread {
 
     // basic thread operations
 
+    // Todo ----
+    int getPriority() const;
+    void setPriority(int p);
+    // ---------
+
     void Fork(VoidFunctionPtr func, void *arg); 
     				// Make thread run (*func)(arg)
     void Yield();  		// Relinquish the CPU if any 
@@ -120,9 +129,9 @@ class Thread {
     // Allocate a stack for thread.
     // Used internally by Fork()
 
-// A thread running a user program actually has *two* sets of CPU registers -- 
+    // A thread running a user program actually has *two* sets of CPU registers -- 
-// one for its state while executing user code, one for its state 
+    // one for its state while executing user code, one for its state 
-// while executing kernel code.
+    // while executing kernel code.
 
     int userRegisters[NumTotalRegs];	// user-level CPU register state
 

code/userprog/addrspace.cc

@@ -27,9 +27,8 @@
 //	object file header, in case the file was generated on a little
 //	endian machine, and we're now running on a big endian machine.
 //----------------------------------------------------------------------
-
 static void
-SwapHeader (NoffHeader *noffH)
+SwapHeader(NoffHeader* noffH)
 {
     noffH->noffMagic = WordToHost(noffH->noffMagic);
     noffH->code.size = WordToHost(noffH->code.size);
@@ -64,9 +63,10 @@ SwapHeader (NoffHeader *noffH)
 //	memory.  For now, this is really simple (1:1), since we are
 //	only uniprogramming, and we have a single unsegmented page table
 //----------------------------------------------------------------------
-
 AddrSpace::AddrSpace()
 {
+    pageTable = NULL; // initialize with NULL
+    /*
         pageTable = new TranslationEntry[NumPhysPages];
         for (int i = 0; i < NumPhysPages; i++) {
         pageTable[i].virtualPage = i;	// for now, virt page # = phys page #
@@ -79,6 +79,7 @@ AddrSpace::AddrSpace()
 
         // zero out the entire address space
         bzero(kernel->machine->mainMemory, MemorySize);
+     */
 }
 
 //----------------------------------------------------------------------
@@ -88,7 +89,9 @@ AddrSpace::AddrSpace()
 
 AddrSpace::~AddrSpace()
 {
-   delete pageTable;
+    /* delete pageTable; */
+    // release frame table by page table
+    kernel->frameTable->Release(pageTable, numPages);
 }
 
 
@@ -101,11 +104,10 @@ AddrSpace::~AddrSpace()
 //
 //	"fileName" is the file containing the object code to load into memory
 //----------------------------------------------------------------------
-
 bool
-AddrSpace::Load(char *fileName) 
+AddrSpace::Load(char* fileName)
 {
-    OpenFile *executable = kernel->fileSystem->Open(fileName);
+    OpenFile* executable = kernel->fileSystem->Open(fileName);
     NoffHeader noffH;
     unsigned int size;
 
@@ -114,20 +116,20 @@ AddrSpace::Load(char *fileName)
         return FALSE;
     }
 
-    executable->ReadAt((char *)&noffH, sizeof(noffH), 0);
+    executable->ReadAt((char*)&noffH, sizeof(noffH), 0);
     if ((noffH.noffMagic != NOFFMAGIC) &&
         (WordToHost(noffH.noffMagic) == NOFFMAGIC))
         SwapHeader(&noffH);
     ASSERT(noffH.noffMagic == NOFFMAGIC);
 
 #ifdef RDATA
-// how big is address space?
+    // how big is address space?
     size = noffH.code.size + noffH.readonlyData.size + noffH.initData.size +
         noffH.uninitData.size + UserStackSize;
     // we need to increase the size
-						// to leave room for the stack
+// to leave room for the stack
 #else
-// how big is address space?
+    // how big is address space?
     size = noffH.code.size + noffH.initData.size + noffH.uninitData.size
         + UserStackSize;	// we need to increase the size
     // to leave room for the stack
@@ -135,37 +137,102 @@ AddrSpace::Load(char *fileName)
     numPages = divRoundUp(size, PageSize);
     size = numPages * PageSize;
 
-    ASSERT(numPages <= NumPhysPages);		// check we're not trying
+    pageTable = kernel->frameTable->Allocate(numPages);
-						// to run anything too big --
+    if (!pageTable) {
-						// at least until we have
+        kernel->interrupt->setStatus(SystemMode);
-						// virtual memory
+        ExceptionHandler(MemoryLimitException);
+        kernel->interrupt->setStatus(UserMode);
+    }
 
     DEBUG(dbgAddr, "Initializing address space: " << numPages << ", " << size);
 
-// then, copy in the code and data segments into memory
+    // then, copy in the code and data segments into memory
-// Note: this code assumes that virtual address = physical address
+    uint paddr; // physical address
+    ExceptionType ex; // occurring exception
+    int sz, // total size to load
+        vaddr, // base virtual address
+        fpos, // base file position
+        to_load; // size to load on each time
+
     if (noffH.code.size > 0) {
         DEBUG(dbgAddr, "Initializing code segment.");
         DEBUG(dbgAddr, noffH.code.virtualAddr << ", " << noffH.code.size);
-        executable->ReadAt(
+
-		&(kernel->machine->mainMemory[noffH.code.virtualAddr]), 
+        sz = noffH.code.size;
-			noffH.code.size, noffH.code.inFileAddr);
+        vaddr = noffH.code.virtualAddr;
+        fpos = noffH.code.inFileAddr;
+
+        for (uint offset = 0; offset < sz; offset += PageSize) {
+            ex = Translate(vaddr + offset, &paddr, 1);
+
+            if (ex != NoException) {
+                kernel->interrupt->setStatus(SystemMode);
+                ExceptionHandler(ex);
+                kernel->interrupt->setStatus(UserMode);
             }
+
+            to_load = offset + PageSize < sz ? PageSize : sz - offset;
+
+            executable->ReadAt(
+                &(kernel->machine->mainMemory[paddr]),
+                to_load, fpos + offset);
+        }
+    }
+
     if (noffH.initData.size > 0) {
         DEBUG(dbgAddr, "Initializing data segment.");
         DEBUG(dbgAddr, noffH.initData.virtualAddr << ", " << noffH.initData.size);
+
+        sz = noffH.initData.size;
+        vaddr = noffH.initData.virtualAddr;
+        fpos = noffH.initData.inFileAddr;
+
+        for (uint offset = 0; offset < sz; offset += PageSize) {
+            ex = Translate(vaddr + offset, &paddr, 1);
+
+            if (ex != NoException) {
+                kernel->interrupt->setStatus(SystemMode);
+                ExceptionHandler(ex);
+                kernel->interrupt->setStatus(UserMode);
+            }
+
+            to_load = offset + PageSize < sz ? PageSize : sz - offset;
+
             executable->ReadAt(
-		&(kernel->machine->mainMemory[noffH.initData.virtualAddr]),
+                &(kernel->machine->mainMemory[paddr]),
-			noffH.initData.size, noffH.initData.inFileAddr);
+                to_load, fpos + offset);
+        }
     }
 
 #ifdef RDATA
     if (noffH.readonlyData.size > 0) {
         DEBUG(dbgAddr, "Initializing read only data segment.");
         DEBUG(dbgAddr, noffH.readonlyData.virtualAddr << ", " << noffH.readonlyData.size);
+
+        sz = noffH.readonlyData.size;
+        vaddr = noffH.readonlyData.virtualAddr;
+        fpos = noffH.readonlyData.inFileAddr;
+
+        // read only flag for page table
+        for (int i = 0, lim = divRoundUp(sz, PageSize),
+            from = vaddr / PageSize; i < lim; ++i)
+            pageTable[from + i].readOnly = TRUE;
+
+        for (uint offset = 0; offset < sz; offset += PageSize) {
+            ex = Translate(vaddr + offset, &paddr, 0); // read only
+
+            if (ex != NoException) {
+                kernel->interrupt->setStatus(SystemMode);
+                ExceptionHandler(ex);
+                kernel->interrupt->setStatus(UserMode);
+            }
+
+            to_load = offset + PageSize < sz ? PageSize : sz - offset;
+
             executable->ReadAt(
-		&(kernel->machine->mainMemory[noffH.readonlyData.virtualAddr]),
+                &(kernel->machine->mainMemory[paddr]),
-			noffH.readonlyData.size, noffH.readonlyData.inFileAddr);
+                to_load, fpos + offset);
+        }
     }
 #endif
 
@@ -181,7 +248,6 @@ AddrSpace::Load(char *fileName)
 //      the address space
 //
 //----------------------------------------------------------------------
-
 void
 AddrSpace::Execute(char* fileName)
 {
@@ -191,7 +257,7 @@ AddrSpace::Execute(char* fileName)
     this->InitRegisters();		// set the initial register values
     this->RestoreState();		// load page table register
 
-    kernel->machine->Run();		// jump to the user progam
+    kernel->machine->Run();		// jump to the user program
 
     ASSERTNOTREACHED();			// machine->Run never returns;
     // the address space exits
@@ -208,11 +274,10 @@ AddrSpace::Execute(char* fileName)
 //	will be saved/restored into the currentThread->userRegisters
 //	when this thread is context switched out.
 //----------------------------------------------------------------------
-
 void
 AddrSpace::InitRegisters()
 {
-    Machine *machine = kernel->machine;
+    Machine* machine = kernel->machine;
     int i;
 
     for (i = 0; i < NumTotalRegs; i++)
@@ -242,9 +307,9 @@ AddrSpace::InitRegisters()
 //
 //	For now, don't need to save anything!
 //----------------------------------------------------------------------
-
 void AddrSpace::SaveState()
-{}
+{
+}
 
 //----------------------------------------------------------------------
 // AddrSpace::RestoreState
@@ -253,7 +318,6 @@ void AddrSpace::SaveState()
 //
 //      For now, tell the machine where to find the page table.
 //----------------------------------------------------------------------
-
 void AddrSpace::RestoreState()
 {
     kernel->machine->pageTable = pageTable;
@@ -270,20 +334,20 @@ void AddrSpace::RestoreState()
 //  Return any exceptions caused by the address translation.
 //----------------------------------------------------------------------
 ExceptionType
-AddrSpace::Translate(unsigned int vaddr, unsigned int *paddr, int isReadWrite)
+AddrSpace::Translate(unsigned int vaddr, unsigned int* paddr, int isReadWrite)
 {
-    TranslationEntry *pte;
+    TranslationEntry* pte;
     int               pfn;
     unsigned int      vpn = vaddr / PageSize;
     unsigned int      offset = vaddr % PageSize;
 
-    if(vpn >= numPages) {
+    if (vpn >= numPages) {
         return AddressErrorException;
     }
 
     pte = &pageTable[vpn];
 
-    if(isReadWrite && pte->readOnly) {
+    if (isReadWrite && pte->readOnly) {
         return ReadOnlyException;
     }
 
@@ -298,10 +362,10 @@ AddrSpace::Translate(unsigned int vaddr, unsigned int *paddr, int isReadWrite)
 
     pte->use = TRUE;          // set the use, dirty bits
 
-    if(isReadWrite)
+    if (isReadWrite)
         pte->dirty = TRUE;
 
-    *paddr = pfn*PageSize + offset;
+    *paddr = pfn * PageSize + offset;
 
     ASSERT((*paddr < MemorySize));
 
@@ -311,6 +375,43 @@ AddrSpace::Translate(unsigned int vaddr, unsigned int *paddr, int isReadWrite)
     return NoException;
 }
 
-
+FrameTable::FrameTable() {
+    for (int i = 0; i < NumPhysPages; ++i)
+        available.Append(i);
+}
+
+FrameTable::~FrameTable() {}
+
+uint FrameTable::RemainSize() { return available.NumInList(); }
+
+PageTable FrameTable::Allocate(uint pageNum) {
+    // if not enough memory
+    if (RemainSize() < pageNum)
+        return NULL;
+
+    PageTable ptb = new TranslationEntry[pageNum];
+
+    for (int i = 0; i < pageNum; ++i) {
+        ptb[i].virtualPage = i;
+        int f = available.RemoveFront(); // frame number
+        ptb[i].physicalPage = f;
+        // initialize flags
+        ptb[i].valid = TRUE;
+        ptb[i].use = FALSE;
+        ptb[i].dirty = FALSE;
+        ptb[i].readOnly = FALSE;
+        // zero out the entire address space
+        bzero(kernel->machine->mainMemory + f * PageSize, PageSize);
+    }
+    return ptb;
+}
+
+void FrameTable::Release(PageTable ptb, int pageNum) {
+    if (!ptb)
+        return; // nothing to release
+    for (int i = 0; i < pageNum; ++i)
+        available.Append(ptb[i].physicalPage);
+    delete[] ptb;
+}
 
 

code/userprog/addrspace.h

@@ -19,15 +19,15 @@
 #define UserStackSize		1024 	// increase this as necessary!
 
 class AddrSpace {
-  public:
+public:
   AddrSpace();			// Create an address space.
   ~AddrSpace();			// De-allocate an address space
 
-    bool Load(char *fileName);		// Load a program into addr space from
+  bool Load(char* fileName);		// Load a program into addr space from
   // a file
-					// return false if not found
+// return false if not found
 
-    void Execute(char *fileName);             	// Run a program
+  void Execute(char* fileName);             	// Run a program
   // assumes the program has already
                                 // been loaded
 
@@ -37,10 +37,10 @@ class AddrSpace {
   // Translate virtual address _vaddr_
   // to physical address _paddr_. _mode_
   // is 0 for Read, 1 for Write.
-    ExceptionType Translate(unsigned int vaddr, unsigned int *paddr, int mode);
+  ExceptionType Translate(unsigned int vaddr, unsigned int* paddr, int mode);
 
-  private:
+private:
-    TranslationEntry *pageTable;	// Assume linear page table translation
+  TranslationEntry* pageTable;	// Assume linear page table translation
   // for now!
   unsigned int numPages;		// Number of pages in the virtual 
   // address space
@@ -51,3 +51,51 @@ class AddrSpace {
 };
 
 #endif // ADDRSPACE_H
+
+#ifndef FRAME_TABLE_H
+#define FRAME_TABLE_H
+
+#include "machine.h"
+#include "list.h"
+
+/**
+ * Data structure of Virtual Memory
+ */
+typedef TranslationEntry* PageTable;
+
+/**
+ * Data structure of Physical Memory
+ */
+class FrameTable {
+public:
+  /**
+   * Initialize a frame table
+   */
+  FrameTable();
+  ~FrameTable();
+
+  /**
+   * Allocate pageNum of frames (pages) and collect
+   * corresponding translation information into a page table.
+   *
+   * @param pageNum numbers of pages
+   * @return a new Page table, NULL if not enough memory space
+   */
+  PageTable Allocate(uint pageNum);
+
+  /**
+   * Release the physical memory frame
+   * which the info stored in PageTable
+   */
+  void Release(PageTable ptb, int pageNum);
+
+  /**
+   * @return the remaining numbers of entry of the frame table
+   */
+  uint RemainSize();
+
+private:
+  List<int> available;
+};
+
+#endif /* FRAME_TABLE_H */

code/userprog/exception.cc

@@ -54,33 +54,97 @@ ExceptionHandler(ExceptionType which)
 	int type = kernel->machine->ReadRegister(2);
 	int val;
 	int status, exit, threadID, programID;
+	int fd, size;
 	DEBUG(dbgSys, "Received Exception " << which << " type: " << type << "\n");
 	switch (which) {
 	case SyscallException:
-      switch(type) {
+		switch (type) {
 		case SC_Halt:
 			DEBUG(dbgSys, "Shutdown, initiated by user program.\n");
 			SysHalt();
-          cout<<"in exception\n";
+			cout << "in exception\n";
 			ASSERTNOTREACHED();
 			break;
 		case SC_MSG:
 			DEBUG(dbgSys, "Message received.\n");
 			val = kernel->machine->ReadRegister(4);
 			{
-            char *msg = &(kernel->machine->mainMemory[val]);
+				char* msg = &(kernel->machine->mainMemory[val]);
 				cout << msg << endl;
 			}
 			SysHalt();
 			ASSERTNOTREACHED();
 			break;
+		case SC_PrintInt:
+			val = kernel->machine->ReadRegister(4);
+			SysPrintInt(val);
+			kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
+			kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			return;
 		case SC_Create:
 			val = kernel->machine->ReadRegister(4);
 			{
-            char *filename = &(kernel->machine->mainMemory[val]);
+				char* filename = &(kernel->machine->mainMemory[val]);
 				//cout << filename << endl;
 				status = SysCreate(filename);
-            kernel->machine->WriteRegister(2, (int) status);
+				kernel->machine->WriteRegister(2, (int)status);
+			}
+			kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
+			kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			return;
+			ASSERTNOTREACHED();
+			break;
+		case SC_Open:
+			val = kernel->machine->ReadRegister(4);
+			{
+				char* filename = &(kernel->machine->mainMemory[val]);
+				//cout << filename << endl;
+				fd = SysOpen(filename);
+				kernel->machine->WriteRegister(2, (int)fd);
+			}
+			kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
+			kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			return;
+			ASSERTNOTREACHED();
+			break;
+		case SC_Write:
+			val = kernel->machine->ReadRegister(4);
+			size = kernel->machine->ReadRegister(5);
+			fd = kernel->machine->ReadRegister(6);
+			{
+				char* buffer = &(kernel->machine->mainMemory[val]);
+				size = SysWrite(buffer, size, fd);
+				kernel->machine->WriteRegister(2, (int)size);
+			}
+			kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
+			kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			return;
+			ASSERTNOTREACHED();
+			break;
+		case SC_Close:
+			fd = kernel->machine->ReadRegister(4);
+			{
+				val = SysClose(fd);
+				kernel->machine->WriteRegister(2, (int)val);
+			}
+			kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
+			kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
+			return;
+			ASSERTNOTREACHED();
+			break;
+		case SC_Read:
+			val = kernel->machine->ReadRegister(4);
+			size = kernel->machine->ReadRegister(5);
+			fd = kernel->machine->ReadRegister(6);
+			{
+				char* buffer = &(kernel->machine->mainMemory[val]);
+				size = SysRead(buffer, size, fd);
+				kernel->machine->WriteRegister(2, (int)size);
 			}
 			kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
 			kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
@@ -118,92 +182,6 @@ ExceptionHandler(ExceptionType which)
 			cout << "return value:" << val << endl;
 			kernel->currentThread->Finish();
 			break;
-        case SC_PrintInt:
-          DEBUG(dbgAddr, "Printing int\n");
-          val = (int)kernel->machine->ReadRegister(4);
-          SysPrintInt(val);
-
-          kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
-          kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
-          kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
-          
-          return;
-          ASSERTNOTREACHED();
-          break;
-        case SC_Open:
-          DEBUG(dbgAddr, "Open file\n");
-
-          {
-            val = kernel->machine->ReadRegister(4);
-            char *name = &(kernel->machine->mainMemory[val]);
-            OpenFileId ret = SysOpen(name);
-            kernel->machine->WriteRegister(2, ret);
-          }
- 
-          kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
-          kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
-          kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
-
-          return;
-          ASSERTNOTREACHED();
-          break;
-        case SC_Read:
-          DEBUG(dbgAddr, "Read file\n");
-
-          {
-            val = kernel->machine->ReadRegister(4);
-            char *buffer = &(kernel->machine->mainMemory[val]);
-            int size = kernel->machine->ReadRegister(5);
-            OpenFileId id = (OpenFileId)kernel->machine->ReadRegister(6);
-            int ret = SysRead(buffer, size, id);
-            kernel->machine->WriteRegister(2, ret);
-          }
-
-          kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
-          kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
-          kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
-
-          return;
-          ASSERTNOTREACHED();
-          break;
-        case SC_Write:
-          DEBUG(dbgAddr, "Write file\n");
-
-          {
-            val = kernel->machine->ReadRegister(4);
-            char *buffer = &(kernel->machine->mainMemory[val]);
-            int size = kernel->machine->ReadRegister(5);
-            OpenFileId id = (OpenFileId)kernel->machine->ReadRegister(6);
-            // fprintf(stderr, "buffer: %p\n", buffer);
-            // cerr << "size: " << size << endl;
-            // cerr << "id: " << id << endl;
-            int ret = SysWrite(buffer, size, id);
-            kernel->machine->WriteRegister(2, ret);
-          }
-
-          kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
-          kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
-          kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
-
-          return;
-          ASSERTNOTREACHED();
-          break;
-        case SC_Close:
-          DEBUG(dbgAddr, "Close file\n");
-
-          {
-            OpenFileId id = (OpenFileId)kernel->machine->ReadRegister(4);
-            int ret = SysClose(id);
-            kernel->machine->WriteRegister(2, ret);
-          }
-
-          kernel->machine->WriteRegister(PrevPCReg, kernel->machine->ReadRegister(PCReg));
-          kernel->machine->WriteRegister(PCReg, kernel->machine->ReadRegister(PCReg) + 4);
-          kernel->machine->WriteRegister(NextPCReg, kernel->machine->ReadRegister(PCReg) + 4);
-
-          return;
-          ASSERTNOTREACHED();
-          break;
 		default:
 			cerr << "Unexpected system call " << type << "\n";
 			break;

code/userprog/hw4_consoleIO_1.c

@@ -0,0 +1,11 @@
+#include "syscall.h"
+
+int
+main()
+{
+  int n;
+  for (n = 0; n < 4; n++) {
+    PrintInt(1);
+  }
+  return 0;
+}

code/userprog/hw4_consoleIO_2.c

@@ -0,0 +1,11 @@
+#include "syscall.h"
+
+int
+main()
+{
+  int n;
+  for (n = 0; n < 5; n++) {
+    PrintInt(2);
+  }
+  return 0;
+}

code/userprog/hw4_consoleIO_3.c

@@ -0,0 +1,12 @@
+#include "syscall.h"
+
+int
+main()
+{
+  int n;
+
+  for (n = 0; n < 12; n++) {
+    PrintInt(3);
+  }
+  return 0;
+}

code/userprog/hw4_consoleIO_4.c

@@ -0,0 +1,12 @@
+#include "syscall.h"
+
+int
+main()
+{
+  int n;
+
+  for (n = 0; n < 11; n++) {
+    PrintInt(4);
+  }
+  return 0;
+}

code/userprog/ksyscall.h

@@ -11,12 +11,11 @@
 #ifndef __USERPROG_KSYSCALL_H__ 
 #define __USERPROG_KSYSCALL_H__ 
 
-#define INT_BUF_LENGTH 13
-
 #include "kernel.h"
 
 #include "synchconsole.h"
 
+typedef int OpenFileId;
 
 void SysHalt()
 {
@@ -28,7 +27,7 @@ int SysAdd(int op1, int op2)
 	return op1 + op2;
 }
 
-int SysCreate(char *filename)
+int SysCreate(char* filename)
 {
 	// return value
 	// 1: success
@@ -36,43 +35,37 @@ int SysCreate(char *filename)
 	return kernel->interrupt->CreateFile(filename);
 }
 
-void SysPrintInt(int value) {
+void SysPrintInt(int value)
+{
 	kernel->interrupt->PrintInt(value);
 }
 
-OpenFileId SysOpen(char *name) {
+// -1: open fail
-  OpenFileId id = -1;
+// fd
-  for (int i = 0; i < 20; i++)
+OpenFileId SysOpen(char* filename)
-    if (kernel->fileSystem->fileDescriptorTable[i] == NULL) {
+{
-      id = i;
+	return kernel->interrupt->OpenFile(filename);
-      kernel->fileSystem->fileDescriptorTable[i] 
-        = kernel->fileSystem->Open(name);
-      if (kernel->fileSystem->fileDescriptorTable[i] == NULL)
-        return -1;
-      break;
-    }
-  return id;
 }
 
-int SysWrite(char *buffer, int size, OpenFileId id) {
+// -1: write fail
-  if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
+// size 
-    return -1;
+int SysWrite(char* buffer, int size, OpenFileId fd)
-  return kernel->fileSystem->fileDescriptorTable[id]->Write(buffer, size);
+{
+	return kernel->interrupt->WriteFile(buffer, size, fd);
 }
 
-int SysRead(char *buffer, int size, OpenFileId id) {
+// 1: close success
-  if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
+// 0: close fail
-    return -1;
+int SysClose(OpenFileId fd)
-  return kernel->fileSystem->fileDescriptorTable[id]->Read(buffer, size);
+{
+	return kernel->interrupt->CloseFile(fd);
 }
 
-int SysClose(OpenFileId id) {
+// -1: read fail
-  if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
+// size
-    return 0;
+int SysRead(char* buffer, int size, OpenFileId fd)
-  delete kernel->fileSystem->fileDescriptorTable[id];
+{
-  kernel->fileSystem->fileDescriptorTable[id] = NULL;
+	return kernel->interrupt->ReadFile(buffer, size, fd);
-  return 1;
 }
 
-
 #endif /* ! __USERPROG_KSYSCALL_H__ */

code/userprog/noff.h

@@ -6,8 +6,7 @@
  */
 
 #define NOFFMAGIC	0xbadfad 	/* magic number denoting Nachos 
-					 * object code file 
+                              /* object code file*/
-					 */
 
 typedef struct segment {
    int virtualAddr;		/* location of segment in virt addr space */

code/userprog/synchconsole.cc

@@ -17,7 +17,7 @@
 //              otherwise, read from this file
 //----------------------------------------------------------------------
 
-SynchConsoleInput::SynchConsoleInput(char *inputFile)
+SynchConsoleInput::SynchConsoleInput(char* inputFile)
 {
     consoleInput = new ConsoleInput(inputFile, this);
     lock = new Lock("console in");
@@ -73,7 +73,7 @@ SynchConsoleInput::CallBack()
 //              otherwise, read from this file
 //----------------------------------------------------------------------
 
-SynchConsoleOutput::SynchConsoleOutput(char *outputFile)
+SynchConsoleOutput::SynchConsoleOutput(char* outputFile)
 {
     consoleOutput = new ConsoleOutput(outputFile, this);
     lock = new Lock("console out");
@@ -106,6 +106,11 @@ SynchConsoleOutput::PutChar(char ch)
     lock->Release();
 }
 
+//----------------------------------------------------------------------
+// SynchConsoleOutput::PutInt
+//      Write a int to the console display, waiting if necessary.
+//----------------------------------------------------------------------
+
 void
 SynchConsoleOutput::PutInt(int value)
 {

code/userprog/synchconsole.h

@@ -21,32 +21,32 @@
 // a console device
 
 class SynchConsoleInput : public CallBackObj {
-  public:
+public:
-    SynchConsoleInput(char *inputFile); // Initialize the console device
+  SynchConsoleInput(char* inputFile); // Initialize the console device
   ~SynchConsoleInput();		// Deallocate console device
 
   char GetChar();		// Read a character, waiting if necessary
 
-  private:
+private:
-    ConsoleInput *consoleInput;	// the hardware keyboard
+  ConsoleInput* consoleInput;	// the hardware keyboard
-    Lock *lock;			// only one reader at a time
+  Lock* lock;			// only one reader at a time
-    Semaphore *waitFor;		// wait for callBack
+  Semaphore* waitFor;		// wait for callBack
 
   void CallBack();		// called when a keystroke is available
 };
 
 class SynchConsoleOutput : public CallBackObj {
-  public:
+public:
-    SynchConsoleOutput(char *outputFile); // Initialize the console device
+  SynchConsoleOutput(char* outputFile); // Initialize the console device
   ~SynchConsoleOutput();
 
   void PutChar(char ch);	// Write a character, waiting if necessary
   void PutInt(int value);
 
-  private:
+private:
-    ConsoleOutput *consoleOutput;// the hardware display
+  ConsoleOutput* consoleOutput;// the hardware display
-    Lock *lock;			// only one writer at a time
+  Lock* lock;			// only one writer at a time
-    Semaphore *waitFor;		// wait for callBack
+  Semaphore* waitFor;		// wait for callBack
 
   void CallBack();		// called when more data can be written
 };

code/userprog/syscall.h

@@ -15,7 +15,7 @@
 
 #include "copyright.h"
 #include "errno.h"
-/* system call codes -- used by the stubs to tell the kernel which system call
+ /* system call codes -- used by the stubs to tell the kernel which system call
   * is being asked for
   */
 #define SC_Halt		0
@@ -34,15 +34,13 @@
 #define SC_ExecV	13
 #define SC_ThreadExit   14
 #define SC_ThreadJoin   15
-
-#define SC_PrintInt     16
-
 #define SC_Add		42
 #define SC_MSG		100
+#define SC_PrintInt 16
 
 #ifndef IN_ASM
 
-/* The system call interface.  These are the operations the Nachos
+  /* The system call interface.  These are the operations the Nachos
    * kernel needs to support, to be able to run user programs.
    *
    * Each of these is invoked by a user program by simply calling the
@@ -52,9 +50,14 @@
    * from the system call entry point in exception.cc.
    */
 
-/* Stop Nachos, and print out performance stats */
+   /* Stop Nachos, and print out performance stats */
 void Halt();
 
+/*
+ * Show the int value on console
+ */
+void PrintInt(int value);
+
 /*
  * Add the two operants and return the result
  */
@@ -63,7 +66,7 @@ int Add(int op1, int op2);
 /*
  * Just for simply showing message, not a safe way for console IO
  */
-void MSG(char *msg);
+void MSG(char* msg);
 
 /* Address space control operations: Exit, Exec, Execv, and Join */
 
@@ -102,7 +105,7 @@ int Join(SpaceId id);
  * file system has not been implemented.
  */
 
-/* A unique identifier for an open Nachos file. */
+ /* A unique identifier for an open Nachos file. */
 typedef int OpenFileId;
 
 /* when an address space starts up, it has two open files, representing
@@ -114,24 +117,24 @@ typedef int OpenFileId;
 #define SysConsoleInput	0  
 #define SysConsoleOutput	1  
 
-/* Create a Nachos file, with name "name" */
+ /* Create a Nachos file, with name "name" */
-/* Note: Create does not open the file.   */
+ /* Note: Create does not open the file.   */
-/* Return 1 on success, negative error code on failure */
+ /* Return 1 on success, negative error code on failure */
-int Create(char *name);
+int Create(char* name);
 
 /* Remove a Nachos file, with name "name" */
-int Remove(char *name);
+int Remove(char* name);
 
 /* Open the Nachos file "name", and return an "OpenFileId" that can
  * be used to read and write to the file.
  */
-OpenFileId Open(char *name);
+OpenFileId Open(char* name);
 
 /* Write "size" bytes from "buffer" to the open file.
  * Return the number of bytes actually read on success.
  * On failure, a negative error code is returned.
  */
-int Write(char *buffer, int size, OpenFileId id);
+int Write(char* buffer, int size, OpenFileId id);
 
 /* Read "size" bytes from the open file into "buffer".
  * Return the number of bytes actually read -- if the open file isn't
@@ -139,7 +142,7 @@ int Write(char *buffer, int size, OpenFileId id);
  * characters to read, return whatever is available (for I/O devices,
  * you should always wait until you can return at least one character).
  */
-int Read(char *buffer, int size, OpenFileId id);
+int Read(char* buffer, int size, OpenFileId id);
 
 /* Set the seek position of the open file "id"
  * to the byte "position".
@@ -158,7 +161,7 @@ int Close(OpenFileId id);
  * Could define other operations, such as LockAcquire, LockRelease, etc.
  */
 
-/* Fork a thread to run a procedure ("func") in the *same* address space 
+ /* Fork a thread to run a procedure ("func") in the *same* address space
   * as the current thread.
   * Return a positive ThreadId on success, negative error code on failure
   */
@@ -180,8 +183,6 @@ int ThreadJoin(ThreadId id);
  */
 void ThreadExit(int ExitCode);
 
-void PrintInt(int number);
-
 #endif /* IN_ASM */
 
 #endif /* SYSCALL_H */

docker-compose.yaml

@@ -2,6 +2,6 @@
 services:
   test:
     build: .
-    user: '60139:60139'
+    user: ytshih
     volumes:
       - './:/work'