X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=ae864981341d110464c59985d3ccd94e8acf193a;hb=5fbedf1d20c2b2f2dbc8c7ebd64cc7b4812a44bf;hp=caacaee20e894b6c0afbedb960540e030a946772;hpb=bf866bc97d077fa3757b4aceaa7a6b41e7298c73;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index caacaee..ae86498 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -3,6 +3,7 @@ #include #include #include "debug.h" +#include "gdt.h" #include "interrupt.h" #include "io.h" #include "kbd.h" @@ -16,34 +17,35 @@ #include "serial.h" #include "thread.h" #include "timer.h" +#include "tss.h" #include "vga.h" #ifdef FILESYS #include "filesys.h" #include "disk.h" +#include "fsutil.h" #endif /* Amount of physical memory, in 4 kB pages. */ size_t ram_pages; -static void ram_init (void); -static void gdt_init (void); -static void argv_init (void); -void power_off (void); - -static void -main_thread (void *aux UNUSED) -{ #ifdef FILESYS - disk_init (); - filesys_init (true); - filesys_self_test (); +/* Format the filesystem? */ +static bool format_filesys; #endif -} + +#ifdef USERPROG +/* Initial program to run. */ +static char *initial_program; +#endif + +static thread_func main_thread; +static void ram_init (void); +static void argv_init (void); int main (void) { - /* Initialize prerequisites for calling printk(). */ + /* Needed by printk(), so initialize them very early. */ ram_init (); vga_init (); serial_init (); @@ -51,14 +53,18 @@ main (void) /* Greet user. */ printk ("Booting cnachos86 with %'d kB RAM...\n", ram_pages * 4); - /* Initialize memory system. */ + /* Parse command line. */ + argv_init (); + + /* Initialize memory system, segments, paging. */ palloc_init (); paging_init (); + tss_init (); gdt_init (); malloc_init (); - random_init (); - argv_init (); + /* Set random seed if not already done. */ + random_init (0); /* Initialize interrupt handlers. */ intr_init (); @@ -67,85 +73,29 @@ main (void) /* Do everything else in a system thread. */ thread_init (); - thread_start (thread_create ("main", main_thread, NULL)); + thread_create ("main", main_thread, NULL); + thread_start (); } -static uint64_t -make_seg_desc (uint32_t base, - uint32_t limit, - enum seg_system system, - enum seg_type type, - int dpl, - enum seg_granularity granularity) -{ - uint32_t e0 = ((limit & 0xffff) /* Limit 15:0. */ - | (base << 16)); /* Base 15:0. */ - uint32_t e1 = (((base >> 16) & 0xff) /* Base 23:16. */ - | (system << 12) /* 0=system, 1=code/data. */ - | (type << 8) /* Segment type. */ - | (dpl << 13) /* Descriptor privilege. */ - | (1 << 15) /* Present. */ - | (limit & 0xf0000) /* Limit 16:19. */ - | (1 << 22) /* 32-bit segment. */ - | (granularity << 23) /* Byte/page granularity. */ - | (base & 0xff000000)); /* Base 31:24. */ - return e0 | ((uint64_t) e1 << 32); -} - -static uint64_t -make_code_desc (int dpl) -{ - return make_seg_desc (0, 0xfffff, SYS_CODE_DATA, TYPE_CODE | TYPE_READABLE, - dpl, GRAN_PAGE); -} - -static uint64_t -make_data_desc (int dpl) -{ - return make_seg_desc (0, 0xfffff, SYS_CODE_DATA, TYPE_WRITABLE, - dpl, GRAN_PAGE); -} - -static uint64_t -make_tss_desc (void *vaddr) -{ - return make_seg_desc ((uint32_t) vaddr, - 0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE); -} - -uint64_t gdt[SEL_CNT]; - -struct tss *tss; - -/* Sets up a proper GDT. The bootstrap loader's GDT didn't - include user-mode selectors or a TSS. */ +/* Initial thread. */ static void -gdt_init (void) +main_thread (void *aux UNUSED) { - uint64_t gdtr_operand; - - /* Our TSS is never used in a call gate or task gate, so only a - few fields of it are ever referenced, and those are the only - ones we initialize. */ - tss = palloc_get (PAL_ASSERT | PAL_ZERO); - tss->esp0 = (uint32_t) ptov(0x20000); - tss->ss0 = SEL_KDSEG; - tss->bitmap = 0xdfff; - - /* Initialize GDT. */ - gdt[SEL_NULL / sizeof *gdt] = 0; - gdt[SEL_KCSEG / sizeof *gdt] = make_code_desc (0); - gdt[SEL_KDSEG / sizeof *gdt] = make_data_desc (0); - gdt[SEL_UCSEG / sizeof *gdt] = make_code_desc (3); - gdt[SEL_UDSEG / sizeof *gdt] = make_data_desc (3); - gdt[SEL_TSS / sizeof *gdt] = make_tss_desc (tss); - - /* Load GDTR, TR. */ - gdtr_operand = make_dtr_operand (sizeof gdt - 1, gdt); - asm volatile ("lgdt %0" :: "m" (gdtr_operand)); - asm volatile ("ltr %w0" :: "r" (SEL_TSS)); -} +#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 +} + +/* Clear BSS and obtain RAM size from loader. */ static void ram_init (void) { @@ -158,40 +108,75 @@ 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); } - -/* This should be sufficient because the command line buffer is - only 128 bytes and arguments are space-delimited. */ -#define ARGC_MAX 64 - -int argc; -char *argv[ARGC_MAX + 1]; +/* Parses the command line. */ static void argv_init (void) { - char *cmd_line = ptov (LOADER_CMD_LINE); - char *arg, *pos; - - for (arg = strtok_r (cmd_line, " \t\r\n\v", &pos); arg != NULL; - arg = strtok_r (NULL, " \t\r\n\v", &pos)) + 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 < ARGC_MAX); - argv[argc++] = arg; + ASSERT (argc < LOADER_CMD_LINE_LEN / 2); + if (*pos == '\0') + break; + argv[argc++] = pos; + pos = strchr (pos, '\0') + 1; } - argv[argc] = NULL; -} - -void -power_off (void) -{ - const char s[] = "Shutdown"; - const char *p; - - printk ("Powering off...\n"); - for (p = s; *p != '\0'; p++) - outb (0x8900, *p); - for (;;); + 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 hd0:1).\n" + " -cp FILENAME:SIZE Copy SIZE bytes from the scratch disk (hdc\n" + " or hd1: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]); }