/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* @OSF_COPYRIGHT@
#ifndef _I386_CPU_NUMBER_H_
#define _I386_CPU_NUMBER_H_
-#include <sys/appleapiopts.h>
+#ifdef KERNEL_PRIVATE
-#ifdef __APPLE_API_UNSTABLE
+/* Use a function to do this less directly. */
extern int cpu_number(void);
#ifdef MACH_KERNEL_PRIVATE
+#include <i386/cpu_data.h>
-#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));
-
- 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;
+/* Get the cpu number directly from the pre-processor data area */
+#define cpu_number() get_cpu_number()
- __asm__ volatile ("movl %%cr3, %0\n"
- " andl $0x7, %0"
- : "=r" (cpu));
- return(cpu);
-}
-#endif
-#endif /* defined(__GNUC__) */
+#endif /* !MACH_KERNEL_PRIVATE */
-#endif /* MP_V1_1 */
-
-#endif /* MACH_KERNEL_PRIVATE */
-
-#endif /* __APPLE_API_UNSTABLE */
+#endif /* KERNEL_PRIVATE */
#endif /* _I386_CPU_NUMBER_H_ */
+
projects / apple / xnu.git / blobdiff