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

Avoid masking the struct syscall_arguments using typedef for consistency

Browse Source
This commit is contained in:
sBubshait
2024-11-13 18:06:51 +00:00
parent 287130ca7b
commit b1c5819469
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/userprog/syscall.c
View File

@@ -14,6 +14,7 @@
#include <syscall-nr.h> #include <syscall-nr.h>
#define MAX_SYSCALL_ARGS 3 #define MAX_SYSCALL_ARGS 3
#define EXIT_FAILURE -1
static unsigned fd_counter = MIN_USER_FD; static unsigned fd_counter = MIN_USER_FD;
@@ -51,15 +52,15 @@ static void validate_user_pointer (const void *start, size_t size);
static void validate_user_string (const char *str); static void validate_user_string (const char *str);
/* A struct defining a syscall_function pointer along with its arity. */ /* A struct defining a syscall_function pointer along with its arity. */
typedef struct struct syscall_arguments
{ {
syscall_function function; /* Function pointer. */ syscall_function function; /* Function pointer. */
int arity; /* Number of arguments of the function. */ int arity; /* Number of arguments of the function. */
} syscall_arguments; };
/* A look-up table mapping numbers to system call functions with their number of /* A look-up table mapping numbers to system call functions with their number of
arguments. */ arguments. */
static const syscall_arguments syscall_lookup[] = static const struct syscall_arguments syscall_lookup[] =
{ {
[SYS_HALT] = {(syscall_function) syscall_halt, 0}, [SYS_HALT] = {(syscall_function) syscall_halt, 0},
[SYS_EXIT] = {(syscall_function) syscall_exit, 1}, [SYS_EXIT] = {(syscall_function) syscall_exit, 1},
@@ -79,7 +80,7 @@ static const syscall_arguments syscall_lookup[] =
/* The number of syscall functions (i.e, number of elements) within the /* The number of syscall functions (i.e, number of elements) within the
syscall_lookup table. */ syscall_lookup table. */
static const int LOOKUP_SIZE static const int LOOKUP_SIZE
= sizeof (syscall_lookup) / sizeof (syscall_arguments); = sizeof (syscall_lookup) / sizeof (struct syscall_arguments);
/* Initialises the syscall handling system, as well as a global lock to /* Initialises the syscall handling system, as well as a global lock to
synchronise all file access between processes. */ synchronise all file access between processes. */
@@ -104,7 +105,7 @@ syscall_handler (struct intr_frame *f)
if (syscall_number >= LOOKUP_SIZE) if (syscall_number >= LOOKUP_SIZE)
syscall_exit (EXIT_FAILURE); syscall_exit (EXIT_FAILURE);
syscall_arguments syscall = syscall_lookup[syscall_number]; struct syscall_arguments syscall = syscall_lookup[syscall_number];
/* Next, read and copy the arguments from the stack pointer. */ /* Next, read and copy the arguments from the stack pointer. */
validate_user_pointer (f->esp + sizeof (uintptr_t), validate_user_pointer (f->esp + sizeof (uintptr_t),