X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..4a3eedf9ecc9bbe3f3a5c6ce5e53ad199d639d32:/osfmk/ppc/ppc_init.c?ds=sidebyside diff --git a/osfmk/ppc/ppc_init.c b/osfmk/ppc/ppc_init.c index 9478b8a7e..781eb38a1 100644 --- a/osfmk/ppc/ppc_init.c +++ b/osfmk/ppc/ppc_init.c @@ -1,31 +1,29 @@ /* - * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2007 Apple Inc. All rights reserved. * - * @APPLE_LICENSE_OSREFERENCE_HEADER_START@ + * @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. 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 - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and + * 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. + * + * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and * limitations under the License. - * - * @APPLE_LICENSE_OSREFERENCE_HEADER_END@ + * + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * @OSF_COPYRIGHT@ @@ -56,7 +54,7 @@ #include #include #include -#include +#include #include #include @@ -65,9 +63,6 @@ extern unsigned int mckFlags; extern vm_offset_t intstack; extern vm_offset_t debstack; -int pc_trace_buf[1024] = {0}; -int pc_trace_cnt = 1024; - extern unsigned int extPatchMCK; extern unsigned int extPatch32; extern unsigned int hwulckPatch_isync; @@ -84,8 +79,6 @@ extern unsigned int rwlesPatch_isync; extern unsigned int rwlesPatch_eieio; extern unsigned int rwldPatch_isync; extern unsigned int rwldPatch_eieio; -extern unsigned int retfsectPatch_eieio; -extern unsigned int retfsectPatch_isync; extern unsigned int bcopy_nop_if_32bit; extern unsigned int bcopy_nc_nop_if_32bit; extern unsigned int memcpy_nop_if_32bit; @@ -97,6 +90,8 @@ extern unsigned int uft_cuttrace; int forcenap = 0; int wcte = 0; /* Non-cache gather timer disabled */ +int debug_task; + patch_entry_t patch_table[] = { {&extPatch32, 0x60000000, PATCH_FEATURE, PatchExt32}, {&extPatchMCK, 0x60000000, PATCH_PROCESSOR, CPU_SUBTYPE_POWERPC_970}, @@ -117,10 +112,6 @@ patch_entry_t patch_table[] = { {&bcopy_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, {&bcopy_nc_nop_if_32bit,0x60000000, PATCH_FEATURE, PatchExt32}, {&memcpy_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, -#if !MACH_LDEBUG - {&retfsectPatch_isync, 0x60000000, PATCH_FEATURE, PatchLwsync}, - {&retfsectPatch_eieio, 0x7c2004ac, PATCH_FEATURE, PatchLwsync}, -#endif {&xsum_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, {&uft_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, {&uft_uaw_nop_if_32bit, 0x60000000, PATCH_FEATURE, PatchExt32}, @@ -138,6 +129,7 @@ void ppc_init( void ppc_init_cpu( struct per_proc_info *proc_info); + /* * Routine: ppc_init * Function: @@ -157,7 +149,6 @@ ppc_init( uint64_t scdata; - /* * Setup per_proc info for first cpu. */ @@ -170,8 +161,8 @@ ppc_init( BootProcInfo.debstackptr = BootProcInfo.debstack_top_ss; BootProcInfo.interrupts_enabled = 0; BootProcInfo.pending_ast = AST_NONE; - BootProcInfo.FPU_owner = 0; - BootProcInfo.VMX_owner = 0; + BootProcInfo.FPU_owner = NULL; + BootProcInfo.VMX_owner = NULL; BootProcInfo.pp_cbfr = console_per_proc_alloc(TRUE); BootProcInfo.rtcPop = EndOfAllTime; BootProcInfo.pp2ndPage = (addr64_t)&BootProcInfo; /* Initial physical address of the second page */ @@ -202,7 +193,9 @@ ppc_init( master_cpu = 0; processor_bootstrap(); - timer_switch((uint32_t)mach_absolute_time(), &thread->system_timer); + timer_start(&thread->system_timer, mach_absolute_time()); + PROCESSOR_DATA(master_processor, kernel_timer) = + PROCESSOR_DATA(master_processor, thread_timer) = &thread->system_timer; static_memory_end = round_page(args->topOfKernelData);; @@ -280,7 +273,7 @@ ppc_init( } } - machine_startup(args); + machine_startup(); } /*