From b42bd0d675ec7d1e1fbbf274fadbea984c8dab22 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 5 Apr 2001 06:39:21 +0000 Subject: 2001-04-04 Roland McGrath * ddb/db_access.h: Fix obsolescent #else/#endif syntax. * ddb/db_aout.c: Likewise. * ddb/db_break.c: Likewise. * ddb/db_break.h: Likewise. * ddb/db_command.c: Likewise. * ddb/db_command.h: Likewise. * ddb/db_cond.c: Likewise. * ddb/db_examine.c: Likewise. * ddb/db_expr.c: Likewise. * ddb/db_ext_symtab.c: Likewise. * ddb/db_input.c: Likewise. * ddb/db_lex.c: Likewise. * ddb/db_macro.c: Likewise. * ddb/db_mp.c: Likewise. * ddb/db_output.c: Likewise. * ddb/db_print.c: Likewise. * ddb/db_run.c: Likewise. * ddb/db_sym.c: Likewise. * ddb/db_task_thread.c: Likewise. * ddb/db_task_thread.h: Likewise. * ddb/db_trap.c: Likewise. * ddb/db_variables.c: Likewise. * ddb/db_watch.c: Likewise. * ddb/db_watch.h: Likewise. * ddb/db_write_cmd.c: Likewise. * device/dev_pager.c: Likewise. * device/device_port.h: Likewise. * device/device_types_kernel.h: Likewise. * device/ds_routines.h: Likewise. * device/errno.h: Likewise. * device/if_ether.h: Likewise. * device/if_hdr.h: Likewise. * device/io_req.h: Likewise. * device/net_io.c: Likewise. * device/net_io.h: Likewise. * i386/i386/ast_check.c: Likewise. * i386/i386/cswitch.S: Likewise. * i386/i386/db_disasm.c: Likewise. * i386/i386/db_interface.c: Likewise. * i386/i386/db_trace.c: Likewise. * i386/i386/debug.h: Likewise. * i386/i386/debug_i386.c: Likewise. * i386/i386/debug_trace.S: Likewise. * i386/i386/eflags.h: Likewise. * i386/i386/gdt.h: Likewise. * i386/i386/hardclock.c: Likewise. * i386/i386/idt-gen.h: Likewise. * i386/i386/ipl.h: Likewise. * i386/i386/ktss.h: Likewise. * i386/i386/kttd_interface.c: Likewise. * i386/i386/ldt.h: Likewise. * i386/i386/lock.h: Likewise. * i386/i386/locore.S: Likewise. * i386/i386/mp_desc.h: Likewise. * i386/i386/pic.c: Likewise. * i386/i386/pic.h: Likewise. * i386/i386/pio.h: Likewise. * i386/i386/pit.h: Likewise. * i386/i386/seg.h: Likewise. * i386/i386/thread.h: Likewise. * i386/i386/trap.c: Likewise. * i386/i386/trap.h: Likewise. * i386/i386/vm_param.h: Likewise. * i386/i386/vm_tuning.h: Likewise. * i386/i386at/autoconf.c: Likewise. * i386/i386at/blit.c: Likewise. * i386/i386at/conf.c: Likewise. * i386/i386at/fd.c: Likewise. * i386/i386at/idt.h: Likewise. * i386/i386at/immc.c: Likewise. * i386/i386at/kd.c: Likewise. * i386/i386at/kd_event.c: Likewise. * i386/i386at/kd_mouse.c: Likewise. * i386/i386at/model_dep.c: Likewise. * i386/i386at/rtc.c: Likewise. * i386/include/mach/i386/asm.h: Likewise. * i386/include/mach/i386/eflags.h: Likewise. * i386/include/mach/i386/mach_i386.defs: Likewise. * i386/include/mach/i386/multiboot.h: Likewise. * i386/include/mach/i386/trap.h: Likewise. * i386/include/mach/i386/vm_types.h: Likewise. * i386/include/mach/sa/stdarg.h: Likewise. * i386/intel/pmap.c: Likewise. * i386/intel/pmap.h: Likewise. * include/alloca.h: Likewise. * include/device/device_types.defs: Likewise. * include/device/device_types.h: Likewise. * include/device/disk_status.h: Likewise. * include/device/net_status.h: Likewise. * include/mach/mach.defs: Likewise. * include/mach/memory_object.defs: Likewise. * include/mach/std_types.defs: Likewise. * include/mach_debug/hash_info.h: Likewise. * include/mach_debug/ipc_info.h: Likewise. * include/mach_debug/mach_debug.defs: Likewise. * include/mach_debug/mach_debug_types.defs: Likewise. * include/mach_debug/mach_debug_types.h: Likewise. * include/mach_debug/vm_info.h: Likewise. * include/mach_debug/zone_info.h: Likewise. * include/sys/ioctl.h: Likewise. * include/sys/time.h: Likewise. * ipc/ipc_entry.h: Likewise. * ipc/ipc_hash.h: Likewise. * ipc/ipc_init.c: Likewise. * ipc/ipc_kmsg.c: Likewise. * ipc/ipc_kmsg.h: Likewise. * ipc/ipc_marequest.c: Likewise. * ipc/ipc_marequest.h: Likewise. * ipc/ipc_mqueue.c: Likewise. * ipc/ipc_mqueue.h: Likewise. * ipc/ipc_notify.c: Likewise. * ipc/ipc_notify.h: Likewise. * ipc/ipc_object.c: Likewise. * ipc/ipc_object.h: Likewise. * ipc/ipc_port.c: Likewise. * ipc/ipc_port.h: Likewise. * ipc/ipc_pset.c: Likewise. * ipc/ipc_pset.h: Likewise. * ipc/ipc_right.c: Likewise. * ipc/ipc_right.h: Likewise. * ipc/ipc_space.c: Likewise. * ipc/ipc_space.h: Likewise. * ipc/mach_debug.c: Likewise. * ipc/mach_msg.c: Likewise. * ipc/mach_msg.h: Likewise. * ipc/mach_port.c: Likewise. * kern/act.c: Likewise. * kern/assert.h: Likewise. * kern/ast.c: Likewise. * kern/ast.h: Likewise. * kern/bootstrap.c: Likewise. * kern/counters.c: Likewise. * kern/counters.h: Likewise. * kern/debug.h: Likewise. * kern/exception.c: Likewise. * kern/host.h: Likewise. * kern/ipc_host.c: Likewise. * kern/ipc_host.h: Likewise. * kern/ipc_kobject.c: Likewise. * kern/ipc_mig.c: Likewise. * kern/ipc_tt.c: Likewise. * kern/ipc_tt.h: Likewise. * kern/kalloc.h: Likewise. * kern/lock_mon.c: Likewise. * kern/mach_clock.c: Likewise. * kern/mach_factor.c: Likewise. * kern/mach_param.h: Likewise. * kern/machine.c: Likewise. * kern/processor.c: Likewise. * kern/profile.c: Likewise. * kern/queue.h: Likewise. * kern/sched.h: Likewise. * kern/startup.c: Likewise. * kern/syscall_emulation.h: Likewise. * kern/syscall_subr.c: Likewise. * kern/syscall_subr.h: Likewise. * kern/syscall_sw.c: Likewise. * kern/syscall_sw.h: Likewise. * kern/task.h: Likewise. * kern/thread_swap.h: Likewise. * kern/time_out.h: Likewise. * kern/time_stamp.c: Likewise. * kern/time_stamp.h: Likewise. * kern/timer.c: Likewise. * kern/timer.h: Likewise. * kern/xpr.c: Likewise. * kern/xpr.h: Likewise. * kern/zalloc.c: Likewise. * kern/zalloc.h: Likewise. * linux/dev/drivers/block/ide.c: Likewise. * linux/dev/include/linux/blk.h: Likewise. * linux/src/include/linux/cdrom.h: Likewise. * linux/src/include/linux/md.h: Likewise. * util/cpu.h: Likewise. * vm/memory_object.c: Likewise. * vm/memory_object.h: Likewise. * vm/pmap.h: Likewise. * vm/vm_debug.c: Likewise. * vm/vm_external.h: Likewise. * vm/vm_fault.c: Likewise. * vm/vm_fault.h: Likewise. * vm/vm_kern.h: Likewise. * vm/vm_map.c: Likewise. * vm/vm_map.h: Likewise. * vm/vm_object.h: Likewise. * vm/vm_pageout.c: Likewise. * vm/vm_pageout.h: Likewise. * vm/vm_user.h: Likewise. --- ddb/db_access.h | 16 ++++++++-------- ddb/db_aout.c | 20 ++++++++++---------- ddb/db_break.c | 38 +++++++++++++++++++------------------- ddb/db_break.h | 14 +++++++------- ddb/db_command.c | 26 +++++++++++++------------- ddb/db_command.h | 14 +++++++------- ddb/db_cond.c | 14 +++++++------- ddb/db_examine.c | 26 +++++++++++++------------- ddb/db_expr.c | 14 +++++++------- ddb/db_ext_symtab.c | 14 +++++++------- ddb/db_input.c | 20 ++++++++++---------- ddb/db_lex.c | 18 +++++++++--------- ddb/db_macro.c | 20 ++++++++++---------- ddb/db_mp.c | 18 +++++++++--------- ddb/db_output.c | 16 ++++++++-------- ddb/db_print.c | 28 ++++++++++++++-------------- ddb/db_run.c | 26 +++++++++++++------------- ddb/db_sym.c | 48 ++++++++++++++++++++++++------------------------ ddb/db_task_thread.c | 18 +++++++++--------- ddb/db_task_thread.h | 14 +++++++------- ddb/db_trap.c | 14 +++++++------- ddb/db_variables.c | 20 ++++++++++---------- ddb/db_watch.c | 16 ++++++++-------- ddb/db_watch.h | 16 ++++++++-------- ddb/db_write_cmd.c | 20 ++++++++++---------- 25 files changed, 254 insertions(+), 254 deletions(-) (limited to 'ddb') diff --git a/ddb/db_access.h b/ddb/db_access.h index c01b6ce..1041893 100644 --- a/ddb/db_access.h +++ b/ddb/db_access.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -42,7 +42,7 @@ #ifndef DB_ACCESS_LEVEL #define DB_ACCESS_LEVEL DB_ACCESS_KERNEL -#endif DB_ACCESS_LEVEL +#endif /* DB_ACCESS_LEVEL */ #ifndef DB_VALID_KERN_ADDR #define DB_VALID_KERN_ADDR(addr) ((addr) >= VM_MIN_KERNEL_ADDRESS \ @@ -50,7 +50,7 @@ #define DB_VALID_ADDRESS(addr,user) ((user != 0) ^ DB_VALID_KERN_ADDR(addr)) #define DB_PHYS_EQ(task1,addr1,task2,addr2) 0 #define DB_CHECK_ACCESS(addr,size,task) db_is_current_task(task) -#endif DB_VALID_KERN_ADDR +#endif /* DB_VALID_KERN_ADDR */ extern int db_access_level; diff --git a/ddb/db_aout.c b/ddb/db_aout.c index 6cb8294..7c2b2ab 100644 --- a/ddb/db_aout.c +++ b/ddb/db_aout.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -162,7 +162,7 @@ aout_db_eq_name(sp, name) /* * check .c .o file name comparison case */ - if (*s2 == 0 && sp->n_un.n_name <= s1 - 2 + if (*s2 == 0 && sp->n_un.n_name <= s1 - 2 && s1[-2] == '.' && s1[-1] == 'o') return(TRUE); return(FALSE); @@ -173,7 +173,7 @@ aout_db_eq_name(sp, name) * xxx:yyy for N_FUN * xxx.ttt for N_DATA and N_BSS */ - return(*s1 == 0 || (*s1 == ':' && sp->n_type == N_FUN) || + return(*s1 == 0 || (*s1 == ':' && sp->n_type == N_FUN) || (*s1 == '.' && (sp->n_type == N_DATA || sp->n_type == N_BSS))); } @@ -284,7 +284,7 @@ aout_db_qualified_search(stab, file, sym, line) */ in_file = TRUE; for (sp++; sp < ep; sp++) { - if (sp->n_type == N_TEXT + if (sp->n_type == N_TEXT && aout_db_is_filename(sp->n_un.n_name)) break; /* enter into another file */ if (sp->n_type == N_SOL) { @@ -504,4 +504,4 @@ aout_db_line_at_pc(stab, sym, file, line, pc) #endif /* DB_NO_AOUT */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_break.c b/ddb/db_break.c index d0ce1fc..54339ee 100644 --- a/ddb/db_break.c +++ b/ddb/db_break.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -93,7 +93,7 @@ db_add_thread_breakpoint(bkpt, task_thd, count, task_bpt) register db_thread_breakpoint_t tp; if (db_thread_break_init == FALSE) { - for (tp = db_thread_break_list; + for (tp = db_thread_break_list; tp < &db_thread_break_list[NTHREAD_LIST-1]; tp++) tp->tb_next = tp+1; tp->tb_next = 0; @@ -242,11 +242,11 @@ db_check_breakpoint_valid() tbp_next = tbp->tb_next; if (tbp->tb_task_thd == 0) continue; - if ((tbp->tb_is_task && + if ((tbp->tb_is_task && db_lookup_task((task_t)(tbp->tb_task_thd)) < 0) || - (!tbp->tb_is_task && + (!tbp->tb_is_task && db_lookup_thread((thread_t)(tbp->tb_task_thd)) < 0)) { - db_force_delete_breakpoint(bkpt, + db_force_delete_breakpoint(bkpt, tbp->tb_task_thd, tbp->tb_is_task); } } @@ -414,7 +414,7 @@ db_set_breakpoints() BKPT_SET(bkpt->bkpt_inst), task); bkpt->flags |= BKPT_SET_IN_MEM; } else { - db_printf("Warning: cannot set breakpoint at %X ", + db_printf("Warning: cannot set breakpoint at %X ", bkpt->address); if (task) db_printf("in task %X\n", task); @@ -448,7 +448,7 @@ db_clear_breakpoints() } if ((bkpt->flags & BKPT_SET_IN_MEM) && DB_CHECK_ACCESS(bkpt->address, BKPT_SIZE, task)) { - inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, + inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, task); if (inst != BKPT_SET(inst)) { if (bkpt->flags & BKPT_USR_GLOBAL) { @@ -497,9 +497,9 @@ db_set_temp_breakpoint(task, addr) db_printf("Too many thread_breakpoints.\n"); return 0; } - bkpt->bkpt_inst = db_get_task_value(bkpt->address, BKPT_SIZE, + bkpt->bkpt_inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, task); - db_put_task_value(bkpt->address, BKPT_SIZE, + db_put_task_value(bkpt->address, BKPT_SIZE, BKPT_SET(bkpt->bkpt_inst), task); return bkpt; } @@ -564,7 +564,7 @@ db_list_breakpoints() if (task_id < 0 || thread_id < 0) db_printf("%0*X ", 2*sizeof(vm_offset_t), tp->tb_task_thd); - else + else db_printf("task%03d.%-3d ", task_id, thread_id); } } @@ -603,7 +603,7 @@ db_delete_cmd() boolean_t thd_bpt = FALSE; db_expr_t addr; int t; - + t = db_read_token(); if (t == tSLASH) { t = db_read_token(); @@ -645,7 +645,7 @@ db_delete_cmd() user_space = TRUE; } if (!DB_VALID_ADDRESS((vm_offset_t) addr, user_space)) { - db_printf("Address %#X is not in %s space\n", addr, + db_printf("Address %#X is not in %s space\n", addr, (user_space)? "user": "kernel"); db_error(0); } @@ -711,7 +711,7 @@ db_breakpoint_cmd(addr, have_addr, count, modif) if (db_access_level <= DB_ACCESS_CURRENT && user_space && thread->task != db_current_task()) db_error("Cannot set break point in inactive user space\n"); - db_set_breakpoint(db_target_space(thread, user_space), + db_set_breakpoint(db_target_space(thread, user_space), (db_addr_t)addr, count, (user_global)? THREAD_NULL: thread, task_bpt); @@ -730,4 +730,4 @@ db_listbreak_cmd() db_list_breakpoints(); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_break.h b/ddb/db_break.h index 4d4bd2c..5909a62 100644 --- a/ddb/db_break.h +++ b/ddb/db_break.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -83,4 +83,4 @@ extern db_breakpoint_t db_set_temp_breakpoint( task_t task, db_addr_t addr); extern void db_delete_temp_breakpoint ( task_t task, db_breakpoint_t bkpt); -#endif _DDB_DB_BREAK_H_ +#endif /* _DDB_DB_BREAK_H_ */ diff --git a/ddb/db_command.c b/ddb/db_command.c index 50a02bd..e29e5ff 100644 --- a/ddb/db_command.c +++ b/ddb/db_command.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -314,10 +314,10 @@ void db_show_help(); extern void netipc_packet_print(), netipc_pcs_print(), db_show_all_uids(); extern void db_show_all_proxies(), db_show_all_principals(); extern void db_show_all_uids_verbose(); -#endif NORMA_IPC +#endif /* NORMA_IPC */ #if NORMA_VM extern void xmm_obj_print(), xmm_reply_print(); -#endif NORMA_VM +#endif /* NORMA_VM */ struct db_command db_show_all_cmds[] = { { "threads", db_show_all_threads, 0, 0 }, @@ -327,7 +327,7 @@ struct db_command db_show_all_cmds[] = { { "proxies", db_show_all_proxies, 0, 0 }, { "principals", db_show_all_principals, 0, 0 }, { "vuids", db_show_all_uids_verbose, 0, 0 }, -#endif NORMA_IPC +#endif /* NORMA_IPC */ { (char *)0 } }; @@ -351,11 +351,11 @@ struct db_command db_show_cmds[] = { #if NORMA_IPC { "packet", netipc_packet_print, 0, 0 }, { "pcs", netipc_pcs_print, 0, 0 }, -#endif NORMA_IPC +#endif /* NORMA_IPC */ #if NORMA_VM { "xmm_obj", xmm_obj_print, 0, 0 }, { "xmm_reply", xmm_reply_print, 0, 0 }, -#endif NORMA_VM +#endif /* NORMA_VM */ { (char *)0, } }; @@ -449,7 +449,7 @@ db_command_loop() extern int db_macro_level; #if NORMA_IPC extern int _node_self; /* node_self() may not be callable yet */ -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Initialize 'prev' and 'next' to dot. @@ -594,4 +594,4 @@ db_option(modif, option) return(FALSE); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_command.h b/ddb/db_command.h index 60762b2..b7324f0 100644 --- a/ddb/db_command.h +++ b/ddb/db_command.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -67,4 +67,4 @@ struct db_command { struct db_command *more; /* another level of command */ }; -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_cond.c b/ddb/db_cond.c index c78f03c..deaa699 100644 --- a/ddb/db_cond.c +++ b/ddb/db_cond.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -178,4 +178,4 @@ db_cond_cmd() bkpt->tb_cond = (cp - db_cond) + 1; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_examine.c b/ddb/db_examine.c index c996fd1..9e45bd1 100644 --- a/ddb/db_examine.c +++ b/ddb/db_examine.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -76,19 +76,19 @@ db_examine_cmd(addr, have_addr, count, modif) if (count == -1) count = 1; db_examine_count = count; - if (db_option(modif, 't')) + if (db_option(modif, 't')) { if (!db_get_next_thread(&thread, 0)) return; } - else + else if (db_option(modif,'u')) thread = current_thread(); else thread = THREAD_NULL; - + db_examine_thread = thread; - db_examine((db_addr_t) addr, db_examine_format, count, + db_examine((db_addr_t) addr, db_examine_format, count, db_thread_to_task(thread)); } @@ -157,7 +157,7 @@ db_examine(addr, fmt, count, task) if (db_print_position() != 0) db_printf("\n"); db_prev = addr; - db_task_printsym(addr, + db_task_printsym(addr, (c == 'a')?DB_STGY_ANY:DB_STGY_PROC, task); db_printf(":\t"); @@ -278,7 +278,7 @@ db_print_cmd() task = db_default_thread->task; } else db_unread_token(t); - + for ( ; ; ) { t = db_read_token(); if (t == tSTRING) { @@ -503,4 +503,4 @@ db_xcdump(addr, size, count, task) return(addr); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_expr.c b/ddb/db_expr.c index b9848bb..23b4ef8 100644 --- a/ddb/db_expr.c +++ b/ddb/db_expr.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -388,4 +388,4 @@ db_expression(valuep) return (db_logical_or_expr(valuep)); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_ext_symtab.c b/ddb/db_ext_symtab.c index 1a8ea8b..7d85252 100644 --- a/ddb/db_ext_symtab.c +++ b/ddb/db_ext_symtab.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -120,4 +120,4 @@ host_load_symbol_table(host, task, name, symtab, symtab_count) #endif /* MACH_DEBUG */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_input.c b/ddb/db_input.c index c175ae1..f45d4f9 100644 --- a/ddb/db_input.c +++ b/ddb/db_input.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -38,7 +38,7 @@ #ifndef DB_HISTORY_SIZE #define DB_HISTORY_SIZE 4000 -#endif DB_HISTORY_SIZE +#endif /* DB_HISTORY_SIZE */ /* * Character input and editing. @@ -60,7 +60,7 @@ char * db_history_curr = db_history; /* start of current line */ char * db_history_last = db_history; /* start of last line */ char * db_history_prev = (char *) 0; /* start of previous line */ #endif - + #define CTRL(c) ((c) & 0x1f) #define isspace(c) ((c) == ' ' || (c) == '\t') #define BLANK ' ' @@ -133,7 +133,7 @@ db_delete_line() db_history_size - 1; \ } while (0) #endif - + /* returns TRUE at end-of-line */ boolean_t db_inputchar(c) @@ -375,4 +375,4 @@ db_check_interrupt() } } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_lex.c b/ddb/db_lex.c index 617f123..783f4ee 100644 --- a/ddb/db_lex.c +++ b/ddb/db_lex.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -121,7 +121,7 @@ db_read_char() } else if (db_lp >= db_endlp) c = -1; - else + else c = *db_lp++; return (c); } @@ -260,7 +260,7 @@ db_lex() (c >= 'a' && c <= 'z') || (c == '_')) { - db_printf("Bad character '%c' after number %s\n", + db_printf("Bad character '%c' after number %s\n", c, db_tok_string); db_error(0); db_flush_lex(); @@ -452,4 +452,4 @@ db_lex() return (tEOF); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_macro.c b/ddb/db_macro.c index c186ac6..5a7e8c2 100644 --- a/ddb/db_macro.c +++ b/ddb/db_macro.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -104,7 +104,7 @@ db_del_macro_cmd() { register struct db_user_macro *mp; - if (db_read_token() != tIDENT + if (db_read_token() != tIDENT || (mp = db_lookup_macro(db_tok_string)) == 0) { db_printf("No such macro \"%s\"\n", db_tok_string); db_error(0); @@ -134,7 +134,7 @@ db_show_macro() db_printf("%s: %s", mp->m_name, mp->m_lbuf); } } - + int db_exec_macro(name) char *name; @@ -150,7 +150,7 @@ db_exec_macro(name) /* NOTREACHED */ } for (n = 0; - n < DB_NARGS && + n < DB_NARGS && db_expression(&db_macro_args[db_macro_level+1][n]); n++); while (n < DB_NARGS) @@ -180,4 +180,4 @@ db_arg_variable(vp, valuep, flag, ap) return(0); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_mp.c b/ddb/db_mp.c index 607c24d..3e4f6ed 100644 --- a/ddb/db_mp.c +++ b/ddb/db_mp.c @@ -1,26 +1,26 @@ -/* +/* * Mach Operating System * Copyright (c) 1993,1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ #include "mach_kdb.h" @@ -145,7 +145,7 @@ db_leave() /* - * invoke kernel debugger on slave processors + * invoke kernel debugger on slave processors */ void @@ -336,4 +336,4 @@ db_console() #endif /* NCPUS > 1 */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_output.c b/ddb/db_output.c index adaf249..de3b370 100644 --- a/ddb/db_output.c +++ b/ddb/db_output.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -57,7 +57,7 @@ #ifndef DB_MAX_LINE #define DB_MAX_LINE 24 /* maximum line */ #define DB_MAX_WIDTH 80 /* maximum width */ -#endif DB_MAX_LINE +#endif /* DB_MAX_LINE */ #define DB_MIN_MAX_WIDTH 20 /* minimum max width */ #define DB_MIN_MAX_LINE 3 /* minimum max line */ @@ -233,4 +233,4 @@ kdbprintf(const char *fmt, ...) va_end(listp); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_print.c b/ddb/db_print.c index 727af23..2dee9cc 100644 --- a/ddb/db_print.c +++ b/ddb/db_print.c @@ -2,24 +2,24 @@ * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -90,12 +90,12 @@ db_show_regs(addr, have_addr, count, modif) aux_param.suffix[0] = i; db_read_write_variable(regp, &value, DB_VAR_GET, &aux_param); if (regp->max_level > 0) - db_printf("%s%d%*s", regp->name, i, + db_printf("%s%d%*s", regp->name, i, 12-strlen(regp->name)-((i<10)?1:2), ""); else db_printf("%-12s", regp->name); db_printf("%#*N", 2+2*sizeof(vm_offset_t), value); - db_find_xtrn_task_sym_and_offset((db_addr_t)value, &name, + db_find_xtrn_task_sym_and_offset((db_addr_t)value, &name, &offset, task); if (name != 0 && offset <= db_maxoff && offset != value) { db_printf("\t%s", name); @@ -116,7 +116,7 @@ db_show_regs(addr, have_addr, count, modif) #ifndef DB_TASK_NAME #define DB_TASK_NAME(task) /* no task name */ #define DB_TASK_NAME_TITLE "" /* no task name */ -#endif DB_TASK_NAME +#endif /* DB_TASK_NAME */ #ifndef db_thread_fp_used #define db_thread_fp_used(thread) FALSE @@ -128,7 +128,7 @@ db_thread_stat(thread, status) char *status; { register char *p = status; - + *p++ = (thread->state & TH_RUN) ? 'R' : '.'; *p++ = (thread->state & TH_WAIT) ? 'W' : '.'; *p++ = (thread->state & TH_SUSP) ? 'S' : '.'; @@ -180,7 +180,7 @@ db_print_thread(thread, thread_id, flag) db_printf("\n "); } else db_printf(" "); - db_printf("%3d%c(%0*X,%s)", thread_id, + db_printf("%3d%c(%0*X,%s)", thread_id, (thread == current_thread())? '#': ':', 2*sizeof(vm_offset_t), thread, db_thread_stat(thread, status)); @@ -200,7 +200,7 @@ db_print_thread(thread, thread_id, flag) if (thread->state & TH_SWAPPED) { if (thread->swap_func) { db_printf("("); - db_task_printsym((db_addr_t)thread->swap_func, + db_task_printsym((db_addr_t)thread->swap_func, DB_STGY_ANY, kernel_task); db_printf(")"); } else { @@ -209,7 +209,7 @@ db_print_thread(thread, thread_id, flag) } if (thread->state & TH_WAIT) { db_printf(" "); - db_task_printsym((db_addr_t)thread->wait_event, + db_task_printsym((db_addr_t)thread->wait_event, DB_STGY_ANY, kernel_task); } db_printf("\n"); @@ -227,7 +227,7 @@ db_print_task(task, task_id, flag) if (flag & OPTION_USER) { if (flag & OPTION_TASK_TITLE) { - db_printf(" ID: TASK MAP THD SUS PR %s", + db_printf(" ID: TASK MAP THD SUS PR %s", DB_TASK_NAME_TITLE); if ((flag & OPTION_LONG) == 0) db_printf(" THREADS"); @@ -508,4 +508,4 @@ db_show_port_id(addr, have_addr, count, modif) db_printf("\n"); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_run.c b/ddb/db_run.c index 47c39c2..c6feb24 100644 --- a/ddb/db_run.c +++ b/ddb/db_run.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1993-1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -240,7 +240,7 @@ db_single_step(regs, task) * db_getreg_val(); return the value of a user register, * as indicated in the hardware instruction * encoding, e.g. 8 for r8 - * + * * next_instr_address(pc,bd,task) returns the address of the first * instruction following the one at "pc", * which is either in the taken path of @@ -252,7 +252,7 @@ db_single_step(regs, task) * If one of these addresses does not already have a breakpoint, * we allocate a breakpoint and save it here. * These breakpoints are deleted on return. - */ + */ db_breakpoint_t db_not_taken_bkpt = 0; db_breakpoint_t db_taken_bkpt = 0; @@ -294,18 +294,18 @@ db_set_task_single_step(regs, task) db_taken_bkpt = 0; pc = next_instr_address(pc,1,task); } - + /* check if this control flow instruction is an unconditional transfer */ unconditional = inst_unconditional_flow_transfer(inst); pc = next_instr_address(pc,0,task); - /* + /* We only set the sequential breakpoint if previous instruction was not an unconditional change of flow of control. If the previous instruction is an unconditional change of flow of control, setting a breakpoint in the next sequential location may set a breakpoint in data or in another routine, - which could screw up either the program or the debugger. - (Consider, for instance, that the next sequential instruction is the + which could screw up either the program or the debugger. + (Consider, for instance, that the next sequential instruction is the start of a routine needed by the debugger.) */ if (!unconditional && db_find_breakpoint_here(task, pc) == 0) { @@ -438,4 +438,4 @@ db_in_single_step() return(db_run_mode != STEP_NONE && db_run_mode != STEP_CONTINUE); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_sym.c b/ddb/db_sym.c index c48a48f..8641ce1 100644 --- a/ddb/db_sym.c +++ b/ddb/db_sym.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -187,7 +187,7 @@ db_lookup(symstr) * handler supports qualified search with a file name or a line number. * It parses the symbol string, and call an object dependent routine * with parsed file name, symbol name and line number. - */ + */ db_sym_t db_sym_parse_and_lookup(func, symtab, symstr) db_sym_t (*func)(); @@ -247,7 +247,7 @@ db_sym_parse_and_lookup(func, symtab, symstr) sym_name = component[1]; } found = func(symtab, file_name, sym_name, line_number); - + out: while (--n >= 1) component[n][-1] = ':'; @@ -290,8 +290,8 @@ db_sym_t db_search_in_task_symbol(); * * Logic change. If the task argument is non NULL and a * matching symbol is found in a symbol table which explictly - * specifies its map to be task->map, that symbol will have - * precedence over any symbol from a symbol table will a null + * specifies its map to be task->map, that symbol will have + * precedence over any symbol from a symbol table will a null * map. This allows overlapping kernel/user maps to work correctly. * */ @@ -309,9 +309,9 @@ db_search_task_symbol(val, strategy, offp, task) else { ret = db_search_in_task_symbol(val, strategy, offp, task); - /* - db_search_in_task_symbol will return success with - a very large offset when it should have failed. + /* + db_search_in_task_symbol will return success with + a very large offset when it should have failed. */ if (ret == DB_SYM_NULL || (*offp) > 0x1000000) { @@ -340,11 +340,11 @@ db_search_in_task_symbol(val, strategy, offp, task) map_for_val = (task == TASK_NULL)? VM_MAP_NULL: task->map; newdiff = diff = ~0; db_last_symtab = (db_symtab_t *) 0; - for (sp = &db_symtabs[0], i = 0; i < db_nsymtab; sp++, i++) + for (sp = &db_symtabs[0], i = 0; i < db_nsymtab; sp++, i++) { newdiff = ~0; if ((vm_map_t)sp->map_pointer == VM_MAP_NULL || - (vm_map_t)sp->map_pointer == map_for_val) + (vm_map_t)sp->map_pointer == map_for_val) { sym = X_db_search_symbol(sp, val, strategy, (db_expr_t*)&newdiff); if (sym == DB_SYM_NULL) @@ -356,7 +356,7 @@ db_search_in_task_symbol(val, strategy, offp, task) ret = sym; continue; } - if ((vm_map_t) sp->map_pointer == VM_MAP_NULL && + if ((vm_map_t) sp->map_pointer == VM_MAP_NULL && (vm_map_t) db_last_symtab->map_pointer == VM_MAP_NULL && newdiff < diff ) { /* closer null map match */ @@ -364,23 +364,23 @@ db_search_in_task_symbol(val, strategy, offp, task) diff = newdiff; ret = sym; continue; - } - if ((vm_map_t) sp->map_pointer != VM_MAP_NULL && + } + if ((vm_map_t) sp->map_pointer != VM_MAP_NULL && (newdiff < 0x100000) && ((vm_map_t) db_last_symtab->map_pointer == VM_MAP_NULL || newdiff < diff )) - { /* update if new is in matching map and symbol is "close", - and - old is VM_MAP_NULL or old in is matching map but is further away + { /* update if new is in matching map and symbol is "close", + and + old is VM_MAP_NULL or old in is matching map but is further away */ db_last_symtab = sp; diff = newdiff; ret = sym; continue; - } + } } } - + *offp = diff; return ret; } @@ -520,4 +520,4 @@ struct db_sym_switch x_db[] = { }; -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c index 8ab8cde..8a62e23 100644 --- a/ddb/db_task_thread.c +++ b/ddb/db_task_thread.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -184,7 +184,7 @@ db_lookup_thread_id(task, thread_id) { register thread_t thread; - + if (thread_id > DB_MAX_THREADID) return(THREAD_NULL); if (queue_first(&task->thread_list) == 0) @@ -291,7 +291,7 @@ db_get_task_thread(vp, valuep, flag, ap) return(0); } if ((thread = db_lookup_thread_id(task, ap->suffix[1])) == THREAD_NULL){ - db_printf("no such thread($task%d.%d)\n", + db_printf("no such thread($task%d.%d)\n", ap->suffix[0], ap->suffix[1]); db_error(0); /* NOTREACHED */ @@ -300,4 +300,4 @@ db_get_task_thread(vp, valuep, flag, ap) return(0); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_task_thread.h b/ddb/db_task_thread.h index 26a071c..867cee6 100644 --- a/ddb/db_task_thread.h +++ b/ddb/db_task_thread.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -48,4 +48,4 @@ extern boolean_t db_check_thread_address_valid(/* db_expr_t */); extern boolean_t db_get_next_thread(/* thread_t *, int */); extern void db_init_default_thread(); -#endif _DDB_DB_TASK_THREAD_H_ +#endif /* _DDB_DB_TASK_THREAD_H_ */ diff --git a/ddb/db_trap.c b/ddb/db_trap.c index dbb5892..367670b 100644 --- a/ddb/db_trap.c +++ b/ddb/db_trap.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -104,4 +104,4 @@ db_trap(type, code) db_task_trap(type, code, !DB_VALID_KERN_ADDR(PC_REGS(DDB_REGS))); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_variables.c b/ddb/db_variables.c index 541dca1..96f2c5c 100644 --- a/ddb/db_variables.c +++ b/ddb/db_variables.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -84,7 +84,7 @@ db_get_suffix(suffix, suffix_value) suffix++; return(suffix); } - + static boolean_t db_cmp_variable_name(vp, name, ap) struct db_variable *vp; @@ -93,7 +93,7 @@ db_cmp_variable_name(vp, name, ap) { register char *var_np, *np; register level; - + for (np = name, var_np = vp->name; *var_np; ) { if (*np++ != *var_np++) return(FALSE); @@ -103,7 +103,7 @@ db_cmp_variable_name(vp, name, ap) return(FALSE); } if ((*np && *np != ':') || level < vp->min_level - || (level > 0 && (ap->suffix[0] < vp->low + || (level > 0 && (ap->suffix[0] < vp->low || (vp->high >= 0 && ap->suffix[0] > vp->high)))) return(FALSE); db_strcpy(ap->modif, (*np)? np+1: ""); @@ -238,4 +238,4 @@ db_set_cmd() db_read_write_variable(vp, &value, DB_VAR_SET, &aux_param); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_watch.c b/ddb/db_watch.c index 410c0a2..9585286 100644 --- a/ddb/db_watch.c +++ b/ddb/db_watch.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -202,7 +202,7 @@ db_get_task(modif, taskp, addr) } } if (!DB_VALID_ADDRESS(addr, user_space)) { - db_printf("Address %#X is not in %s space\n", addr, + db_printf("Address %#X is not in %s space\n", addr, (user_space)? "user": "kernel"); return(-1); } @@ -315,4 +315,4 @@ db_find_watchpoint(map, addr, regs) return (FALSE); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_watch.h b/ddb/db_watch.h index 9192bbd..6e28403 100644 --- a/ddb/db_watch.h +++ b/ddb/db_watch.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -58,6 +58,6 @@ extern void db_set_watchpoint(/* task_t task, db_addr_t addr, vm_size_t size */) extern void db_delete_watchpoint(/* task_t task, db_addr_t addr */); extern void db_list_watchpoints(); -#endif _DDB_DB_WATCH_ +#endif /* _DDB_DB_WATCH_ */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_write_cmd.c b/ddb/db_write_cmd.c index a72102b..a8cf272 100644 --- a/ddb/db_write_cmd.c +++ b/ddb/db_write_cmd.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -68,7 +68,7 @@ db_write_cmd(address, have_addr, count, modif) addr = (db_addr_t) address; size = db_size_option(modif, &u_opt, &t_opt); - if (t_opt) + if (t_opt) { if (!db_get_next_thread(&thread, 0)) return; @@ -76,8 +76,8 @@ db_write_cmd(address, have_addr, count, modif) } else task = db_current_task(); - - /* if user space is not explicitly specified, + + /* if user space is not explicitly specified, look in the kernel */ if (!u_opt) task = TASK_NULL; @@ -106,4 +106,4 @@ db_write_cmd(address, have_addr, count, modif) db_prev = addr - size; } -#endif MACH_KDB +#endif /* MACH_KDB */ -- cgit v1.2.3