#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"
/* Page directory with kernel mappings only. */
uint32_t *base_page_dir;
-/* -mlfqs:
- If false (default), use round-robin scheduler.
- If true, use multi-level feedback queue scheduler. */
-bool enable_mlfqs;
-
#ifdef FILESYS
/* -f: Format the file system? */
static bool format_filesys;
/* Clear BSS and get machine's RAM size. */
ram_init ();
- /* Initialize ourselves as a thread so we can use locks. */
- thread_init ();
-
- /* Initialize the console so we can use printf(). */
- vga_init ();
- serial_init_poll ();
- console_init ();
-
- /* Greet user. */
- printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
-
/* Break command line into arguments and parse options. */
argv = read_command_line ();
argv = parse_options (argv);
- /* Set random seed if parse_options() didn't. */
- random_init (0);
+ /* Initialize ourselves as a thread so we can use locks,
+ then enable console locking. */
+ thread_init ();
+ console_init ();
+
+ /* Greet user. */
+ printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
/* Initialize memory system. */
palloc_init ();
intr_init ();
timer_init ();
kbd_init ();
+ input_init ();
#ifdef USERPROG
exception_init ();
syscall_init ();
{
uint32_t *pd, *pt;
size_t page;
+ extern char _start, _end_kernel_text;
pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
pt = NULL;
for (page = 0; page < ram_pages; page++)
{
uintptr_t paddr = page * PGSIZE;
- void *vaddr = ptov (paddr);
+ char *vaddr = ptov (paddr);
size_t pde_idx = pd_no (vaddr);
size_t pte_idx = pt_no (vaddr);
+ bool in_kernel_text = &_start <= vaddr && vaddr < &_end_kernel_text;
if (pd[pde_idx] == 0)
{
pd[pde_idx] = pde_create (pt);
}
- pt[pte_idx] = pte_create_kernel (vaddr, true);
+ pt[pte_idx] = pte_create_kernel (vaddr, !in_kernel_text);
}
/* Store the physical address of the page directory into CR3
new page tables immediately. See [IA32-v2a] "MOV--Move
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)));
}
/* Breaks the kernel command line into words and returns them as
else if (!strcmp (name, "-rs"))
random_init (atoi (value));
else if (!strcmp (name, "-mlfqs"))
- enable_mlfqs = true;
+ thread_mlfqs = true;
#ifdef USERPROG
else if (!strcmp (name, "-ul"))
user_page_limit = atoi (value);
/* 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)
{
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);
+ asm volatile ("cli; hlt" : : : "memory");
+ printf ("still running...\n");
for (;;);
}