Move user exception support into userprog.

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

diff --git a/src/threads/loader.h b/src/threads/loader.h
index 6ae2856fc827651c3056baf9d639fba2e6b3f71d..f5d7a9ba794bf2e045789deea123ef37541f122d 100644 (file)
--- a/src/threads/loader.h
+++ b/src/threads/loader.h
@@ -18,8 +18,16 @@
 #define LOADER_PHYS_BASE 0xc0000000     /* 3 GB. */
 
 /* 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. */
+#define LOADER_BIOS_SIG (LOADER_END - 2)        /* 0xaa55 BIOS signature. */
+#define LOADER_CMD_LINE_LEN 0x80                /* Command line length. */
+#define LOADER_CMD_LINE (LOADER_BIOS_SIG - LOADER_CMD_LINE_LEN)
+                                                /* Kernel command line. */
+#define LOADER_RAM_PAGES (LOADER_CMD_LINE - 4)  /* # of pages of RAM. */
+
+/* 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. */
 
 #endif /* loader.h */