Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine syscall code with final stack initialization code #32

Merged
td1223 merged 27 commits from read-only-exec into userprog-merge 2024-11-11 22:23:20 +00:00
Conversation 1 Commits 27 Files Changed 5 +345 -32
5 changed files with 345 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 98a5818406 - Show all commits

1
src/threads/thread.h
View File

@@ -127,6 +127,7 @@ struct thread
struct process_result *result; /* Result of the process. */ struct process_result *result; /* Result of the process. */
struct list child_results; /* List of children's of this thread struct list child_results; /* List of children's of this thread
process results. */ process results. */
struct file *exec_file; /* Thread's currently running file */
/* Shared between thread.c and synch.c. */ /* Shared between thread.c and synch.c. */
struct list_elem elem; /* List element. */ struct list_elem elem; /* List element. */

5
src/userprog/process.c
View File

@@ -181,6 +181,10 @@ start_process (void *file_name_)
if (!success) if (!success)
thread_exit (); thread_exit ();
struct file *exec_file = filesys_open (file_name);
thread_current ()->exec_file = exec_file;
file_deny_write (exec_file);
/* Start the user process by simulating a return from an /* Start the user process by simulating a return from an
interrupt, implemented by intr_exit (in interrupt, implemented by intr_exit (in
threads/intr-stubs.S). Because intr_exit takes all of its threads/intr-stubs.S). Because intr_exit takes all of its
@@ -246,6 +250,7 @@ process_exit (void)
uint32_t *pd; uint32_t *pd;
printf ("%s: exit(%d)\n", cur->name, cur->exit_status); printf ("%s: exit(%d)\n", cur->name, cur->exit_status);
file_close (cur->exec_file);
/* Update process result. */ /* Update process result. */
if (cur->result != NULL) if (cur->result != NULL)