#include "devices/kbd.h"
#include "devices/input.h"
#include "devices/serial.h"
+#include "devices/shutdown.h"
#include "devices/timer.h"
#include "devices/vga.h"
#include "devices/rtc.h"
#endif
/* Amount of physical memory, in 4 kB pages. */
-size_t ram_pages;
+size_t init_ram_pages;
/* Page directory with kernel mappings only. */
-uint32_t *base_page_dir;
+uint32_t *init_page_dir;
#ifdef FILESYS
/* -f: Format the file system? */
static bool format_filesys;
#endif
-/* -q: Power off after kernel tasks complete? */
-bool power_off_when_done;
+/* -ul: Maximum number of pages to put into palloc's user pool. */
+static size_t user_page_limit = SIZE_MAX;
static void ram_init (void);
static void paging_init (void);
static void run_actions (char **argv);
static void usage (void);
-static void print_stats (void);
-
-
int main (void) NO_RETURN;
/* Pintos main program. */
console_init ();
/* Greet user. */
- printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
+ printf ("Pintos booting with %'zu kB RAM...\n",
+ init_ram_pages * PGSIZE / 1024);
/* Initialize memory system. */
- palloc_init ();
+ palloc_init (user_page_limit);
malloc_init ();
paging_init ();
run_actions (argv);
/* Finish up. */
- if (power_off_when_done)
- power_off ();
+ shutdown ();
thread_exit ();
}
\f
memset (&_start_bss, 0, &_end_bss - &_start_bss);
/* Get RAM size from loader. See loader.S. */
- ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
+ init_ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
}
/* Populates the base page directory and page table with the
kernel virtual mapping, and then sets up the CPU to use the
- new page directory. Points base_page_dir to the page
+ new page directory. Points init_page_dir to the page
directory it creates.
At the time this function is called, the active page table
size_t page;
extern char _start, _end_kernel_text;
- pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
+ pd = init_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
pt = NULL;
- for (page = 0; page < ram_pages; page++)
+ for (page = 0; page < init_ram_pages; page++)
{
uintptr_t paddr = page * PGSIZE;
char *vaddr = ptov (paddr);
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 (init_page_dir)));
}
/* Breaks the kernel command line into words and returns them as
if (!strcmp (name, "-h"))
usage ();
else if (!strcmp (name, "-q"))
- power_off_when_done = true;
+ shutdown_configure (SHUTDOWN_POWER_OFF);
+ else if (!strcmp (name, "-r"))
+ shutdown_configure (SHUTDOWN_REBOOT);
#ifdef FILESYS
else if (!strcmp (name, "-f"))
format_filesys = true;
"\nOptions:\n"
" -h Print this help message and power off.\n"
" -q Power off VM after actions or on panic.\n"
+ " -r Reboot after actions.\n"
" -f Format file system disk during startup.\n"
" -rs=SEED Set random number seed to SEED.\n"
" -mlfqs Use multi-level feedback queue scheduler.\n"
" -ul=COUNT Limit user memory to COUNT pages.\n"
#endif
);
- power_off ();
-}
-
-
-/* Powers down the machine we're running on,
- as long as we're running on Bochs or QEMU. */
-void
-power_off (void)
-{
- const char s[] = "Shutdown";
- const char *p;
-
-#ifdef FILESYS
- filesys_done ();
-#endif
-
- print_stats ();
-
- printf ("Powering off...\n");
- serial_flush ();
-
- for (p = s; *p != '\0'; p++)
- outb (0x8900, *p);
- asm volatile ("cli; hlt" : : : "memory");
- printf ("still running...\n");
- for (;;);
-}
-
-/* Print statistics about Pintos execution. */
-static void
-print_stats (void)
-{
- timer_print_stats ();
- thread_print_stats ();
-#ifdef FILESYS
- disk_print_stats ();
-#endif
- console_print_stats ();
- kbd_print_stats ();
-#ifdef USERPROG
- exception_print_stats ();
-#endif
+ shutdown_power_off ();
}