X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..060df5ea7c632b1ac8cc8aac1fb59758165c2084:/osfmk/ppc/db_interface.c diff --git a/osfmk/ppc/db_interface.c b/osfmk/ppc/db_interface.c index 373f00e79..3109d1b5e 100644 --- a/osfmk/ppc/db_interface.c +++ b/osfmk/ppc/db_interface.c @@ -1,31 +1,29 @@ /* - * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2006 Apple Computer, 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@ @@ -54,6 +52,7 @@ #include #include #include +#include /* for switch_to_serial_console */ #include #include @@ -61,6 +60,7 @@ #include #include #include +#include /* for halt_all_cpus() */ #include #include @@ -77,6 +77,7 @@ struct savearea *ppc_last_saved_statep; struct savearea ppc_nested_saved_state; unsigned ppc_last_kdb_sp; +db_regs_t ddb_regs; /* register state */ extern int debugger_cpu; /* Current cpu running debugger */ @@ -97,7 +98,6 @@ struct int_regs { struct ppc_interrupt_state *is; }; -extern char * trap_type[]; extern int TRAP_TYPES; /* @@ -220,7 +220,6 @@ kdb_trap( == BKPT_INST)) regs->save_srr0 += BKPT_SIZE; -kdb_exit: getPerProc()->db_saved_state = 0; switch_to_old_console(previous_console_device); @@ -251,9 +250,8 @@ kdbprinttrap( /* * */ -addr64_t db_vtophys( - pmap_t pmap, - vm_offset_t va) +static addr64_t +db_vtophys(pmap_t pmap, vm_offset_t va) { ppnum_t pp; addr64_t pa; @@ -388,7 +386,6 @@ db_check_access( task_t task) { register int n; - unsigned int kern_addr; if (task == kernel_task || task == TASK_NULL) { if (kernel_task == TASK_NULL) return(TRUE); @@ -436,32 +433,25 @@ db_phys_eq( #define DB_USER_STACK_ADDR (0xc0000000) #define DB_NAME_SEARCH_LIMIT (DB_USER_STACK_ADDR-(PPC_PGBYTES*3)) -boolean_t db_phys_cmp( - vm_offset_t a1, - vm_offset_t a2, - vm_size_t s1) { - +boolean_t +db_phys_cmp(__unused vm_offset_t a1, __unused vm_offset_t a2, + __unused vm_size_t s1) +{ db_printf("db_phys_cmp: not implemented\n"); return 0; } int -db_search_null( - task_t task, - unsigned *svaddr, - unsigned evaddr, - unsigned *skaddr, - int flag) +db_search_null(__unused task_t task, __unused unsigned *svaddr, + __unused unsigned evaddr, __unused unsigned *skaddr, + __unused int flag) { - register unsigned vaddr; - register unsigned *kaddr; - db_printf("db_search_null: not implemented\n"); - return(-1); } +struct proc; unsigned char *getProcName(struct proc *proc); void @@ -469,8 +459,6 @@ db_task_name( task_t task) { register unsigned char *p; - register int n; - unsigned int vaddr, kaddr; unsigned char tname[33]; int i; @@ -490,20 +478,22 @@ db_task_name( else db_printf("no name"); } +extern int kdb_flag; void -db_machdep_init(void) { +db_machdep_init(void) +{ #define KDB_READY 0x1 - extern int kdb_flag; - kdb_flag |= KDB_READY; } #ifdef __STDC__ -#define KDB_SAVE(type, name) extern type name; type name##_save = name +//#define KDB_SAVE(type, name) extern type name; type name##_save = name +#define KDB_SAVE(type, name) type name##_save = name #define KDB_RESTORE(name) name = name##_save #else /* __STDC__ */ -#define KDB_SAVE(type, name) extern type name; type name/**/_save = name +#define KDB_SAVE(type, name) type name/**/_save = name +//#define KDB_SAVE(type, name) extern type name; type name/**/_save = name #define KDB_RESTORE(name) name = name/**/_save #endif /* __STDC__ */ @@ -541,6 +531,16 @@ db_machdep_init(void) { KDB_RESTORE(db_next); \ KDB_RESTORE(ddb_regs); +extern boolean_t db_sstep_print; +extern int db_loop_count; +extern int db_call_depth; +extern int db_inst_count; +extern int db_last_inst_count; +extern int db_load_count; +extern int db_store_count; +extern boolean_t db_cmd_loop_done; +extern void unlock_debugger(void); +extern void lock_debugger(void); /* * switch to another cpu */ @@ -549,7 +549,7 @@ kdb_on( int cpu) { KDB_SAVE_CTXT(); - if (cpu < 0 || cpu >= real_ncpus || !PerProcTable[cpu].ppe_vaddr->debugger_active) + if (cpu < 0 || cpu >= (int)real_ncpus || !PerProcTable[cpu].ppe_vaddr->debugger_active) return; db_set_breakpoints(); db_set_watchpoints(); @@ -561,7 +561,7 @@ kdb_on( KDB_RESTORE_CTXT(); if (debugger_cpu == -1) {/* someone continued */ debugger_cpu = cpu_number(); - db_continue_cmd(0, 0, 0, ""); + db_continue_cmd(0, 0, 0, NULL); } } @@ -569,13 +569,9 @@ kdb_on( * system reboot */ -extern int (*PE_halt_restart)(unsigned int type); - -void db_reboot( - db_expr_t addr, - boolean_t have_addr, - db_expr_t count, - char *modif) +void +db_reboot(__unused db_expr_t addr, __unused boolean_t have_addr, + __unused db_expr_t count, char *modif) { boolean_t reboot = TRUE; char *cp, c; @@ -589,7 +585,8 @@ void db_reboot( } if(!reboot) halt_all_cpus(FALSE); /* If no reboot, try to be clean about it */ - if (PE_halt_restart) return (*PE_halt_restart)(kPERestartCPU); + if (PE_halt_restart) + (*PE_halt_restart)(kPERestartCPU); db_printf("Sorry, system can't reboot automatically yet... You need to do it by hand...\n"); }