X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=60114bad8dcef89c58f345ceebf72b928541efb9;hb=e4b11e55cce16307ffae87d90c08bacb1a2f3c66;hp=81188e950c6e8825052c18003d3eeea761ae1435;hpb=5c9e01777f46b56b671671ef3d305148f1aa0460;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index 81188e9..60114ba 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -7,6 +7,7 @@ #include "io.h" #include "kbd.h" #include "lib.h" +#include "loader.h" #include "malloc.h" #include "mmu.h" #include "paging.h" @@ -19,79 +20,74 @@ #ifdef FILESYS #include "filesys.h" #include "disk.h" +#include "fsutil.h" #endif -/* Size of kernel static code and data, in 4 kB pages. */ -size_t kernel_pages; - /* Amount of physical memory, in 4 kB pages. */ size_t ram_pages; +#ifdef FILESYS +/* Format the filesystem? */ +static bool format_filesys; +#endif + +#ifdef USERPROG +/* Initial program to run. */ +static char *initial_program; +#endif + +static void ram_init (void); static void gdt_init (void); -void power_off (void); +static void argv_init (void); static void main_thread (void *aux UNUSED) { - struct disk *hda; +#ifdef FILESYS disk_init (); - hda = disk_get (1); - if (hda != NULL) - { - char buf[DISK_SECTOR_SIZE]; - disk_read (hda, 0, buf); - //hex_dump (buf, sizeof buf); - } + filesys_init (format_filesys); + fsutil_run (); +#endif + +#ifdef USERPROG + if (initial_program != NULL) + thread_execute (initial_program); else - printk ("no hda\n"); - thread_execute ("a.out"); + PANIC ("no initial program specified"); +#endif } int main (void) { - extern char _text, _end, __bss_start; - struct thread *t; - - /* Clear out the BSS segment. */ - memset (&__bss_start, 0, &_end - &__bss_start); - - /* Initialize components needed by printk() very early. */ + /* Initialize prerequisites for calling printk(). */ + ram_init (); vga_init (); serial_init (); - printk ("Booting cnachos86...\n"); - - /* Calculate how much RAM the kernel uses, and find out from - the bootloader how much RAM this machine has. */ - kernel_pages = (&_end - &_text + 4095) / 4096; - ram_pages = *(uint32_t *) (0x7e00 - 6); - printk ("ram: detected %'d kB main memory.\n", ram_pages * 4); - - /* Memory from the end of the kernel through the end of memory - is free. Give it to the page allocator. */ - palloc_init ((void *) (KERN_BASE + kernel_pages * PGSIZE), - (void *) (PHYS_BASE + ram_pages * PGSIZE)); + + /* Greet user. */ + printk ("Booting cnachos86 with %'d kB RAM...\n", ram_pages * 4); + + /* Parse command line. */ + argv_init (); + + /* Initialize memory system. */ + palloc_init (); paging_init (); gdt_init (); - malloc_init (); - random_init (); + random_init (0); + + /* Initialize interrupt handlers. */ intr_init (); timer_init (); kbd_init (); -#ifdef FILESYS - filesys_init (false); -#endif - + /* Do everything else in a system thread. */ thread_init (); - - t = thread_create ("main", main_thread, NULL); - thread_start (t); - - printk ("Done!\n"); - return 0; + thread_create ("main", main_thread, NULL); + thread_start (); } static uint64_t @@ -137,7 +133,7 @@ make_tss_desc (void *vaddr) 0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE); } -uint64_t gdt[SEL_CNT]; +static uint64_t gdt[SEL_CNT]; struct tss *tss; @@ -169,15 +165,87 @@ gdt_init (void) asm volatile ("lgdt %0" :: "m" (gdtr_operand)); asm volatile ("ltr %w0" :: "r" (SEL_TSS)); } - -void -power_off (void) + +static void +ram_init (void) { - const char s[] = "Shutdown"; - const char *p; + /* The "BSS" is a segment that should be initialized to zeros. + It isn't actually stored on disk or zeroed by the kernel + loader, so we have to zero it ourselves. + + The start and end of the BSS segment is recorded by the + linker as _start_bss and _end_bss. See kernel.lds. */ + extern char _start_bss, _end_bss; + memset (&_start_bss, 0, &_end_bss - &_start_bss); - printk ("Powering off...\n"); - for (p = s; *p != '\0'; p++) - outb (0x8900, *p); - for (;;); + /* Get RAM size from loader. */ + ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES); +} + +static void +argv_init (void) +{ + char *cmd_line, *pos; + char *argv[LOADER_CMD_LINE_LEN / 2 + 1]; + 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); + while (pos < cmd_line + LOADER_CMD_LINE_LEN) + { + ASSERT (argc < LOADER_CMD_LINE_LEN / 2); + if (*pos == '\0') + break; + argv[argc++] = pos; + pos = strchr (pos, '\0') + 1; + } + argv[argc] = ""; + + /* Parse the words. */ + 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]); +#ifdef USERPROG + else if (!strcmp (argv[i], "-ex")) + initial_program = argv[++i]; +#endif +#ifdef FILESYS + 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], "-p")) + fsutil_print_file = argv[++i]; + else if (!strcmp (argv[i], "-r")) + 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")) + { + printk ( + "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" +#endif +#ifdef FILESYS + " -f Format the filesystem disk (hdb or ide0:1).\n" + " -cp FILENAME:SIZE Copy SIZE bytes from the scratch disk (hdc\n" + " ide1:0) into the filesystem as FILENAME\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 + } + else + PANIC ("unknown option `%s'", argv[i]); }