X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=54a98d256236eb54fa2ba1a515949285b10d8085;hb=8ed1dcfb47df08fa29070c8543453926cecdcd34;hp=453543f5ddde839e57f1904d0afd5907a9692374;hpb=750d21936d284127e265d050ccbce76fca1ece1a;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index 453543f..54a98d2 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -1,3 +1,4 @@ +#include "init.h" #include #include #include @@ -8,12 +9,17 @@ #include "lib.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 "vga.h" +#ifdef FILESYS +#include "filesys.h" +#include "disk.h" +#endif /* Size of kernel static code and data, in 4 kB pages. */ size_t kernel_pages; @@ -21,34 +27,21 @@ size_t kernel_pages; /* Amount of physical memory, in 4 kB pages. */ size_t ram_pages; -static void init_page_table (void); -static void setup_gdt (void); +static void gdt_init (void); void power_off (void); -struct thread *a, *b; - static void -tfunc (void *aux UNUSED) +main_thread (void *aux UNUSED) { - for (;;) - { - size_t count, i; - if (random_ulong () % 5 == 0) - { - printk ("%s exiting\n", thread_current ()->name); - break; - } - count = random_ulong () % 25 * 1000000; - printk ("%s waiting %zu: ", thread_current ()->name, count); - for (i = 0; i < count; i++); - printk ("%s\n", thread_current ()->name); - } + disk_init (); + thread_execute ("a.out"); } int main (void) { extern char _text, _end, __bss_start; + struct thread *t; /* Clear out the BSS segment. */ memset (&__bss_start, 0, &_end - &__bss_start); @@ -59,18 +52,17 @@ main (void) /* 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 - 8); + ram_pages = *(uint32_t *) (0x7e00 - 6); printk ("Initializing nachos-x86, %d kB RAM detected.\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 * NBPG), - (void *) (PHYS_BASE + ram_pages * NBPG)); - - init_page_table (); - setup_gdt (); + palloc_init ((void *) (KERN_BASE + kernel_pages * PGSIZE), + (void *) (PHYS_BASE + ram_pages * PGSIZE)); + paging_init (); + gdt_init (); malloc_init (); random_init (); @@ -78,63 +70,20 @@ main (void) intr_init (); timer_init (); kbd_init (); - intr_enable (); - thread_init (); - -#if 0 - printk ("running semaphore test... "); - sema_self_test (); - printk (" done.\n"); +#ifdef FILESYS + filesys_init (false); #endif - { - struct thread *t; - int i; - - for (i = 0; i < 4; i++) - { - char name[2]; - name[0] = 'a' + i; - name[1] = 0; - t = thread_create (name, tfunc, NULL); - } - thread_start (t); - } + thread_init (); + + t = thread_create ("main", main_thread, NULL); + thread_start (t); printk ("Done!\n"); return 0; } -/* Populates the page directory and page table with the kernel - virtual mapping. */ -static void -init_page_table (void) -{ - uint32_t *pd, *pt; - uint32_t paddr; - - pd = palloc_get (PAL_ASSERT | PAL_ZERO); - pt = NULL; - for (paddr = 0; paddr < NBPG * ram_pages; paddr += NBPG) - { - uint32_t vaddr = paddr + PHYS_BASE; - size_t pde_idx = PDENO(vaddr); - size_t pte_idx = PTENO(vaddr); - - if (pd[pde_idx] == 0) - { - pt = palloc_get (PAL_ASSERT | PAL_ZERO); - pd[pde_idx] = (uint32_t) vtop (pt) | PG_U | PG_W | PG_P; - } - - pt[pte_idx] = paddr | PG_U | PG_W | PG_P; - } - - /* Set the page table. */ - asm volatile ("movl %0,%%cr3" :: "r" (vtop (pd))); -} - static uint64_t make_seg_desc (uint32_t base, uint32_t limit, @@ -146,13 +95,13 @@ make_seg_desc (uint32_t base, 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. */ + | (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. */ + | (granularity << 23) /* Byte/page granularity. */ | (base & 0xff000000)); /* Base 31:24. */ return e0 | ((uint64_t) e1 << 32); } @@ -172,9 +121,10 @@ make_data_desc (int dpl) } static uint64_t -make_tss_desc (uint32_t base) +make_tss_desc (void *vaddr) { - return make_seg_desc (base, 0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE); + return make_seg_desc ((uint32_t) vaddr, + 0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE); } uint64_t gdt[SEL_CNT]; @@ -184,7 +134,7 @@ struct tss *tss; /* Sets up a proper GDT. The bootstrap loader's GDT didn't include user-mode selectors or a TSS. */ static void -setup_gdt (void) +gdt_init (void) { uint64_t gdtr_operand; @@ -192,7 +142,7 @@ setup_gdt (void) 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(0xc0020000); + tss->esp0 = (uint32_t) ptov(0x20000); tss->ss0 = SEL_KDSEG; tss->bitmap = 0xdfff; @@ -202,7 +152,7 @@ setup_gdt (void) 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 (vtop (tss)); + gdt[SEL_TSS / sizeof *gdt] = make_tss_desc (tss); /* Load GDTR, TR. */ gdtr_operand = make_dtr_operand (sizeof gdt - 1, gdt);