projects
/
pintos-anon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
49c19e5
)
Adopt consistent style in asm statements.
author
Ben Pfaff
<blp@cs.stanford.edu>
Sat, 11 Nov 2006 14:29:14 +0000
(14:29 +0000)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sat, 11 Nov 2006 14:29:14 +0000
(14:29 +0000)
src/tests/userprog/sc-bad-arg.c
patch
|
blob
|
history
src/tests/userprog/sc-boundary-2.c
patch
|
blob
|
history
src/tests/userprog/sc-boundary.c
patch
|
blob
|
history
src/tests/vm/pt-grow-pusha.c
patch
|
blob
|
history
src/threads/init.c
patch
|
blob
|
history
src/threads/interrupt.c
patch
|
blob
|
history
src/userprog/gdt.c
patch
|
blob
|
history
diff --git
a/src/tests/userprog/sc-bad-arg.c
b/src/tests/userprog/sc-bad-arg.c
index aee48b0e15ee0ae21c5eb16be0505b97e1f8d7e6..0b512a0e59797e0e7e3ae006d44dea83710d2508 100644
(file)
--- a/
src/tests/userprog/sc-bad-arg.c
+++ b/
src/tests/userprog/sc-bad-arg.c
@@
-12,6
+12,6
@@
void
test_main (void)
{
asm volatile ("movl $0xbffffffc, %%esp; movl %0, (%%esp); int $0x30"
test_main (void)
{
asm volatile ("movl $0xbffffffc, %%esp; movl %0, (%%esp); int $0x30"
- :: "i" (SYS_EXIT));
+ :
: "i" (SYS_EXIT));
fail ("should have called exit(-1)");
}
fail ("should have called exit(-1)");
}
diff --git
a/src/tests/userprog/sc-boundary-2.c
b/src/tests/userprog/sc-boundary-2.c
index 6dce992fea87960d6e851b2e6a29e6145103d87f..8acf0361e3e7a392f3c9a5143632c134ca646109 100644
(file)
--- a/
src/tests/userprog/sc-boundary-2.c
+++ b/
src/tests/userprog/sc-boundary-2.c
@@
-17,6
+17,6
@@
test_main (void)
p[1] = 67;
/* Invoke the system call. */
p[1] = 67;
/* Invoke the system call. */
- asm volatile ("movl %0, %%esp; int $0x30" :: "g" (p));
+ asm volatile ("movl %0, %%esp; int $0x30" :
: "g" (p));
fail ("should have called exit(67)");
}
fail ("should have called exit(67)");
}
diff --git
a/src/tests/userprog/sc-boundary.c
b/src/tests/userprog/sc-boundary.c
index fd147bd40ccd437f605a208140a140cb8f8ce6ba..d889535cf279f9af2d5688fd0ef21a5c1caf0719 100644
(file)
--- a/
src/tests/userprog/sc-boundary.c
+++ b/
src/tests/userprog/sc-boundary.c
@@
-17,6
+17,6
@@
test_main (void)
p[1] = 42;
/* Invoke the system call. */
p[1] = 42;
/* Invoke the system call. */
- asm volatile ("movl %0, %%esp; int $0x30" :: "g" (p));
+ asm volatile ("movl %0, %%esp; int $0x30" :
: "g" (p));
fail ("should have called exit(42)");
}
fail ("should have called exit(42)");
}
diff --git
a/src/tests/vm/pt-grow-pusha.c
b/src/tests/vm/pt-grow-pusha.c
index b6b165fa185e9d29cb469df9517748d95d469821..f9762a512d1c5791bea793ad65f9d930e8f700c7 100644
(file)
--- a/
src/tests/vm/pt-grow-pusha.c
+++ b/
src/tests/vm/pt-grow-pusha.c
@@
-16,5
+16,5
@@
test_main (void)
"andl $0xfffff000, %%esp;" /* Move stack pointer to bottom of page. */
"pushal;" /* Push 32 bytes on stack at once. */
"movl %%eax, %%esp" /* Restore copied stack pointer. */
"andl $0xfffff000, %%esp;" /* Move stack pointer to bottom of page. */
"pushal;" /* Push 32 bytes on stack at once. */
"movl %%eax, %%esp" /* Restore copied stack pointer. */
- :
:: "eax");
/* Tell GCC we destroyed eax. */
+ :
: : "eax");
/* Tell GCC we destroyed eax. */
}
}
diff --git
a/src/threads/init.c
b/src/threads/init.c
index 5961deba3e6f8d82cd0e75abab89321d87cda597..016c24d2de46ca88446b1fcfc6ba74650fc9c94e 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-189,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
diff --git
a/src/threads/interrupt.c
b/src/threads/interrupt.c
index 3e37213876768fcded5b4ad671636671231e3ea4..075962f5081cc09b4295ff87a35b8d9f057148e3 100644
(file)
--- a/
src/threads/interrupt.c
+++ b/
src/threads/interrupt.c
@@
-118,7
+118,7
@@
intr_init (void)
See [IA32-v2a] "LIDT" and [IA32-v3a] 5.10 "Interrupt
Descriptor Table (IDT)". */
idtr_operand = make_idtr_operand (sizeof idt - 1, idt);
See [IA32-v2a] "LIDT" and [IA32-v3a] 5.10 "Interrupt
Descriptor Table (IDT)". */
idtr_operand = make_idtr_operand (sizeof idt - 1, idt);
- asm volatile ("lidt %0" :: "m" (idtr_operand));
+ asm volatile ("lidt %0" :
: "m" (idtr_operand));
/* Initialize intr_names. */
for (i = 0; i < INTR_CNT; i++)
/* Initialize intr_names. */
for (i = 0; i < INTR_CNT; i++)
diff --git
a/src/userprog/gdt.c
b/src/userprog/gdt.c
index bed5d582fc45daf8df0f9212d4ec1674327eda5c..a7423b7ec986cfeae0fe439a6f697e51f5eff92c 100644
(file)
--- a/
src/userprog/gdt.c
+++ b/
src/userprog/gdt.c
@@
-49,8
+49,8
@@
gdt_init (void)
Table Register (GDTR)", 2.4.4 "Task Register (TR)", and
6.2.4 "Task Register". */
gdtr_operand = make_gdtr_operand (sizeof gdt - 1, gdt);
Table Register (GDTR)", 2.4.4 "Task Register (TR)", and
6.2.4 "Task Register". */
gdtr_operand = make_gdtr_operand (sizeof gdt - 1, gdt);
- asm volatile ("lgdt %0" :: "m" (gdtr_operand));
- asm volatile ("ltr %w0" :: "r" (SEL_TSS));
+ asm volatile ("lgdt %0" :
: "m" (gdtr_operand));
+ asm volatile ("ltr %w0" :
: "r" (SEL_TSS));
}
\f
/* System segment or code/data segment? */
}
\f
/* System segment or code/data segment? */