#endif
#ifdef FILESYS
#include "devices/disk.h"
+#include "devices/partition.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
-/* -f: Format the filesystem? */
+/* -f: Format the file system? */
static bool format_filesys;
#endif
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);
static void argv_init (void);
+static void print_stats (void);
int main (void) NO_RETURN;
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 ();
paging_init ();
+ malloc_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. */
+ /* Initialize file system. */
disk_init ();
+ partition_init ();
filesys_init (format_filesys);
fsutil_run ();
#endif
/* Run a user program. */
if (initial_program != NULL)
{
+ tid_t tid;
printf ("\nExecuting '%s':\n", initial_program);
- process_execute (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
- 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. */
linker as _start_bss and _end_bss. See kernel.lds. */
extern char _start_bss, _end_bss;
memset (&_start_bss, 0, &_end_bss - &_start_bss);
-
- /* Get RAM size from loader. See loader.S. */
- ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES);
}
/* Populates the base page directory and page table with the
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.
+ (set up by start.S) only maps the first 4 MB of RAM, so we
+ should not try to access memory beyond that limit.
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 (PAL_ASSERT | PAL_ZERO);
+ pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
pt = NULL;
for (page = 0; page < ram_pages; page++)
{
if (pd[pde_idx] == 0)
{
- pt = palloc_get (PAL_ASSERT | PAL_ZERO);
+ 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)));
+ /* 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. */
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"))
+ max_user_pages = 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"))
{
" -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"
+ " -f Format the file system disk (hdb or hd0:1).\n"
" -ci FILENAME SIZE Copy SIZE bytes from the scratch disk (hdc\n"
- " or hd1:0) into the filesystem as FILENAME\n"
+ " or hd1:0) into the file system 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"
+ " -ls List the files in the file system\n"
+ " -D Dump complete file system contents\n"
#endif
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"
filesys_done ();
#endif
+ print_stats ();
+
printf ("Powering off...\n");
serial_flush ();
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
+}