Break GDT, TSS out of init.c, mmu.h.

[pintos-anon] / src / threads / init.c

diff --git a/src/threads/init.c b/src/threads/init.c
index 8d354d43fdda51c5f9fbe2b0177f84b2e526f9f8..b70c16c43bee2046f4b134427dc60e811953b4e5 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -3,6 +3,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include "debug.h"
+#include "gdt.h"
 #include "interrupt.h"
 #include "io.h"
 #include "kbd.h"
@@ -37,7 +38,6 @@ static char *initial_program;
 #endif
 
 static void ram_init (void);
-static void gdt_init (void);
 static void argv_init (void);
 
 static void
@@ -90,81 +90,6 @@ main (void)
   thread_start ();
 }
 
-static uint64_t
-make_seg_desc (uint32_t base,
-               uint32_t limit,
-               enum seg_system system,
-               enum seg_type type,
-               int dpl,
-               enum seg_granularity granularity)
-{
-  uint32_t e0 = ((limit & 0xffff)             /* Limit 15:0. */
-                 | (base << 16));             /* Base 15:0. */
-  uint32_t e1 = (((base >> 16) & 0xff)        /* Base 23:16. */
-                 | (system << 12)             /* 0=system, 1=code/data. */
-                 | (type << 8)                /* Segment type. */
-                 | (dpl << 13)                /* Descriptor privilege. */
-                 | (1 << 15)                  /* Present. */
-                 | (limit & 0xf0000)          /* Limit 16:19. */
-                 | (1 << 22)                  /* 32-bit segment. */
-                 | (granularity << 23)        /* Byte/page granularity. */
-                 | (base & 0xff000000));      /* Base 31:24. */
-  return e0 | ((uint64_t) e1 << 32);
-}
-
-static uint64_t
-make_code_desc (int dpl)
-{
-  return make_seg_desc (0, 0xfffff, SYS_CODE_DATA, TYPE_CODE | TYPE_READABLE,
-                        dpl, GRAN_PAGE);
-}
-
-static uint64_t
-make_data_desc (int dpl)
-{
-  return make_seg_desc (0, 0xfffff, SYS_CODE_DATA, TYPE_WRITABLE,
-                        dpl, GRAN_PAGE);
-}
-
-static uint64_t
-make_tss_desc (void *vaddr)
-{
-  return make_seg_desc ((uint32_t) vaddr,
-                        0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE);
-}
-
-static uint64_t gdt[SEL_CNT];
-
-struct tss *tss;
-
-/* Sets up a proper GDT.  The bootstrap loader's GDT didn't
-   include user-mode selectors or a TSS. */
-static void
-gdt_init (void)
-{
-  uint64_t gdtr_operand;
-
-  /* Our TSS is never used in a call gate or task gate, so only a
-     few fields of it are ever referenced, and those are the only
-     ones we initialize. */
-  tss = palloc_get (PAL_ASSERT | PAL_ZERO);
-  tss->esp0 = (uint32_t) ptov(0x20000);
-  tss->ss0 = SEL_KDSEG;
-  tss->bitmap = 0xdfff;
-
-  /* Initialize GDT. */
-  gdt[SEL_NULL / sizeof *gdt] = 0;
-  gdt[SEL_KCSEG / sizeof *gdt] = make_code_desc (0);
-  gdt[SEL_KDSEG / sizeof *gdt] = make_data_desc (0);
-  gdt[SEL_UCSEG / sizeof *gdt] = make_code_desc (3);
-  gdt[SEL_UDSEG / sizeof *gdt] = make_data_desc (3);
-  gdt[SEL_TSS / sizeof *gdt] = make_tss_desc (tss);
-
-  /* Load GDTR, TR. */
-  gdtr_operand = make_dtr_operand (sizeof gdt - 1, gdt);
-  asm volatile ("lgdt %0" :: "m" (gdtr_operand));
-  asm volatile ("ltr %w0" :: "r" (SEL_TSS));
-}
 
 static void
 ram_init (void)