greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow xv6 code style. Also fixes indexing for these functions

Browse source
This commit is contained in:
Austin Clements 2010-08-31 16:43:41 -04:00
parent 37ee75f42e
commit 92639b6ba9
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
x86.h
View file

@ -132,7 +132,8 @@ sti(void)
asm volatile("sti"); asm volatile("sti");
} }
static inline void nop_pause(void) static inline void
nop_pause(void)
{ {
asm volatile("pause" : :); asm volatile("pause" : :);
} }
@ -151,31 +152,36 @@ xchg(volatile uint *addr, uint newval)
return result; return result;
} }
static inline void lcr0(uint val) static inline void
lcr0(uint val)
{ {
asm volatile("movl %0,%%cr0" : : "r" (val)); asm volatile("movl %0,%%cr0" : : "r" (val));
} }
static inline uint rcr0(void) static inline uint
rcr0(void)
{ {
uint val; uint val;
asm volatile("movl %%cr0,%0" : "=r" (val)); asm volatile("movl %%cr0,%0" : "=r" (val));
return val; return val;
} }
static inline uint rcr2(void) static inline uint
rcr2(void)
{ {
uint val; uint val;
asm volatile("movl %%cr2,%0" : "=r" (val)); asm volatile("movl %%cr2,%0" : "=r" (val));
return val; return val;
} }
static inline void lcr3(uint val) static inline void
lcr3(uint val)
{ {
asm volatile("movl %0,%%cr3" : : "r" (val)); asm volatile("movl %0,%%cr3" : : "r" (val));
} }
static inline uint rcr3(void) static inline uint
rcr3(void)
{ {
uint val; uint val;
asm volatile("movl %%cr3,%0" : "=r" (val)); asm volatile("movl %%cr3,%0" : "=r" (val));