From f0a27e2869de153295f94216557706035aac7d8a Mon Sep 17 00:00:00 2001
From: Alex Stratford <alexander3.stratford@live.uwe.ac.uk>
Date: Wed, 4 Dec 2019 10:48:20 +0000
Subject: [PATCH] Fixing merge errors
---
userprog/syscall.c | 6 ------
userprog/system_calls.h | 30 +++++++++---------------------
2 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/userprog/syscall.c b/userprog/syscall.c
index 9223e37..0773f82 100644
--- a/userprog/syscall.c
+++ b/userprog/syscall.c
@@ -61,12 +61,6 @@ syscall_handler (struct intr_frame *f UNUSED)
case SYSCALL_EXIT:
syscall_exit(f);
break;
- case SYSCALL_EXEC:
- syscall_exec(f);
- break;
- case SYSCALL_WAIT:
- syscall_wait(f);
- break;
case SYSCALL_CREATE:
syscall_create(f);
break;
diff --git a/userprog/system_calls.h b/userprog/system_calls.h
index bfb72ad..78cc720 100644
--- a/userprog/system_calls.h
+++ b/userprog/system_calls.h
@@ -11,27 +11,20 @@ struct file_map
struct file *file; // Defined in file.c
};
-
/*
- * Terminates Pintos by calling shutdown_power_off()
- * (declared in devices/shutdown.h).
+ * Terminates the current user program, returning status to the kernel. If the
+ * process's parent waits for it (see below), this is the status that will be
+ * returned. Conventionally, a status of 0 indicates success and nonzero
+ * values indicate errors.
*/
-void syscall_halt(struct intr_frame *f);
+void syscall_exit(struct intr_frame *f);
-/*
- * Runs the executable whose name is given in cmd_line, passing any given
- * arguments, and returns the new process's program id (pid). Must return pid
- * -1, which otherwise should not be a valid pid, if the program cannot load or
- * run for any reason. Thus, the parent process cannot return from the exec
- * until it knows whether the child process successfully loaded its executable.
- * You must use appropriate synchronization to ensure this.
- */
-void syscall_exec(struct intr_frame *f);
/*
- * Waits for a child process pid and retrieves the child's exit status.
+ * Terminates Pintos by calling shutdown_power_off()
+ * (declared in devices/shutdown.h).
*/
-void syscall_wait(struct intr_frame *f);
+void syscall_halt(struct intr_frame *f);
/*
* Opens the file called file. Returns a nonnegative integer handle called a
@@ -50,9 +43,4 @@ void syscall_create(struct intr_frame *f);
* Returns the number of bytes actually written, which may be less than size if
* some bytes could not be written.
*/
-void syscall_write(struct intr_frame *f);
-
-/*
- * NOTE: There are more system calls implemented by Pintos but we are not
- * implementing them because the assignment brief does not ask of it.
- */
+void syscall_write(struct intr_frame *f);
\ No newline at end of file
--
GitLab