-#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 "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 "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/paging.h"
+#include "threads/palloc.h"
+#include "threads/test.h"
+#include "threads/thread.h"
#ifdef USERPROG
-#include "exception.h"
-#include "syscall.h"
-#include "gdt.h"
-#include "tss.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. */
static char *initial_program;
#endif
+/* Power off after running requested actions? */
+static bool power_off;
+
static void ram_init (void);
static void argv_init (void);
+static void do_power_off (void);
int main (void) NO_RETURN;
int
main (void)
{
- /* Needed by printk(), so initialize them very early. */
+ /* Initialize everything needed for printf() first. */
ram_init ();
+ thread_init ();
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 %'zd kB RAM...\n", ram_pages * (PGSIZE / 1024));
/* Parse command line. */
argv_init ();
/* Initialize memory system, segments, paging. */
- thread_init ();
palloc_init ();
paging_init ();
#ifdef USERPROG
#endif
malloc_init ();
- /* Set random seed if not already done. */
+ /* Set random seed if argv_init() didn't. */
random_init (0);
/* Initialize interrupt handlers. */
/* Start thread scheduler and enable interrupts. */
thread_start ();
+ serial_init_queue ();
#ifdef FILESYS
/* Initialize filesystem. */
fsutil_run ();
#endif
- printk ("Boot complete.\n");
-
+ printf ("Boot complete.\n");
+
#ifdef USERPROG
/* Run a user program. */
if (initial_program != NULL)
{
- printk ("\nExecuting '%s':\n", initial_program);
+ printf ("\nExecuting '%s':\n", initial_program);
thread_execute (initial_program);
}
+#else
+ test ();
#endif
+ if (power_off)
+ do_power_off ();
+
/* Terminate this thread. */
thread_exit ();
}
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;
pos = strchr (pos, '\0') + 1;
}
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 = true;
#ifdef USERPROG
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];
#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], "-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"
#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"
#endif
+ " -q Power off after doing requested actions.\n"
);
}
else
PANIC ("unknown option `%s'", argv[i]);
}
+
+void
+do_power_off (void)
+{
+ const char s[] = "Shutdown";
+ const char *p;
+
+#ifdef FILESYS
+ filesys_done ();
+#endif
+
+ printf ("Powering off...\n");
+ for (p = s; *p != '\0'; p++)
+ outb (0x8900, *p);
+ for (;;);
+}