#include "threads/init.h"
#include <console.h>
#include <debug.h>
+#include <inttypes.h>
#include <limits.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/input.h"
+#include "devices/pci.h"
+#include "devices/usb.h"
#include "devices/serial.h"
#include "devices/timer.h"
#include "devices/vga.h"
+#include "devices/rtc.h"
#include "threads/interrupt.h"
#include "threads/io.h"
#include "threads/loader.h"
#include "tests/threads/tests.h"
#endif
#ifdef FILESYS
-#include "devices/disk.h"
+#include "devices/block.h"
+#include "devices/ide.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;
+bool base_page_dir_initialized = 0;
#ifdef FILESYS
/* -f: Format the file system? */
static bool format_filesys;
+
+/* -filesys, -scratch, -swap: Names of block devices to use,
+ overriding the defaults. */
+static const char *filesys_bdev_name;
+static const char *scratch_bdev_name;
+#ifdef VM
+static const char *swap_bdev_name;
+#endif
#endif
/* -q: Power off after kernel tasks complete? */
bool power_off_when_done;
-static void ram_init (void);
+static void bss_init (void);
static void paging_init (void);
+static void pci_zone_init (void);
static char **read_command_line (void);
static char **parse_options (char **argv);
static void run_actions (char **argv);
static void usage (void);
-static void print_stats (void);
+#ifdef FILESYS
+static void locate_block_devices (void);
+static void locate_block_device (enum block_type, const char *name);
+#endif
+static void print_stats (void);
int main (void) NO_RETURN;
main (void)
{
char **argv;
-
- /* Clear BSS and get machine's RAM size. */
- ram_init ();
+
+ /* Clear BSS. */
+ bss_init ();
/* Break command line into arguments and parse options. */
argv = read_command_line ();
console_init ();
/* Greet user. */
- printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
+ printf ("Pintos booting with %'"PRIu32" kB RAM...\n",
+ ram_pages * PGSIZE / 1024);
/* Initialize memory system. */
palloc_init ();
intr_init ();
timer_init ();
kbd_init ();
+ pci_init ();
input_init ();
#ifdef USERPROG
exception_init ();
thread_start ();
serial_init_queue ();
timer_calibrate ();
+ usb_init ();
#ifdef FILESYS
/* Initialize file system. */
- disk_init ();
+ usb_storage_init ();
+ ide_init ();
+ locate_block_devices ();
filesys_init (format_filesys);
#endif
thread_exit ();
}
\f
-/* Clear BSS and obtain RAM size from loader. */
+/* Clear the "BSS", 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. */
static void
-ram_init (void)
+bss_init (void)
{
- /* 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);
-
- /* Get RAM size from loader. See loader.S. */
- ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
}
/* Populates the base page directory and page table with the
kernel virtual mapping, and then sets up the CPU to use the
new page directory. Points base_page_dir to the page
- 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.
- Fortunately, there is no need to do so. */
+ directory it creates. */
static void
paging_init (void)
{
if (pd[pde_idx] == 0)
{
pt = palloc_get_page (PAL_ASSERT | PAL_ZERO);
- pd[pde_idx] = pde_create (pt);
+ pd[pde_idx] = pde_create_kernel (pt);
}
pt[pte_idx] = pte_create_kernel (vaddr, !in_kernel_text);
}
+ pci_zone_init ();
+
/* 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-v3a] 3.7.5 "Base Address
of the Page Directory". */
asm volatile ("movl %0, %%cr3" : : "r" (vtop (base_page_dir)));
+
+ base_page_dir_initialized = 1;
+}
+
+/* initialize PCI zone at PCI_ADDR_ZONE_BEGIN - PCI_ADDR_ZONE_END*/
+static void
+pci_zone_init (void)
+{
+ int i;
+ for (i = 0; i < PCI_ADDR_ZONE_PDES; i++)
+ {
+ size_t pde_idx = pd_no ((void *) PCI_ADDR_ZONE_BEGIN) + i;
+ uint32_t pde;
+ void *pt;
+
+ pt = palloc_get_page (PAL_ASSERT | PAL_ZERO);
+ pde = pde_create_kernel (pt);
+ base_page_dir[pde_idx] = pde;
+ }
}
/* Breaks the kernel command line into words and returns them as
#ifdef FILESYS
else if (!strcmp (name, "-f"))
format_filesys = true;
+ else if (!strcmp (name, "-filesys"))
+ filesys_bdev_name = value;
+ else if (!strcmp (name, "-scratch"))
+ scratch_bdev_name = value;
+#ifdef VM
+ else if (!strcmp (name, "-swap"))
+ swap_bdev_name = value;
+#endif
#endif
else if (!strcmp (name, "-rs"))
random_init (atoi (value));
else
PANIC ("unknown option `%s' (use -h for help)", name);
}
+
+ /* Initialize the random number generator based on the system
+ time. This has no effect if an "-rs" option was specified.
+
+ When running under Bochs, this is not enough by itself to
+ get a good seed value, because the pintos script sets the
+ initial time to a predictable value, not to the local time,
+ for reproducibility. To fix this, give the "-r" option to
+ the pintos script to request real-time execution. */
+ random_init (rtc_get_time ());
return argv;
}
{"ls", 1, fsutil_ls},
{"cat", 2, fsutil_cat},
{"rm", 2, fsutil_rm},
- {"put", 2, fsutil_put},
- {"get", 2, fsutil_get},
+ {"extract", 1, fsutil_extract},
+ {"append", 2, fsutil_append},
#endif
{NULL, 0, NULL},
};
" cat FILE Print FILE to the console.\n"
" rm FILE Delete FILE.\n"
"Use these actions indirectly via `pintos' -g and -p options:\n"
- " put FILE Put FILE into file system from scratch disk.\n"
+ " extract Untar from scratch disk into file system.\n"
" get FILE Get FILE from file system into scratch disk.\n"
#endif
"\nOptions:\n"
" -h Print this help message and power off.\n"
" -q Power off VM after actions or on panic.\n"
+#ifdef FILESYS
" -f Format file system disk during startup.\n"
+ " -filesys=BDEV Use BDEV for file system instead of default.\n"
+ " -scratch=BDEV Use BDEV for scratch instead of default.\n"
+#ifdef VM
+ " -swap=BDEV Use BDEV for swap instead of default.\n"
+#endif
+#endif
" -rs=SEED Set random number seed to SEED.\n"
" -mlfqs Use multi-level feedback queue scheduler.\n"
#ifdef USERPROG
power_off ();
}
+#ifdef FILESYS
+/* Figure out what disks to cast in the various Pintos roles. */
+static void
+locate_block_devices (void)
+{
+ locate_block_device (BLOCK_FILESYS, filesys_bdev_name);
+ locate_block_device (BLOCK_SCRATCH, scratch_bdev_name);
+#ifdef VM
+ locate_block_device (BLOCK_SWAP, swap_bdev_name);
+#endif
+}
+
+/* Figures out what block device to use for the given ROLE: the
+ block device with the given NAME, if NAME is non-null,
+ otherwise the first block device in probe order of type
+ ROLE. */
+static void
+locate_block_device (enum block_type role, const char *name)
+{
+ struct block *block = NULL;
+
+ if (name != NULL)
+ {
+ block = block_get_by_name (name);
+ if (block == NULL)
+ PANIC ("No such block device \"%s\"", name);
+ }
+ else
+ {
+ for (block = block_first (); block != NULL; block = block_next (block))
+ if (block_type (block) == role)
+ break;
+ }
+
+ if (block != NULL)
+ {
+ printf ("%s: using %s\n", block_type_name (role), block_name (block));
+ block_set_role (role, block);
+ }
+}
+#endif
/* Powers down the machine we're running on,
as long as we're running on Bochs or QEMU. */
timer_print_stats ();
thread_print_stats ();
#ifdef FILESYS
- disk_print_stats ();
+ block_print_stats ();
#endif
console_print_stats ();
kbd_print_stats ();
projects / pintos-anon / blobdiff