Make userspace actually work.

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

diff --git a/src/threads/init.c b/src/threads/init.c
index da1a98c69da9bcd70374255b98bf591d106b1051..f2476124da7d2a0a7a597d312da5715cb1985943 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -32,7 +32,7 @@ void power_off (void);
 static void
 main_thread (void *aux UNUSED) 
 {
-  printk ("execute=%d\n", (int) thread_execute ("a.out"));
+  thread_execute ("a.out");
 }
 
 int
@@ -71,7 +71,6 @@ main (void)
 
 #ifdef FILESYS
   filesys_init (false);
-  filesys_self_test ();
 #endif
 
   thread_init ();
@@ -94,13 +93,13 @@ make_seg_desc (uint32_t base,
   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. */
+                 | (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. */
+                 | (granularity << 23)        /* Byte/page granularity. */
                  | (base & 0xff000000));      /* Base 31:24. */
   return e0 | ((uint64_t) e1 << 32);
 }
@@ -120,9 +119,10 @@ make_data_desc (int dpl)
 }
 
 static uint64_t
-make_tss_desc (uint32_t base)
+make_tss_desc (void *vaddr)
 {
-  return make_seg_desc (base, 0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE);
+  return make_seg_desc ((uint32_t) vaddr,
+                        0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE);
 }
 
 uint64_t gdt[SEL_CNT];
@@ -150,7 +150,7 @@ gdt_init (void)
   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 (vtop (tss));
+  gdt[SEL_TSS / sizeof *gdt] = make_tss_desc (tss);
 
   /* Load GDTR, TR. */
   gdtr_operand = make_dtr_operand (sizeof gdt - 1, gdt);