-#include "init.h"
-#include <stdint.h>
-#include <stddef.h>
+#include "threads/init.h"
+#include <console.h>
+#include <debug.h>
#include <limits.h>
-#include "debug.h"
-#include "gdt.h"
-#include "interrupt.h"
-#include "io.h"
-#include "kbd.h"
-#include "lib.h"
-#include "loader.h"
-#include "malloc.h"
-#include "mmu.h"
-#include "paging.h"
-#include "palloc.h"
-#include "random.h"
-#include "serial.h"
-#include "thread.h"
-#include "timer.h"
-#include "tss.h"
-#include "vga.h"
+#include <random.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "devices/kbd.h"
+#include "devices/serial.h"
+#include "devices/timer.h"
+#include "devices/vga.h"
+#include "threads/interrupt.h"
+#include "threads/io.h"
+#include "threads/loader.h"
+#include "threads/malloc.h"
+#include "threads/mmu.h"
+#include "threads/palloc.h"
+#include "threads/test.h"
+#include "threads/thread.h"
+#ifdef USERPROG
+#include "userprog/process.h"
+#include "userprog/exception.h"
+#include "userprog/gdt.h"
+#include "userprog/syscall.h"
+#include "userprog/tss.h"
+#endif
#ifdef FILESYS
-#include "filesys.h"
-#include "disk.h"
-#include "fsutil.h"
+#include "devices/disk.h"
+#include "filesys/filesys.h"
+#include "filesys/fsutil.h"
#endif
/* Amount of physical memory, in 4 kB pages. */
size_t ram_pages;
+/* Page directory with kernel mappings only. */
+uint32_t *base_page_dir;
+
#ifdef FILESYS
-/* Format the filesystem? */
+/* -f: Format the filesystem? */
static bool format_filesys;
#endif
#ifdef USERPROG
-/* Initial program to run. */
+/* -ex: Initial program to run. */
static char *initial_program;
#endif
+/* -q: Power off after kernel tasks complete? */
+bool power_off_when_done;
+
static void ram_init (void);
+static void paging_init (void);
static void argv_init (void);
+static void print_stats (void);
-static void
-main_thread (void *aux UNUSED)
-{
-#ifdef FILESYS
- disk_init ();
- filesys_init (format_filesys);
- fsutil_run ();
-#endif
-
-#ifdef USERPROG
- if (initial_program != NULL)
- thread_execute (initial_program);
- else
- PANIC ("no initial program specified");
-#endif
-}
+int main (void) NO_RETURN;
int
main (void)
{
- /* Initialize prerequisites for calling printk(). */
+ /* 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 ();
+ serial_init_poll ();
+ console_init ();
/* Greet user. */
- printk ("Booting cnachos86 with %'d kB RAM...\n", ram_pages * 4);
+ printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
/* Parse command line. */
argv_init ();
/* Initialize memory system. */
palloc_init ();
+ malloc_init ();
paging_init ();
+
+ /* Segmentation. */
+#ifdef USERPROG
tss_init ();
gdt_init ();
- malloc_init ();
+#endif
+ /* Set random seed if argv_init() didn't. */
random_init (0);
/* Initialize interrupt handlers. */
intr_init ();
timer_init ();
kbd_init ();
+#ifdef USERPROG
+ exception_init ();
+ syscall_init ();
+#endif
- /* Do everything else in a system thread. */
- thread_init ();
- thread_create ("main", main_thread, NULL);
+ /* Start thread scheduler and enable interrupts. */
thread_start ();
-}
+ serial_init_queue ();
+#ifdef FILESYS
+ /* Initialize filesystem. */
+ disk_init ();
+ filesys_init (format_filesys);
+ fsutil_run ();
+#endif
+
+ printf ("Boot complete.\n");
+
+#ifdef USERPROG
+ /* 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
+ }
+#else
+ /* Run the compiled-in test function. */
+ test ();
+#endif
+ /* Finish up. */
+ if (power_off_when_done)
+ power_off ();
+ else
+ thread_exit ();
+}
+\f
+/* Clear BSS and obtain RAM size from loader. */
static void
ram_init (void)
{
extern char _start_bss, _end_bss;
memset (&_start_bss, 0, &_end_bss - &_start_bss);
- /* Get RAM size from loader. */
+ /* Get RAM size from loader. See loader.S. */
ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES);
}
-\f
+
+/* 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
+ directory it creates.
+
+ At the time this function is called, the active page table
+ (set up by loader.S) only maps the first 4 MB of RAM, so we
+ should not try to use extravagant amounts of memory.
+ Fortunately, there is no need to do so. */
+static void
+paging_init (void)
+{
+ uint32_t *pd, *pt;
+ size_t page;
+
+ 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);
+ size_t pde_idx = pd_no (vaddr);
+ size_t pte_idx = pt_no (vaddr);
+
+ if (pd[pde_idx] == 0)
+ {
+ pt = palloc_get_page (PAL_ASSERT | PAL_ZERO);
+ pd[pde_idx] = pde_create (pt);
+ }
+
+ pt[pte_idx] = pte_create_kernel (vaddr, true);
+ }
+
+ asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir)));
+}
+
+/* Parses the command line. */
static void
argv_init (void)
{
char *cmd_line, *pos;
- char *argv[LOADER_CMD_LINE_LEN / 2 + 1];
+ char *argv[LOADER_CMD_LINE_LEN / 2 + 2];
int argc = 0;
int i;
/* The command line is made up of null terminated strings
followed by an empty string. Break it up into words. */
cmd_line = pos = ptov (LOADER_CMD_LINE);
+ printf ("Kernel command line:");
while (pos < cmd_line + LOADER_CMD_LINE_LEN)
{
ASSERT (argc < LOADER_CMD_LINE_LEN / 2);
if (*pos == '\0')
break;
argv[argc++] = pos;
+ printf (" %s", pos);
pos = strchr (pos, '\0') + 1;
}
+ printf ("\n");
argv[argc] = "";
+ argv[argc + 1] = "";
/* Parse the words. */
for (i = 0; i < argc; i++)
random_init (atoi (argv[++i]));
else if (!strcmp (argv[i], "-d"))
debug_enable (argv[++i]);
+ else if (!strcmp (argv[i], "-q"))
+ 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], "-cp"))
- fsutil_copy_arg = argv[++i];
+ else if (!strcmp (argv[i], "-ci"))
+ {
+ fsutil_copyin_file = argv[++i];
+ fsutil_copyin_size = atoi (argv[++i]);
+ }
+ else if (!strcmp (argv[i], "-co"))
+ fsutil_copyout_file = argv[++i];
else if (!strcmp (argv[i], "-p"))
fsutil_print_file = argv[++i];
else if (!strcmp (argv[i], "-r"))
#endif
else if (!strcmp (argv[i], "-u"))
{
- printk (
+ printf (
"Kernel options:\n"
" -rs SEED Seed random seed to SEED.\n"
" -d CLASS[,...] Enable the given classes of debug messages.\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"
- " -cp FILENAME:SIZE Copy SIZE bytes from the scratch disk (hdc\n"
+ " -ci FILENAME SIZE Copy SIZE bytes from the scratch disk (hdc\n"
" or hd1:0) into the filesystem as FILENAME\n"
+ " -co FILENAME Copy FILENAME to the scratch disk, with\n"
+ " size at start of sector 0 and data afterward\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");
+ " -D Dump complete filesystem contents\n"
#endif
+ " -q Power off after doing requested actions.\n"
+ " -u Print this help message and power off.\n"
+ );
+ power_off ();
}
else
- PANIC ("unknown option `%s'", argv[i]);
+ PANIC ("unknown option `%s' (use -u for help)", argv[i]);
+}
+
+/* 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);
+ 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
}
projects / pintos-anon / blobdiff