Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Pintos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Project Purple Stallion
Pintos
Commits
cfc3df0c
Commit
cfc3df0c
authored
5 years ago
by
a2-stratford
Browse files
Options
Downloads
Patches
Plain Diff
Fixed merge issues I made for myself
parent
f7df3749
Branches
Branches containing commit
No related tags found
Loading
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.build
+2
-1
2 additions, 1 deletion
Makefile.build
userprog/syscall.c
+3
-1
3 additions, 1 deletion
userprog/syscall.c
userprog/system_calls.h
+8
-6
8 additions, 6 deletions
userprog/system_calls.h
with
13 additions
and
8 deletions
Makefile.build
+
2
−
1
View file @
cfc3df0c
...
...
@@ -63,10 +63,11 @@ userprog_SRC += userprog/syscall.c # System call handler.
userprog_SRC
+=
userprog/gdt.c
# GDT initialization.
userprog_SRC
+=
userprog/tss.c
# TSS management.
userprog_SRC
+=
userprog/syscall_exec.c
userprog_SRC
+=
userprog/syscall_
open
.c
userprog_SRC
+=
userprog/syscall_
exit
.c
userprog_SRC
+=
userprog/syscall_halt.c
userprog_SRC
+=
userprog/syscall_wait.c
userprog_SRC
+=
userprog/syscall_create.c
userprog_SRC
+=
userprog/syscall_open.c
# No virtual memory code yet.
#vm_SRC = vm/file.c # Some file.
...
...
This diff is collapsed.
Click to expand it.
userprog/syscall.c
+
3
−
1
View file @
cfc3df0c
...
...
@@ -58,6 +58,9 @@ syscall_handler (struct intr_frame *f UNUSED)
case
SYSCALL_HALT
:
syscall_halt
(
f
);
break
;
case
SYSCALL_EXIT
:
syscall_exit
(
f
);
break
;
case
SYSCALL_EXEC
:
syscall_exec
(
f
);
break
;
...
...
@@ -74,5 +77,4 @@ syscall_handler (struct intr_frame *f UNUSED)
printf
(
"WARNING: Invalid Syscall (%d)
\n
"
,
syscall_number
);
thread_exit
();
}
// TODO: remove this call to exit as we don't want all syscalls to make the thread exit
}
This diff is collapsed.
Click to expand it.
userprog/system_calls.h
+
8
−
6
View file @
cfc3df0c
...
...
@@ -18,6 +18,14 @@ struct file_map
*/
void
syscall_halt
(
struct
intr_frame
*
f
);
/*
* 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_exit
(
struct
intr_frame
*
status
);
/*
* 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
...
...
@@ -34,19 +42,13 @@ void syscall_exec(struct intr_frame *f);
void
syscall_wait
(
struct
intr_frame
*
f
);
/*
<<<<<<< HEAD
* Creates a new file called file initially initial_size bytes in size.
* Returns true if successful, false otherwise.
*/
void
syscall_create
(
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.
*/
=======
* Opens the file called file. Returns a nonnegative integer handle called a
* "file descriptor" (fd), or -1 if the file could not be opened.
*/
void
syscall_open
(
struct
intr_frame
*
f
);
>>>>>>>
Alex
/
27
-
implement
-
open
-
system
-
call
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment