Skip to content

Correct filename in comment #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jgfoster wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Correct filename in comment #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7781672
Correct filename in comment.
Apr 9, 2020
dde9f04
Remove comments that seem wrong or no longer apply.
Apr 26, 2020
f31fc1d
Update name of default application.
May 4, 2020
b290590
Identify some issues with running an alternate process.
May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ and CPU resets to the standard error. This setting will also cause QEMU to
quit after encountering a [triple fault][] (normally it will reboot).

`make run-PROGRAM` runs `p-PROGRAM.cc` as the first non-init process. The
default is `alloc`.
default is `allocator`. If you choose an alternate first process, note a
couple things:

* An initial process like p-testkalloc.cc calls panic(), but without a console this gives a [page fault](https://github.com/CS161/chickadee/issues/14).
* build/chickadee.gdb is hard-coded to load symbols for p-allocator.cc, so this file must be [modified](https://github.com/CS161/chickadee/issues/13) if you want to debug an alternate process.

`make HALT=1 run-PROGRAM` should make QEMU exit once all processes are done.

Expand Down
2 changes: 1 addition & 1 deletion boot.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// the boot device (hard drive) into memory at address 0x7C00, and jumps to
// that address.
//
// The boot loader is contained in bootstart.S and boot.c. Control starts
// The boot loader is contained in bootstart.S and boot.cc. Control starts
// in bootstart.S, which initializes the CPU and sets up a stack, then
// transfers here. This code reads in the kernel image and calls the
// kernel.
Expand Down
2 changes: 0 additions & 2 deletions lib.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,13 @@ struct bitset_view {

// System call numbers (passed in `%rax` at `syscall` time)

// Used in pset 1:
#define SYSCALL_GETPID 1
#define SYSCALL_YIELD 2
#define SYSCALL_PAUSE 3
#define SYSCALL_KDISPLAY 4
#define SYSCALL_PANIC 5
#define SYSCALL_PAGE_ALLOC 6
#define SYSCALL_FORK 7
// Used in later psets:
#define SYSCALL_EXIT 8
#define SYSCALL_READ 9
#define SYSCALL_WRITE 10
Expand Down