hw4 test

2024-12-30 05:59:42 +08:00
parent bf78b95c9d
commit 72320ede22
42 changed files with 1758 additions and 1556 deletions
--- a/code/userprog/ksyscall.h
+++ b/code/userprog/ksyscall.h
@@ -1,78 +1,71 @@
-/**************************************************************
- *
- * userprog/ksyscall.h
- *
- * Kernel interface for systemcalls 
- *
- * by Marcus Voelp  (c) Universitaet Karlsruhe
- *
- **************************************************************/
-
-#ifndef __USERPROG_KSYSCALL_H__ 
-#define __USERPROG_KSYSCALL_H__ 
-
-#define INT_BUF_LENGTH 13
-
-#include "kernel.h"
-
-#include "synchconsole.h"
-
-
-void SysHalt()
-{
-  kernel->interrupt->Halt();
-}
-
-int SysAdd(int op1, int op2)
-{
-  return op1 + op2;
-}
-
-int SysCreate(char *filename)
-{
-  // return value
-  // 1: success
-  // 0: failed
-  return kernel->interrupt->CreateFile(filename);
-}
-
-void SysPrintInt(int value) {
-  kernel->interrupt->PrintInt(value);
-}
-
-OpenFileId SysOpen(char *name) {
-  OpenFileId id = -1;
-  for (int i = 0; i < 20; i++)
-    if (kernel->fileSystem->fileDescriptorTable[i] == NULL) {
-      id = i;
-      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) {
-  if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
-    return -1;
-  return kernel->fileSystem->fileDescriptorTable[id]->Write(buffer, size);
-}
-
-int SysRead(char *buffer, int size, OpenFileId id) {
-  if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
-    return -1;
-  return kernel->fileSystem->fileDescriptorTable[id]->Read(buffer, size);
-}
-
-int SysClose(OpenFileId id) {
-  if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
-    return 0;
-  delete kernel->fileSystem->fileDescriptorTable[id];
-  kernel->fileSystem->fileDescriptorTable[id] = NULL;
-  return 1;
-}
-
-
-#endif /* ! __USERPROG_KSYSCALL_H__ */
+/**************************************************************
+ *
+ * userprog/ksyscall.h
+ *
+ * Kernel interface for systemcalls
+ *
+ * by Marcus Voelp  (c) Universitaet Karlsruhe
+ *
+ **************************************************************/
+
+#ifndef __USERPROG_KSYSCALL_H__ 
+#define __USERPROG_KSYSCALL_H__ 
+
+#include "kernel.h"
+
+#include "synchconsole.h"
+
+typedef int OpenFileId;
+
+void SysHalt()
+{
+	kernel->interrupt->Halt();
+}
+
+int SysAdd(int op1, int op2)
+{
+	return op1 + op2;
+}
+
+int SysCreate(char* filename)
+{
+	// return value
+	// 1: success
+	// 0: failed
+	return kernel->interrupt->CreateFile(filename);
+}
+
+void SysPrintInt(int value)
+{
+	kernel->interrupt->PrintInt(value);
+}
+
+// -1: open fail
+// fd
+OpenFileId SysOpen(char* filename)
+{
+	return kernel->interrupt->OpenFile(filename);
+}
+
+// -1: write fail
+// size 
+int SysWrite(char* buffer, int size, OpenFileId fd)
+{
+	return kernel->interrupt->WriteFile(buffer, size, fd);
+}
+
+// 1: close success
+// 0: close fail
+int SysClose(OpenFileId fd)
+{
+	return kernel->interrupt->CloseFile(fd);
+}
+
+// -1: read fail
+// size
+int SysRead(char* buffer, int size, OpenFileId fd)
+{
+	return kernel->interrupt->ReadFile(buffer, size, fd);
+}
+
+#endif /* ! __USERPROG_KSYSCALL_H__ */