Merge pull request #28 from Blue-club/chwangmin

Chwangmin

.gitignore

@@ -0,0 +1,61 @@
+# Created by https://www.toptal.com/developers/gitignore/api/c
+# Edit at https://www.toptal.com/developers/gitignore?templates=c
+
+### C ###
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+# git_ignore
+*.bin
+
+# End of https://www.toptal.com/developers/gitignore/api/c

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+    "files.associations": {
+        "syscall.h": "c",
+        "unistd.h": "c",
+        "intrinsic.h": "c",
+        "thread.h": "c",
+        "process.h": "c",
+        "gdt.h": "c",
+        "vga.h": "c",
+        "*.inc": "c",
+        "loader.h": "c",
+        "vaddr.h": "c",
+        "init.h": "c",
+        "flags.h": "c",
+        "filesys.h": "c",
+        "synch.h": "c",
+        "input.h": "c",
+        "off_t.h": "c"
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+    "tasks": [
+        {
+            "type": "cppbuild",
+            "label": "C/C++: gcc-7 build active file",
+            "command": "/usr/bin/gcc-7",
+            "args": [
+                "-fdiagnostics-color=always",
+                "-g",
+                "${file}",
+                "-o",
+                "${fileDirname}/${fileBasenameNoExtension}"
+            ],
+            "options": {
+                "cwd": "${fileDirname}"
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "detail": "Task generated by Debugger."
+        }
+    ],
+    "version": "2.0.0"
+}

include/threads/loader.h

@@ -5,7 +5,7 @@
 #define LOADER_BASE 0x7c00      /* Physical address of loader's base. */
 #define LOADER_END  0x7e00      /* Physical address of end of loader. */
 
-/* Physical address of kernel base. */
+/* Virtual address of kernel base. */
 #define LOADER_KERN_BASE 0x8004000000
 
 /* Kernel virtual address at which all physical memory is mapped. */

include/threads/thread.h

@@ -5,6 +5,7 @@
 #include <list.h>
 #include <stdint.h>
 #include "threads/interrupt.h"
+#include "threads/synch.h" // 이것을 추가해야 포인터를 쓸 수 있습니다.
 #ifdef VM
 #include "vm/vm.h"
 #endif
@@ -28,6 +29,9 @@ typedef int tid_t;
 #define PRI_DEFAULT 31                  /* Default priority. */
 #define PRI_MAX 63                      /* Highest priority. */
 
+#define FDT_PAGES 2
+#define FDT_COUNT_LIMIT 128
+
 /* A kernel thread or user process.
  *
  * Each thread structure is stored in its own 4 kB page.  The
@@ -94,12 +98,28 @@ struct thread {
 	int64_t wakeup_tick;				/* 해당 쓰레드가 깨어나야 할 tick을 저장할 필드 */
 	/* Shared between thread.c and synch.c. */
 	struct list_elem elem;              /* List element. */
+
 	/*priority donation 관련 항목 추가*/
 	int init_priority;					/* donation 이후 우선순위를 초기화하기 위해 초기값 저장 */
 	struct lock *wait_on_lock;			/* 해당 스레드가 대기 하고 있는 lock자료구조의 주소를 저장 */
 	struct list donations;				/* multiple donation 을 고려하기 위해 사용 */
 	struct list_elem donation_elem;		/* multiple donation 을 고려하기 위해 사용 */
 
+	/*project 2 - SystemCall 항목 추가*/
+	int exit_status;					/* exit 호출 시 종료 status */
+	struct file **fdt;					/* 부모 프로세스의 디스크립터 */
+	int next_fd;						/* 다음 디스크립트를 가리키는 테이블 번호 */
+
+	struct intr_frame parent_if;		/* 프로세스 프로그램 메모리 적재 */
+	struct list child_list;				/* 자식 리스트 */
+	struct list_elem child_elem;		/* 자식 리스트 element */
+
+	struct semaphore load_sema;			/* load 세마포어 */
+	struct semaphore exit_sema;			/* exit 세마포어 */
+	struct semaphore wait_sema;			/* wait 세마포어 */
+
+	struct file *running; // 현재 실행중인 파일
+
 #ifdef USERPROG
 	/* Owned by userprog/process.c. */
 	uint64_t *pml4;                     /* Page map level 4 */
@@ -155,6 +175,10 @@ int64_t get_next_tick_to_awake(void);
 
 void test_max_priority(void);
 bool cmp_priority(const struct list_elem *a, const struct list_elem *b, void *aux UNUSED);
+// project2
+bool cmp_thread_priority(const struct list_elem *a, const struct list_elem *b, void *aux);
+bool cmp_thread_ticks(const struct list_elem *a, const struct list_elem *b, void *aux);
+// ---
 
 void donate_priority(void);
 void remove_with_lock(struct lock *lock);
@@ -163,4 +187,6 @@ void refresh_priority(void);
 bool
 thread_compare_donate_priority(const struct list_elem *x, const struct list_elem *y, void *aux UNUSED);
 
+void preempt_priority(void);
+
 #endif /* threads/thread.h */

include/userprog/process.h

@@ -9,5 +9,11 @@ int process_exec (void *f_name);
 int process_wait (tid_t);
 void process_exit (void);
 void process_activate (struct thread *next);
-
+/* project 2 */
+void argument_stack(char **argv, int argc, void **rsp);
+struct thread *get_child_process(int pid);
+int process_add_file(struct file *f);
+struct file *process_get_file(int fd);
+void process_close_file(int fd);
+struct thread *get_child_process(int pid);
 #endif /* userprog/process.h */

include/userprog/syscall.h

@@ -2,5 +2,6 @@
 #define USERPROG_SYSCALL_H
 
 void syscall_init (void);
+struct lock filesys_lock;
 
-#endif /* userprog/syscall.h */
+#endif /* userprog/syscall.h */

lib/user/entry.c

@@ -3,6 +3,7 @@
 int main (int, char *[]);
 void _start (int argc, char *argv[]);
 
+// user program의 진입점이다.
 void
 _start (int argc, char *argv[]) {
 	exit (main (argc, argv));

test.c

@@ -0,0 +1,17 @@
+#include <stdio.h>
+
+int main()
+{asdfsafkn;adfna;nf;
+    long num = 4613937818241073152;
+    long* ptr = &num;
+    long** dptr = &ptr;
+    long*** tptr = &dptr;
+
+    printf("\n abcd~~ abcd~~~ 0x%02X \n", *(long **)dptr);
+    printf("\n abcd~~ abcd~~~ 0x%02X \n", **(long **)dptr);
+    printf("\n abcd~~ abcd~~~ 0x%02X \n", **(long ***)dptr);
+    printf("\n abcd~~ abcd~~~ 0x%02X \n", ***(long ***)dptr);
+
+    //int aList[10] = {1,2,3,4,5,6,7,8,9,10};
+    return 0;
+}