xnu-517.tar.gz

[apple/xnu.git] / osfmk / i386 / cpu_number.h

diff --git a/osfmk/i386/cpu_number.h b/osfmk/i386/cpu_number.h
index b1da548684828c1b7a0dddeb95b7b13b63771014..97b7c0d3d4cb229789e2c558ad80a9f0911d4804 100644 (file)
--- a/osfmk/i386/cpu_number.h
+++ b/osfmk/i386/cpu_number.h
@@ -61,69 +61,17 @@
 #ifndef        _I386_CPU_NUMBER_H_
 #define        _I386_CPU_NUMBER_H_
 
-#include <sys/appleapiopts.h>
-
-#ifdef __APPLE_API_UNSTABLE
-extern int     cpu_number(void);
-
-#ifdef MACH_KERNEL_PRIVATE
-
-#include <platforms.h>
-#include <cpus.h>
-
-#include <mp_v1_1.h>
-
 #if    MP_V1_1
-#include <i386/apic.h>
-#include <i386/asm.h>
-
-extern int lapic_id;
-
-extern __inline__ int cpu_number(void)
-{
-       register int cpu;
 
-       __asm__ volatile ("movl " CC_SYM_PREFIX "lapic_id, %0\n"
-                         "     movl 0(%0), %0\n"
-                         "     shrl %1, %0\n"
-                         "     andl %2, %0"
-                   : "=r" (cpu)
-                   : "i" (LAPIC_ID_SHIFT), "i" (LAPIC_ID_MASK));
+/* Get the cpu number directly from the pre-processor data area */
+#include <i386/cpu_data.h>
+#define        cpu_number()    get_cpu_number()
 
-       return(cpu);
-}
 #else  /* MP_V1_1 */
-/*
- * At least one corollary cpu type does not have local memory at all.
- * The only way I found to store the cpu number was in some 386/486
- * system register. cr3 has bits 0, 1, 2 and 5, 6, 7, 8, 9, 10, 11
- * available. Right now we use 0, 1 and 2. So we are limited to 8 cpus.
- * For more cpus, we could use bits 5 - 11 with a shift.
- *
- * Even for other machines, like COMPAQ this is much faster the inb/outb
- * 4 cycles instead of 10 to 30.
- */
-#if    defined(__GNUC__)
-#if    NCPUS   > 8
-#error cpu_number() definition only works for #cpus <= 8
-#else
-
-extern __inline__ int cpu_number(void)
-{
-       register int cpu;
 
-       __asm__ volatile ("movl %%cr3, %0\n"
-               "       andl $0x7, %0"
-                   : "=r" (cpu));
-       return(cpu);
-}
-#endif
-#endif /* defined(__GNUC__) */
+/* Use a function to do this less directly. */
+extern int     cpu_number(void);
 
 #endif /* MP_V1_1 */
 
-#endif /* MACH_KERNEL_PRIVATE */
-
-#endif  /* __APPLE_API_UNSTABLE */
-
 #endif /* _I386_CPU_NUMBER_H_ */