summaryrefslogtreecommitdiff
path: root/com32/include/sys
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:22 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:22 -0700
commit120be173de41bad64ec273fb576688557712eb9b (patch)
tree6a48f2741bc38679ed5eed004573e60914fe0882 /com32/include/sys
parent34aa50821e3e4bc84443209387eb91475bdd9817 (diff)
downloadsyslinux-120be173de41bad64ec273fb576688557712eb9b.tar.gz
Run Nindent on com32/include/sys/cpu.h
Automatically reformat com32/include/sys/cpu.h using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/include/sys')
-rw-r--r--com32/include/sys/cpu.h95
1 files changed, 46 insertions, 49 deletions
diff --git a/com32/include/sys/cpu.h b/com32/include/sys/cpu.h
index fcae2da1..dfba02e7 100644
--- a/com32/include/sys/cpu.h
+++ b/com32/include/sys/cpu.h
@@ -7,108 +7,105 @@
static inline uint64_t rdtsc(void)
{
- uint64_t v;
- asm volatile("rdtsc" : "=A" (v));
- return v;
+ uint64_t v;
+ asm volatile ("rdtsc":"=A" (v));
+ return v;
}
static inline uint32_t rdtscl(void)
{
- uint32_t v;
- asm volatile("rdtsc" : "=a" (v) : : "edx");
- return v;
+ uint32_t v;
+ asm volatile ("rdtsc":"=a" (v)::"edx");
+ return v;
}
static inline void cpuid_count(uint32_t op, uint32_t cnt,
- uint32_t *eax, uint32_t *ebx,
- uint32_t *ecx, uint32_t *edx)
+ uint32_t * eax, uint32_t * ebx,
+ uint32_t * ecx, uint32_t * edx)
{
- asm("cpuid"
- : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
- : "a" (op), "c" (cnt));
+asm("cpuid":"=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx)
+: "a"(op), "c"(cnt));
}
-static inline void cpuid(uint32_t op, uint32_t *eax, uint32_t *ebx,
- uint32_t *ecx, uint32_t *edx)
+
+static inline void cpuid(uint32_t op, uint32_t * eax, uint32_t * ebx,
+ uint32_t * ecx, uint32_t * edx)
{
- cpuid_count(op, 0, eax, ebx, ecx, edx);
+ cpuid_count(op, 0, eax, ebx, ecx, edx);
}
+
static inline __constfunc uint32_t cpuid_eax(uint32_t level)
{
- uint32_t v;
+ uint32_t v;
- asm("cpuid" : "=a" (v) : "a" (level) : "ebx", "ecx", "edx");
- return v;
+asm("cpuid": "=a"(v): "a"(level):"ebx", "ecx", "edx");
+ return v;
}
+
static inline __constfunc uint32_t cpuid_ebx(uint32_t level)
{
- uint32_t v;
+ uint32_t v;
- asm("cpuid" : "=b" (v), "+a" (level) : : "ecx", "edx");
- return v;
+asm("cpuid": "=b"(v), "+a"(level): :"ecx", "edx");
+ return v;
}
+
static inline __constfunc uint32_t cpuid_ecx(uint32_t level)
{
- uint32_t v;
+ uint32_t v;
- asm("cpuid" : "=c" (v), "+a" (level) : : "ebx", "edx");
- return v;
+asm("cpuid": "=c"(v), "+a"(level): :"ebx", "edx");
+ return v;
}
+
static inline __constfunc uint32_t cpuid_edx(uint32_t level)
{
- uint32_t v;
+ uint32_t v;
- asm("cpuid" : "=d" (v), "+a" (level) : : "ebx", "ecx");
- return v;
+asm("cpuid": "=d"(v), "+a"(level): :"ebx", "ecx");
+ return v;
}
/* Standard macro to see if a specific flag is changeable */
static inline __constfunc bool cpu_has_eflag(uint32_t flag)
{
- uint32_t f1, f2;
-
- asm("pushfl\n\t"
- "pushfl\n\t"
- "popl %0\n\t"
- "movl %0,%1\n\t"
- "xorl %2,%0\n\t"
- "pushl %0\n\t"
- "popfl\n\t"
- "pushfl\n\t"
- "popl %0\n\t"
- "popfl\n\t"
- : "=&r" (f1), "=&r" (f2)
- : "ir" (flag));
-
- return ((f1^f2) & flag) != 0;
+ uint32_t f1, f2;
+
+asm("pushfl\n\t" "pushfl\n\t" "popl %0\n\t" "movl %0,%1\n\t" "xorl %2,%0\n\t" "pushl %0\n\t" "popfl\n\t" "pushfl\n\t" "popl %0\n\t" "popfl\n\t":"=&r"(f1),
+ "=&r"
+ (f2)
+: "ir"(flag));
+
+ return ((f1 ^ f2) & flag) != 0;
}
static inline uint64_t rdmsr(uint32_t msr)
{
- uint64_t v;
+ uint64_t v;
- asm volatile("rdmsr" : "=A" (v) : "c" (msr));
- return v;
+ asm volatile ("rdmsr":"=A" (v):"c"(msr));
+ return v;
}
+
static inline void wrmsr(uint64_t v, uint32_t msr)
{
- asm volatile("wrmsr" : : "A" (v), "c" (msr));
+ asm volatile ("wrmsr"::"A" (v), "c"(msr));
}
static inline void cpu_relax(void)
{
- asm volatile("rep ; nop");
+ asm volatile ("rep ; nop");
}
/* These are local cli/sti; not SMP-safe!!! */
static inline void cli(void)
{
- asm volatile("cli");
+ asm volatile ("cli");
}
static inline void sti(void)
{
- asm volatile("sti");
+ asm volatile ("sti");
}
#endif