projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Capitalize QEMU properly.
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index c6917e224b393b5299dddabd40d1541fbeeef33c..458f67cb2bbd7a7424950d8a219c9f08747c30f8 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-9,6
+9,7
@@
#include <stdlib.h>
#include <string.h>
#include "devices/kbd.h"
#include <stdlib.h>
#include <string.h>
#include "devices/kbd.h"
+#include "devices/input.h"
#include "devices/serial.h"
#include "devices/timer.h"
#include "devices/vga.h"
#include "devices/serial.h"
#include "devices/timer.h"
#include "devices/vga.h"
@@
-16,8
+17,8
@@
#include "threads/io.h"
#include "threads/loader.h"
#include "threads/malloc.h"
#include "threads/io.h"
#include "threads/loader.h"
#include "threads/malloc.h"
-#include "threads/mmu.h"
#include "threads/palloc.h"
#include "threads/palloc.h"
+#include "threads/pte.h"
#include "threads/thread.h"
#ifdef USERPROG
#include "userprog/process.h"
#include "threads/thread.h"
#ifdef USERPROG
#include "userprog/process.h"
@@
-46,7
+47,7
@@
uint32_t *base_page_dir;
bool enable_mlfqs;
#ifdef FILESYS
bool enable_mlfqs;
#ifdef FILESYS
-/* -f: Format the filesystem? */
+/* -f: Format the file
system? */
static bool format_filesys;
#endif
static bool format_filesys;
#endif
@@
-90,6
+91,9
@@
main (void)
argv = read_command_line ();
argv = parse_options (argv);
argv = read_command_line ();
argv = parse_options (argv);
+ /* Set random seed if parse_options() didn't. */
+ random_init (0);
+
/* Initialize memory system. */
palloc_init ();
malloc_init ();
/* Initialize memory system. */
palloc_init ();
malloc_init ();
@@
-101,13
+105,11
@@
main (void)
gdt_init ();
#endif
gdt_init ();
#endif
- /* Set random seed if parse_options() didn't. */
- random_init (0);
-
/* Initialize interrupt handlers. */
intr_init ();
timer_init ();
kbd_init ();
/* Initialize interrupt handlers. */
intr_init ();
timer_init ();
kbd_init ();
+ input_init ();
#ifdef USERPROG
exception_init ();
syscall_init ();
#ifdef USERPROG
exception_init ();
syscall_init ();
@@
-119,7
+121,7
@@
main (void)
timer_calibrate ();
#ifdef FILESYS
timer_calibrate ();
#ifdef FILESYS
- /* Initialize filesystem. */
+ /* Initialize file
system. */
disk_init ();
filesys_init (format_filesys);
#endif
disk_init ();
filesys_init (format_filesys);
#endif
@@
-188,7
+190,8
@@
paging_init (void)
/* Store the physical address of the page directory into CR3
aka PDBR (page directory base register). This activates our
new page tables immediately. See [IA32-v2a] "MOV--Move
/* Store the physical address of the page directory into CR3
aka PDBR (page directory base register). This activates our
new page tables immediately. See [IA32-v2a] "MOV--Move
- to/from Control Registers" and [IA32-v3] 3.7.5. */
+ to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address
+ of the Page Directory". */
asm volatile ("movl %0, %%cr3" :: "r" (vtop (base_page_dir)));
}
asm volatile ("movl %0, %%cr3" :: "r" (vtop (base_page_dir)));
}
@@
-218,7
+221,10
@@
read_command_line (void)
/* Print kernel command line. */
printf ("Kernel command line:");
for (i = 0; i < argc; i++)
/* Print kernel command line. */
printf ("Kernel command line:");
for (i = 0; i < argc; i++)
- printf (" %s", argv[i]);
+ if (strchr (argv[i], ' ') == NULL)
+ printf (" %s", argv[i]);
+ else
+ printf (" '%s'", argv[i]);
printf ("\n");
return argv;
printf ("\n");
return argv;
@@
-361,7
+367,7
@@
usage (void)
/* Powers down the machine we're running on,
/* Powers down the machine we're running on,
- as long as we're running on Bochs or
qemu
. */
+ as long as we're running on Bochs or
QEMU
. */
void
power_off (void)
{
void
power_off (void)
{
@@
-379,6
+385,8
@@
power_off (void)
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);
+ asm ("cli; hlt");
+ printf ("still running...\n");
for (;;);
}
for (;;);
}