Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Pintos
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

b6f4ad10

Commit b6f4ad10 authored 5 years ago by a2-stratford

Downloads
- Plain Diff

Merge branch 'feature/system-calls' into 'josh/22-read-syscall'

# Conflicts:
#   userprog/syscall.c
#   userprog/system_calls.h

parents cb1f903f 26a45135

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

Makefile.build 1 addition, 0 deletions

Makefile.build
userprog/syscall.c 8 additions, 2 deletions

userprog/syscall.c
userprog/syscall_close.c 3 additions, 5 deletions

userprog/syscall_close.c
userprog/syscall_filesize.c 20 additions, 0 deletions

userprog/syscall_filesize.c
userprog/syscall_open.c 1 addition, 1 deletion

userprog/syscall_open.c
userprog/syscall_remove.c 25 additions, 0 deletions

userprog/syscall_remove.c
userprog/system_calls.h 10 additions, 2 deletions

userprog/system_calls.h

with 68 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment