Implement a proper block layer with partition support.

[pintos-anon] / src / threads / loader.h

diff --git a/src/threads/loader.h b/src/threads/loader.h
index 6ae2856fc827651c3056baf9d639fba2e6b3f71d..1bfe111185d0f777f5cadf83824d5abe03b64b00 100644 (file)
--- a/src/threads/loader.h
+++ b/src/threads/loader.h
@@ -1,25 +1,40 @@
-#ifndef HEADER_LOADER_H
-#define HEADER_LOADER_H
+#ifndef THREADS_LOADER_H
+#define THREADS_LOADER_H
 
 /* Constants fixed by the PC BIOS. */
 #define LOADER_BASE 0x7c00      /* Physical address of loader's base. */
 #define LOADER_END  0x7e00      /* Physical address of end of loader. */
 
 /* Physical address of kernel base. */
-#define LOADER_KERN_BASE 0x100000       /* 1 MB. */
+#define LOADER_KERN_BASE 0x20000       /* 128 kB. */
 
 /* Kernel virtual address at which all physical memory is mapped.
+   Must be aligned on a 4 MB boundary. */
+#define LOADER_PHYS_BASE 0xc0000000     /* 3 GB. */
 
-   The loader maps the 4 MB at the bottom of physical memory to
-   this virtual base address.  Later, paging_init() adds the rest
-   of physical memory to the mapping.
+/* Important loader physical addresses. */
+#define LOADER_SIG (LOADER_END - LOADER_SIG_LEN)   /* 0xaa55 BIOS signature. */
+#define LOADER_PARTS (LOADER_SIG - LOADER_PARTS_LEN)     /* Partition table. */
+#define LOADER_ARGS (LOADER_PARTS - LOADER_ARGS_LEN)   /* Command-line args. */
+#define LOADER_ARG_CNT (LOADER_ARGS - LOADER_ARG_CNT_LEN) /* Number of args. */
 
-   This must be aligned on a 4 MB boundary. */
-#define LOADER_PHYS_BASE 0xc0000000     /* 3 GB. */
+/* Sizes of loader data structures. */
+#define LOADER_SIG_LEN 2
+#define LOADER_PARTS_LEN 64
+#define LOADER_ARGS_LEN 128
+#define LOADER_ARG_CNT_LEN 4
+
+/* GDT selectors defined by loader.
+   More selectors are defined by userprog/gdt.h. */
+#define SEL_NULL        0x00    /* Null selector. */
+#define SEL_KCSEG       0x08    /* Kernel code selector. */
+#define SEL_KDSEG       0x10    /* Kernel data selector. */
+
+#ifndef __ASSEMBLER__
+#include <stdint.h>
 
-/* Offsets within the loader. */
-#define LOADER_BIOS_SIG (LOADER_END - 2)         /* 0xaa55 BIOS signature. */
-#define LOADER_CMD_LINE (LOADER_BIOS_SIG - 0x80) /* Kernel command line. */
-#define LOADER_RAM_PAGES (LOADER_CMD_LINE - 4)   /* # of pages of RAM. */
+/* Amount of physical memory, in 4 kB pages. */
+extern uint32_t init_ram_pages;
+#endif
 
-#endif /* loader.h */
+#endif /* threads/loader.h */