summaryrefslogtreecommitdiff
path: root/x86.h
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 17:27:19 +0000
committerrsc <rsc>2006-09-06 17:27:19 +0000
commit9e9bcaf143bf8507e947f9934371744c3d50a8ea (patch)
treeb63a03929569f34ade9a940ef1416586346b8d30 /x86.h
parent03b6376f56074cd1dcbb1b35639e303c3a8a0181 (diff)
downloadxv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.tar.gz
xv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.tar.bz2
xv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.zip
standardize various * conventions
Diffstat (limited to 'x86.h')
-rw-r--r--x86.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/x86.h b/x86.h
index dda310c..a0d61ab 100644
--- a/x86.h
+++ b/x86.h
@@ -42,7 +42,7 @@ static __inline void
lgdt(struct segdesc *p, int size)
{
volatile ushort pd[3];
-
+
pd[0] = size-1;
pd[1] = (uint)p;
pd[2] = (uint)p >> 16;
@@ -56,11 +56,11 @@ static __inline void
lidt(struct gatedesc *p, int size)
{
volatile ushort pd[3];
-
+
pd[0] = size-1;
pd[1] = (uint)p;
pd[2] = (uint)p >> 16;
-
+
asm volatile("lidt (%0)" : : "g" (pd));
}
@@ -91,13 +91,13 @@ cpuid(uint info, uint *eaxp, uint *ebxp, uint *ecxp, uint *edxp)
asm volatile("cpuid" :
"=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) :
"a" (info));
- if (eaxp)
+ if(eaxp)
*eaxp = eax;
- if (ebxp)
+ if(ebxp)
*ebxp = ebx;
- if (ecxp)
+ if(ecxp)
*ecxp = ecx;
- if (edxp)
+ if(edxp)
*edxp = edx;
}