reenabled ASSEMBLER macro

i386/i386/cpu_number.h

@@ -30,8 +30,6 @@
 #ifndef	_I386_CPU_NUMBER_H_
 #define	_I386_CPU_NUMBER_H_
 
-#include <kern/cpu_number.h>
-
 #if	NCPUS > 1
 
 /* More-specific code must define cpu_number() and CPU_NUMBER.  */
@@ -44,4 +42,10 @@
 
 #endif	/* NCPUS == 1 */
 
+#ifndef __ASSEMBLER__
+	#include "kern/cpu_number.h"
+#else
+	#include <imps/cpu_number.h>
+#endif
+
 #endif	/* _I386_CPU_NUMBER_H_ */

i386/i386/cswitch.S

@@ -28,18 +28,22 @@
 
 #include <i386/proc_reg.h>
 #include <i386/i386asm.h>
-#include <i386/cpu_number.h>
 
+
+#ifndef ASSEMBLER
+#define ASSEMBLER
 /*
  * Context switch routines for i386.
  */
 
+#include <i386/cpu_number.h>
+
 ENTRY(Load_context)
 	movl	S_ARG0,%ecx			/* get thread */
 	movl	TH_KERNEL_STACK(%ecx),%ecx	/* get kernel stack */
 	lea	KERNEL_STACK_SIZE-IKS_SIZE-IEL_SIZE(%ecx),%edx
 						/* point to stack top */
-	CPU_NUMBER(%eax)
+	CPU_NUMBER (%eax)
 	movl	%ecx,CX(EXT(active_stacks),%eax)	/* store stack address */
 	movl	%edx,CX(EXT(kernel_stack),%eax)	/* store stack top */
 
@@ -57,7 +61,7 @@ ENTRY(Load_context)
  */
 
 ENTRY(Switch_context)
-	CPU_NUMBER(%edx)
+	CPU_NUMBER (%edx)
 	movl	CX(EXT(active_stacks),%edx),%ecx	/* get old kernel stack */
 
 	movl	%ebx,KSS_EBX(%ecx)		/* save registers */
@@ -109,7 +113,7 @@ ENTRY(Thread_continue)
  * has no FPU state)
  */
 ENTRY(switch_to_shutdown_context)
-	CPU_NUMBER(%edx)
+	CPU_NUMBER (%edx)
 	movl	EXT(active_stacks)(,%edx,4),%ecx	/* get old kernel stack */
 	movl	%ebx,KSS_EBX(%ecx)		/* save registers */
 	movl	%ebp,KSS_EBP(%ecx)
@@ -136,3 +140,4 @@ ENTRY(switch_to_shutdown_context)
 	hlt					/* (should never return) */
 
 #endif	/* NCPUS > 1 */
+#endif

imps/cpu_number.h

@@ -39,12 +39,9 @@ cpu_number()
 //#include "impsasm.h"
 
 #define	CPU_NUMBER(reg)		\
-	movzbl	APIC_LOCAL_VA+APIC_LOCAL_UNIT_ID+3,reg
+	movzbl	APIC_LOCAL_VA+APIC_LOCAL_APIC_ID+3,reg
 
 #endif
 
 
-#include "i386/cpu_number.h"
-
-
 #endif