projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adopt consistent style in asm statements.
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index 8495826da379a3624e061d3a53cc8432aa04764c..016c24d2de46ca88446b1fcfc6ba74650fc9c94e 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-41,11
+41,6
@@
size_t ram_pages;
/* Page directory with kernel mappings only. */
uint32_t *base_page_dir;
/* Page directory with kernel mappings only. */
uint32_t *base_page_dir;
-/* -mlfqs:
- If false (default), use round-robin scheduler.
- If true, use multi-level feedback queue scheduler. */
-bool enable_mlfqs;
-
#ifdef FILESYS
/* -f: Format the file system? */
static bool format_filesys;
#ifdef FILESYS
/* -f: Format the file system? */
static bool format_filesys;
@@
-194,7
+189,7
@@
paging_init (void)
new page tables immediately. See [IA32-v2a] "MOV--Move
to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address
of the Page Directory". */
new page tables immediately. See [IA32-v2a] "MOV--Move
to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address
of the Page Directory". */
- asm volatile ("movl %0, %%cr3" :: "r" (vtop (base_page_dir)));
+ asm volatile ("movl %0, %%cr3" :
: "r" (vtop (base_page_dir)));
}
/* Breaks the kernel command line into words and returns them as
}
/* Breaks the kernel command line into words and returns them as
@@
-254,7
+249,7
@@
parse_options (char **argv)
else if (!strcmp (name, "-rs"))
random_init (atoi (value));
else if (!strcmp (name, "-mlfqs"))
else if (!strcmp (name, "-rs"))
random_init (atoi (value));
else if (!strcmp (name, "-mlfqs"))
-
enable
_mlfqs = true;
+
thread
_mlfqs = true;
#ifdef USERPROG
else if (!strcmp (name, "-ul"))
user_page_limit = atoi (value);
#ifdef USERPROG
else if (!strcmp (name, "-ul"))
user_page_limit = atoi (value);
@@
-387,7
+382,7
@@
power_off (void)
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);
- asm
("cli; hlt
");
+ asm
volatile ("cli; hlt" : : : "memory
");
printf ("still running...\n");
for (;;);
}
printf ("still running...\n");
for (;;);
}