diff options
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 10 | ||||
| -rw-r--r-- | sys/i386/include/cpufunc.h | 24 |
2 files changed, 9 insertions, 25 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 9a4c82275a99..e52c55dc80f0 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -100,19 +100,17 @@ disable_intr(void) } static __inline void -do_cpuid(u_int ax, u_int *p) +cpuid_count(u_int ax, u_int cx, u_int *p) { __asm __volatile("cpuid" : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); + : "0" (ax), "c" (cx)); } static __inline void -cpuid_count(u_int ax, u_int cx, u_int *p) +do_cpuid(u_int ax, u_int *p) { - __asm __volatile("cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax), "c" (cx)); + cpuid_count(ax, 0, p); } static __inline void diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index b200588b0739..5ee516656d72 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -92,14 +92,6 @@ disable_intr(void) #ifdef _KERNEL static __inline void -do_cpuid(u_int ax, u_int *p) -{ - __asm __volatile("cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -} - -static __inline void cpuid_count(u_int ax, u_int cx, u_int *p) { __asm __volatile("cpuid" @@ -108,7 +100,7 @@ cpuid_count(u_int ax, u_int cx, u_int *p) } #else static __inline void -do_cpuid(u_int ax, u_int *p) +cpuid_count(u_int ax, u_int cx, u_int *p) { __asm __volatile( "pushl\t%%ebx\n\t" @@ -116,21 +108,15 @@ do_cpuid(u_int ax, u_int *p) "movl\t%%ebx,%1\n\t" "popl\t%%ebx" : "=a" (p[0]), "=DS" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); + : "0" (ax), "c" (cx)); } +#endif static __inline void -cpuid_count(u_int ax, u_int cx, u_int *p) +do_cpuid(u_int ax, u_int *p) { - __asm __volatile( - "pushl\t%%ebx\n\t" - "cpuid\n\t" - "movl\t%%ebx,%1\n\t" - "popl\t%%ebx" - : "=a" (p[0]), "=DS" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax), "c" (cx)); + cpuid_count(ax, 0, p); } -#endif static __inline void enable_intr(void) |