X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/a3d08fcd5120d2aa8303b6349ca8b14e3f284af3..060df5ea7c632b1ac8cc8aac1fb59758165c2084:/osfmk/ppc/aligned_data.s diff --git a/osfmk/ppc/aligned_data.s b/osfmk/ppc/aligned_data.s index 217edea7b..1777b577e 100644 --- a/osfmk/ppc/aligned_data.s +++ b/osfmk/ppc/aligned_data.s @@ -1,23 +1,29 @@ /* * 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@ */ /* * This module only exists because I don't know how to get the silly C compiler @@ -43,27 +49,25 @@ #include -#include #include #include #include #include #include -; -; NOTE: We need this only if PREEMPTSTACK is set to non-zero in hw_lock. -; Make sure they are set to the same thing -; -#define PREEMPTSTACK 0 - .data /* 4096-byte aligned areas */ - .globl EXT(per_proc_info) + .globl EXT(PerProcTable) + .align 12 +EXT(PerProcTable): ; Per processor table + .space (ppeSize*MAX_CPUS),0 ; (filled with 0s) + + .globl EXT(BootProcInfo) .align 12 -EXT(per_proc_info): ; Per processor data area - .space (ppSize*NCPUS),0 ; (filled with 0s) +EXT(BootProcInfo): ; Per processor data area + .space ppSize,0 ; (filled with 0s) /* 512-byte aligned areas */ @@ -85,19 +89,6 @@ EXT(GratefulDebWork): ; Enough for 2 rows of 8 chars of 16-pixel wide 32- debstash: .set .,.+256 -#if PREEMPTSTACK - -; -; NOTE: We need this only if PREEMPTSTACK is set to non-zero in hw_lock. -; - - .globl EXT(DBGpreempt) ; preemption debug stack - .align 8 -EXT(DBGpreempt): - .set .,.+(NCPUS*PREEMPTSTACK*16) -#endif - - /* 128-byte aligned areas */ .globl EXT(mapCtl) @@ -116,18 +107,6 @@ fwdisplock: EXT(free_mappings): .long 0 - .globl EXT(syncClkSpot) - .align 7 -EXT(syncClkSpot): - .long 0 - .long 0 - .long 0 - .long 0 - .long 0 - .long 0 - .long 0 - .long 0 - .globl EXT(NMIss) .align 7 EXT(NMIss): @@ -196,39 +175,35 @@ EXT(dbspecrs): .set .,.+(336*4) /* - * Interrupt and debug stacks go here + * Boot processor Interrupt and debug stacks go here. */ - + + /* in the __HIB section since the hibernate restore code uses this stack. */ + .section __HIB, __data + .align PPC_PGSHIFT - .globl EXT(FixedStackStart) -EXT(FixedStackStart): .globl EXT(intstack) EXT(intstack): - .set .,.+INTSTACK_SIZE*NCPUS - + .globl EXT(gIOHibernateRestoreStack) +EXT(gIOHibernateRestoreStack): + + .set .,.+INTSTACK_SIZE + + .globl EXT(gIOHibernateRestoreStackEnd) +EXT(gIOHibernateRestoreStackEnd): + + /* back to the regular __DATA section. */ + + .section __DATA, __data + .align PPC_PGSHIFT + /* Debugger stack - used by the debugger if present */ -/* NOTE!!! Keep the debugger stack right after the interrupt stack */ .globl EXT(debstack) EXT(debstack): - .set ., .+KERNEL_STACK_SIZE*NCPUS - - .globl EXT(FixedStackEnd) -EXT(FixedStackEnd): - - .align ALIGN - .globl EXT(intstack_top_ss) -EXT(intstack_top_ss): - .long EXT(intstack)+INTSTACK_SIZE-FM_SIZE /* intstack_top_ss points to the top of interrupt stack */ - - .align ALIGN - .globl EXT(debstack_top_ss) -EXT(debstack_top_ss): + .set ., .+KERNEL_STACK_SIZE - .long EXT(debstack)+KERNEL_STACK_SIZE-FM_SIZE /* debstack_top_ss points to the top of debug stack */ + .section __DATA, __data - .globl EXT(debstackptr) -EXT(debstackptr): - .long EXT(debstack)+KERNEL_STACK_SIZE-FM_SIZE