/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ *
+ * 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
* 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@
/*
*/
-#include <cpus.h>
#include <platforms.h>
#include <i386/asm.h>
#include <i386/proc_reg.h>
#include <assym.s>
-#if NCPUS > 1
-
#ifdef SYMMETRY
#include <sqt/asm_macros.h>
#endif
#define CX(addr, reg) addr(,reg,4)
-#else /* NCPUS == 1 */
-
-#define CPU_NUMBER(reg)
-#define CX(addr,reg) addr
-
-#endif /* NCPUS == 1 */
-
/*
* Context switch routines for i386.
*/
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)
- movl %ecx,CX(EXT(active_stacks),%eax) /* store stack address */
- movl %edx,CX(EXT(kernel_stack),%eax) /* store stack top */
+ movl %ecx,%gs:CPU_ACTIVE_STACK /* store stack address */
+ movl %edx,%gs:CPU_KERNEL_STACK /* store stack top */
+
+ movl %edx,%esp
+ movl %edx,%ebp
- movl KSS_ESP(%ecx),%esp /* switch stacks */
- movl KSS_ESI(%ecx),%esi /* restore registers */
- movl KSS_EDI(%ecx),%edi
- movl KSS_EBP(%ecx),%ebp
- movl KSS_EBX(%ecx),%ebx
xorl %eax,%eax /* return zero (no old thread) */
- jmp *KSS_EIP(%ecx) /* resume thread */
+ pushl %eax
+ call EXT(thread_continue)
/*
* This really only has to save registers
*/
Entry(Switch_context)
- CPU_NUMBER(%edx)
- movl CX(EXT(active_stacks),%edx),%ecx /* get old kernel stack */
+ movl %gs:CPU_ACTIVE_STACK,%ecx /* get old kernel stack */
movl %ebx,KSS_EBX(%ecx) /* save registers */
movl %ebp,KSS_EBP(%ecx)
movl %esp,KSS_ESP(%ecx) /* save SP */
movl 0(%esp),%eax /* return old thread */
- movl 8(%esp),%esi /* get new thread */
- movl TH_TOP_ACT(%esi),%ebx /* get new_thread->top_act */
- movl $ CPD_ACTIVE_THREAD,%ecx
- movl %ebx,%gs:(%ecx) /* new thread is active */
- movl TH_KERNEL_STACK(%esi),%ecx /* get its kernel stack */
+ movl 8(%esp),%ebx /* get new thread */
+ movl %ebx,%gs:CPU_ACTIVE_THREAD /* new thread is active */
+ movl TH_KERNEL_STACK(%ebx),%ecx /* get its kernel stack */
lea KERNEL_STACK_SIZE-IKS_SIZE-IEL_SIZE(%ecx),%ebx
/* point to stack top */
- movl %ecx,CX(EXT(active_stacks),%edx) /* set current stack */
- movl %ebx,CX(EXT(kernel_stack),%edx) /* set stack top */
+ movl %ecx,%gs:CPU_ACTIVE_STACK /* set current stack */
+ movl %ebx,%gs:CPU_KERNEL_STACK /* set stack top */
- movl $0,CX(EXT(active_kloaded),%edx)
+ movl $0,%gs:CPU_ACTIVE_KLOADED
movl KSS_ESP(%ecx),%esp /* switch stacks */
movl KSS_ESI(%ecx),%esi /* restore registers */
xorl %ebp,%ebp /* zero frame pointer */
call *%ebx /* call real continuation */
-#if NCPUS > 1
/*
- * void switch_to_shutdown_context(thread_t thread,
+ * void machine_processor_shutdown(thread_t thread,
* void (*routine)(processor_t),
* processor_t processor)
*
* Assumes that the thread is a kernel thread (thus
* has no FPU state)
*/
-Entry(switch_to_shutdown_context)
- CPU_NUMBER(%edx)
- movl EXT(active_stacks)(,%edx,4),%ecx /* get old kernel stack */
+Entry(machine_processor_shutdown)
+ movl %gs:CPU_ACTIVE_STACK,%ecx /* get old kernel stack */
movl %ebx,KSS_EBX(%ecx) /* save registers */
movl %ebp,KSS_EBP(%ecx)
movl %edi,KSS_EDI(%ecx)
movl 4(%esp),%ebx /* get routine to run next */
movl 8(%esp),%esi /* get its argument */
- movl CX(EXT(interrupt_stack),%edx),%ecx /* point to its intr stack */
- lea INTSTACK_SIZE(%ecx),%esp /* switch to it (top) */
-
- pushl %eax /* push thread */
- call EXT(thread_dispatch) /* reschedule thread */
- addl $4,%esp /* clean stack */
+ movl %gs:CPU_INT_STACK_TOP,%esp /* switch to interrupt stack */
pushl %esi /* push argument */
call *%ebx /* call routine to run */
hlt /* (should never return) */
-#endif /* NCPUS > 1 */
.text
projects / apple / xnu.git / blobdiff