X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/483a1d1004b64bbaaef2c64c17c6b999009a54d2..8ad349bb6ed4a0be06e34c92be0d98b92e078db4:/osfmk/ppc/interrupt.c diff --git a/osfmk/ppc/interrupt.c b/osfmk/ppc/interrupt.c index 7924041cd..72dfe9cd6 100644 --- a/osfmk/ppc/interrupt.c +++ b/osfmk/ppc/interrupt.c @@ -1,23 +1,31 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_LICENSE_OSREFERENCE_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 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. - * - * @APPLE_LICENSE_HEADER_END@ + * 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@ */ /* * @OSF_COPYRIGHT@ @@ -37,7 +45,13 @@ #include #include -perfTrap perfIntHook = 0; /* Pointer to performance trap hook routine */ +perfCallback perfIntHook = 0; /* Pointer to CHUD trap hook routine */ + +void unresolved_kernel_trap(int trapno, + struct savearea *ssp, + unsigned int dsisr, + addr64_t dar, + const char *message); struct savearea * interrupt( int type, @@ -46,8 +60,9 @@ struct savearea * interrupt( unsigned int dar) { int current_cpu; + struct per_proc_info *proc_info; uint64_t now; - thread_act_t act; + thread_t thread; disable_preemption(); @@ -61,9 +76,10 @@ struct savearea * interrupt( fctx_test(); } #endif - - + + current_cpu = cpu_number(); + proc_info = getPerProc(); switch (type) { @@ -73,23 +89,29 @@ struct savearea * interrupt( #if 0 if (pcsample_enable) { - if (find_user_regs(current_act())) - add_pcsamples (user_pc(current_act())); + if (find_user_regs(current_thread())) + add_pcsamples (user_pc(current_thread())); } #endif - act = current_act(); /* Find ourselves */ - if(act->mact.qactTimer != 0) { /* Is the timer set? */ - clock_get_uptime(&now); /* Find out what time it is */ - if (act->mact.qactTimer <= now) { /* It is set, has it popped? */ - act->mact.qactTimer = 0; /* Clear single shot timer */ - if((unsigned int)act->mact.vmmControl & 0xFFFFFFFE) { /* Are there any virtual machines? */ - vmm_timer_pop(act); /* Yes, check out them out... */ + now = mach_absolute_time(); /* Find out what time it is */ + + if(now >= proc_info->pms.pmsPop) { /* Is it time for power management state change? */ + pmsStep(1); /* Yes, advance step */ + now = mach_absolute_time(); /* Get the time again since we ran a bit */ + } + + thread = current_thread(); /* Find ourselves */ + if(thread->machine.qactTimer != 0) { /* Is the timer set? */ + if (thread->machine.qactTimer <= now) { /* It is set, has it popped? */ + thread->machine.qactTimer = 0; /* Clear single shot timer */ + if((unsigned int)thread->machine.vmmControl & 0xFFFFFFFE) { /* Are there any virtual machines? */ + vmm_timer_pop(thread); /* Yes, check out them out... */ } } } - rtclock_intr(0, ssp, 0); + rtclock_intr(ssp); break; case T_INTERRUPT: @@ -99,11 +121,11 @@ struct savearea * interrupt( KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START, current_cpu, (unsigned int)ssp->save_srr0, 0, 0, 0); - per_proc_info[current_cpu].interrupt_handler( - per_proc_info[current_cpu].interrupt_target, - per_proc_info[current_cpu].interrupt_refCon, - per_proc_info[current_cpu].interrupt_nub, - per_proc_info[current_cpu].interrupt_source); + proc_info->interrupt_handler( + proc_info->interrupt_target, + proc_info->interrupt_refCon, + proc_info->interrupt_nub, + proc_info->interrupt_source); KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END, 0, 0, 0, 0, 0); @@ -122,11 +144,8 @@ struct savearea * interrupt( default: - #if MACH_KDP || MACH_KDB - (void)Call_Debugger(type, ssp); - #else - panic("Invalid interrupt type %x\n", type); - #endif + if (!Call_Debugger(type, ssp)) + unresolved_kernel_trap(type, ssp, dsisr, dar, NULL); break; }