static char *initial_program;
#endif
-/* -q: Power off after running requested actions? */
-static bool do_power_off;
+/* -q: Power off after kernel tasks complete? */
+bool power_off_when_done;
static void ram_init (void);
static void paging_init (void);
int
main (void)
{
- /* Initialize everything needed for printf() first. */
+ /* 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 %'zd kB RAM...\n", ram_pages * (PGSIZE / 1024));
+ printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
/* Parse command line. */
argv_init ();
- /* Initialize memory system, segments, paging. */
+ /* Initialize memory system. */
palloc_init ();
+ malloc_init ();
paging_init ();
+
+ /* Segmentation. */
#ifdef USERPROG
tss_init ();
gdt_init ();
#endif
- malloc_init ();
/* Set random seed if argv_init() didn't. */
random_init (0);
/* Start thread scheduler and enable interrupts. */
thread_start ();
serial_init_queue ();
+ timer_calibrate ();
#ifdef FILESYS
/* Initialize filesystem. */
/* Run a user program. */
if (initial_program != NULL)
{
- tid_t tid;
printf ("\nExecuting '%s':\n", initial_program);
- tid = process_execute (initial_program);
-#ifdef THREAD_JOIN_IMPLEMENTED
- if (tid != TID_ERROR)
- thread_join (tid);
-#endif
+ process_wait (process_execute (initial_program));
}
#else
+ /* Run the compiled-in test function. */
test ();
#endif
- if (do_power_off)
+ /* Finish up. */
+ if (power_off_when_done)
power_off ();
-
- /* Terminate this thread. */
- thread_exit ();
+ else
+ thread_exit ();
}
\f
/* Clear BSS and obtain RAM size from loader. */
pt[pte_idx] = pte_create_kernel (vaddr, true);
}
- asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir)));
+ /* 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. */
+ asm volatile ("mov %%cr3, %0" :: "r" (vtop (base_page_dir)));
}
/* Parses the command line. */
for (i = 0; i < argc; i++)
if (!strcmp (argv[i], "-rs"))
random_init (atoi (argv[++i]));
- else if (!strcmp (argv[i], "-d"))
- debug_enable (argv[++i]);
else if (!strcmp (argv[i], "-q"))
- do_power_off = true;
+ power_off_when_done = true;
#ifdef USERPROG
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];
+ else if (!strcmp (argv[i], "-ul"))
+ user_page_limit = atoi (argv[++i]);
#endif
#ifdef FILESYS
- else if (!strcmp (argv[i], "-f"))
+ else if (!strcmp (argv[i], "-f"))
format_filesys = true;
else if (!strcmp (argv[i], "-ci"))
{
fsutil_remove_file = argv[++i];
else if (!strcmp (argv[i], "-ls"))
fsutil_list_files = true;
- else if (!strcmp (argv[i], "-D"))
- fsutil_dump_filesys = true;
#endif
else if (!strcmp (argv[i], "-u"))
{
printf (
"Kernel options:\n"
- " -rs SEED Seed random seed to SEED.\n"
- " -d CLASS[,...] Enable the given classes of debug messages.\n"
+ " -rs SEED Set random seed to SEED.\n"
#ifdef USERPROG
" -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n"
+ " -ul USER_MAX Limit user memory to USER_MAX pages.\n"
#endif
#ifdef FILESYS
" -f Format the filesystem disk (hdb or hd0:1).\n"
" -p FILENAME Print the contents of FILENAME\n"
" -r FILENAME Delete FILENAME\n"
" -ls List the files in the filesystem\n"
- " -D Dump complete filesystem contents\n"
#endif
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"