projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comments.
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index 9347ad42b9ecffd5b9d155691478191b738ab831..cf7a896222a5e2370b8f03827fda4fbaf9c8d4c1 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-49,8
+49,8
@@
static bool format_filesys;
static char *initial_program;
#endif
static char *initial_program;
#endif
-/* -q: Power off after
running requested actions
? */
-
static bool do_power_off
;
+/* -q: Power off after
kernel tasks complete
? */
+
bool power_off_when_done
;
static void ram_init (void);
static void paging_init (void);
static void ram_init (void);
static void paging_init (void);
@@
-74,7
+74,7
@@
main (void)
console_init ();
/* Greet user. */
console_init ();
/* Greet user. */
- printf ("Pintos booting with %'z
d
kB RAM...\n", ram_pages * PGSIZE / 1024);
+ printf ("Pintos booting with %'z
u
kB RAM...\n", ram_pages * PGSIZE / 1024);
/* Parse command line. */
argv_init ();
/* Parse command line. */
argv_init ();
@@
-105,6
+105,7
@@
main (void)
/* Start thread scheduler and enable interrupts. */
thread_start ();
serial_init_queue ();
/* Start thread scheduler and enable interrupts. */
thread_start ();
serial_init_queue ();
+ timer_calibrate ();
#ifdef FILESYS
/* Initialize filesystem. */
#ifdef FILESYS
/* Initialize filesystem. */
@@
-133,7
+134,7
@@
main (void)
#endif
/* Finish up. */
#endif
/* Finish up. */
- if (
do_power_off
)
+ if (
power_off_when_done
)
power_off ();
else
thread_exit ();
power_off ();
else
thread_exit ();
@@
-189,6
+190,10
@@
paging_init (void)
pt[pte_idx] = pte_create_kernel (vaddr, true);
}
pt[pte_idx] = pte_create_kernel (vaddr, true);
}
+ /* 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-v3] 3.7.5. */
asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir)));
}
asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir)));
}
@@
-225,7
+230,7
@@
argv_init (void)
else if (!strcmp (argv[i], "-d"))
debug_enable (argv[++i]);
else if (!strcmp (argv[i], "-q"))
else if (!strcmp (argv[i], "-d"))
debug_enable (argv[++i]);
else if (!strcmp (argv[i], "-q"))
-
do_power_off
= true;
+
power_off_when_done
= true;
#ifdef USERPROG
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];
#ifdef USERPROG
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];