/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
- *
- * 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. 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_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- * HISTORY
- *
- * Revision 1.1.1.1 1998/09/22 21:05:47 wsanchez
- * Import of Mac OS X kernel (~semeria)
+ * @APPLE_LICENSE_OSREFERENCE_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.
*
- * Revision 1.2 1998/04/29 17:35:26 mburg
- * MK7.3 merger
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
*
- * Revision 1.2.47.1 1998/02/03 09:23:57 gdt
- * Merge up to MK7.3
- * [1998/02/03 09:10:14 gdt]
+ * 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.
*
- * Revision 1.2.45.1 1997/03/27 18:46:16 barbou
- * ri-osc CR1557: re-enable thread-specific breakpoints.
- * [1995/09/20 15:23:46 bolinger]
- * [97/02/25 barbou]
- *
- * Revision 1.2.21.6 1996/01/09 19:15:21 devrcs
- * Changed declarations of 'register foo' to 'register int foo'
- * Fixed printfs which print addresses.
- * [1995/12/01 21:41:51 jfraser]
- *
- * Merged '64-bit safe' changes from DEC alpha port.
- * [1995/11/21 18:02:40 jfraser]
- *
- * Revision 1.2.21.5 1995/04/07 18:52:54 barbou
- * Allow breakpoints on non-resident pages. The breakpoint will
- * actually be set when the page is paged in.
- * [93/09/23 barbou]
- * [95/03/08 barbou]
- *
- * Revision 1.2.21.4 1995/02/23 21:43:19 alanl
- * Merged with DIPC2_SHARED.
- * [1995/01/04 20:15:04 alanl]
- *
- * Revision 1.2.28.1 1994/11/04 09:52:15 dwm
- * mk6 CR668 - 1.3b26 merge
- * * Revision 1.2.4.5 1994/05/06 18:38:52 tmt
- * Merged osc1.3dec/shared with osc1.3b19
- * Moved struct db_breakpoint from here to db_break.h.
- * Merge Alpha changes into osc1.312b source code.
- * 64bit cleanup.
- * * End1.3merge
- * [1994/11/04 08:49:10 dwm]
- *
- * Revision 1.2.21.2 1994/09/23 01:17:57 ezf
- * change marker to not FREE
- * [1994/09/22 21:09:19 ezf]
- *
- * Revision 1.2.21.1 1994/06/11 21:11:24 bolinger
- * Merge up to NMK17.2.
- * [1994/06/11 20:01:06 bolinger]
- *
- * Revision 1.2.25.2 1994/10/28 18:56:21 rwd
- * Delint.
- * [94/10/28 rwd]
- *
- * Revision 1.2.25.1 1994/08/04 01:42:15 mmp
- * 23-Jun-94 Stan Smith (stans@ssd.intel.com)
- * Let d * delete all breakpoints.
- * [1994/06/28 13:54:00 sjs]
- *
- * Revision 1.2.19.2 1994/04/11 09:34:22 bernadat
- * Moved db_breakpoint struct declaration to db_break.h
- * [94/03/16 bernadat]
- *
- * Revision 1.2.19.1 1994/02/08 10:57:22 bernadat
- * When setting a breakpoint, force user_space if breakpoint is
- * outside kernel_space (like in the case of an emulator).
- * [93/09/27 paire]
- *
- * Changed silly decimal display to hex (to match input conventions).
- * Change from NORMA_MK14.6 [93/01/09 sjs]
- * [93/07/16 bernadat]
- * [94/02/07 bernadat]
- *
- * Revision 1.2.4.3 1993/07/27 18:26:48 elliston
- * Add ANSI prototypes. CR #9523.
- * [1993/07/27 18:10:54 elliston]
- *
- * Revision 1.2.4.2 1993/06/09 02:19:39 gm
- * Added to OSF/1 R1.3 from NMK15.0.
- * [1993/06/02 20:55:42 jeffc]
- *
- * Revision 1.2 1993/04/19 16:01:31 devrcs
- * Changes from MK78:
- * Removed unused variable from db_delete_cmd().
- * Added declaration for arg 'count' of db_add_thread_breakpoint().
- * [92/05/18 jfriedl]
- * Fixed b/tu to b/Tu work if the specified address is valid in the
- * target address space but not the current user space. Explicit
- * user space breakpoints (b/u, b/Tu, etc) will no longer get
- * inserted into the kernel if the specified address is invalid.
- * [92/04/18 danner]
- * [92/12/18 bruel]
- *
- * Revision 1.1 1992/09/30 02:00:52 robert
- * Initial revision
- *
- * $EndLog$
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
-/* CMU_HIST */
/*
- * Revision 2.11.3.1 92/03/03 16:13:20 jeffreyh
- * Pick up changes from TRUNK
- * [92/02/26 10:58:37 jeffreyh]
- *
- * Revision 2.12 92/02/19 16:46:24 elf
- * Removed one of the many user-unfriendlinesses.
- * [92/02/10 17:48:25 af]
- *
- * Revision 2.11 91/11/12 11:50:24 rvb
- * Fixed db_delete_cmd so that just "d" works in user space.
- * [91/10/31 rpd]
- * Fixed db_delete_thread_breakpoint for zero task_thd.
- * [91/10/30 rpd]
- *
- * Revision 2.10 91/10/09 15:57:41 af
- * Supported thread-oriented break points.
- * [91/08/29 tak]
- *
- * Revision 2.9 91/07/09 23:15:39 danner
- * Conditionalized db_map_addr to work right on the luna. Used a
- * ifdef luna88k. This is evil, and needs to be fixed.
- * [91/07/08 danner]
- *
- * Revision 2.2 91/04/10 22:54:50 mbj
- * Grabbed 3.0 copyright/disclaimer since ddb comes from 3.0.
- * [91/04/09 rvb]
- *
- * Revision 2.7 91/02/05 17:06:00 mrt
- * Changed to new Mach copyright
- * [91/01/31 16:17:01 mrt]
- *
- * Revision 2.6 91/01/08 15:09:03 rpd
- * Added db_map_equal, db_map_current, db_map_addr.
- * [90/11/10 rpd]
- *
- * Revision 2.5 90/11/05 14:26:32 rpd
- * Initialize db_breakpoints_inserted to TRUE.
- * [90/11/04 rpd]
- *
- * Revision 2.4 90/10/25 14:43:33 rwd
- * Added map field to breakpoints.
- * Added map argument to db_set_breakpoint, db_delete_breakpoint,
- * db_find_breakpoint. Added db_find_breakpoint_here.
- * [90/10/18 rpd]
- *
- * Revision 2.3 90/09/28 16:57:07 jsb
- * Fixed db_breakpoint_free.
- * [90/09/18 rpd]
- *
- * Revision 2.2 90/08/27 21:49:53 dbg
- * Reflected changes in db_printsym()'s calling seq.
- * [90/08/20 af]
- * Clear breakpoints only if inserted.
- * Reduce lint.
- * [90/08/07 dbg]
- * Created.
- * [90/07/25 dbg]
- *
- */
-/* CMU_ENDHIST */
-/*
- * 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.
+ * @OSF_COPYRIGHT@
*/
/*
*/
static db_thread_breakpoint_t db_find_thread_breakpoint(
db_breakpoint_t bkpt,
- thread_act_t thr_act);
+ thread_t thr_act);
static void db_force_delete_breakpoint(
db_breakpoint_t bkpt,
static db_thread_breakpoint_t
db_find_thread_breakpoint(
db_breakpoint_t bkpt,
- thread_act_t thr_act)
+ thread_t thr_act)
{
register db_thread_breakpoint_t tp;
register task_t task =
- (thr_act == THR_ACT_NULL || thr_act->kernel_loaded)
+ (thr_act == THREAD_NULL)
? TASK_NULL : thr_act->task;
for (tp = bkpt->threads; tp; tp = tp->tb_next) {
if ((tbp->tb_is_task &&
db_lookup_task((task_t)(tbp->tb_task_thd)) < 0) ||
(!tbp->tb_is_task &&
- db_lookup_act((thread_act_t)(tbp->tb_task_thd)) < 0)) {
+ db_lookup_act((thread_t)(tbp->tb_task_thd)) < 0)) {
db_force_delete_breakpoint(bkpt,
tbp->tb_task_thd, tbp->tb_is_task);
}
task_t task,
db_addr_t addr,
int count,
- thread_act_t thr_act,
+ thread_t thr_act,
boolean_t task_bpt)
{
register db_breakpoint_t bkpt;
bkpt = db_find_breakpoint(task, addr);
if (bkpt) {
- if (thr_act == THR_ACT_NULL
+ if (thr_act == THREAD_NULL
|| db_find_thread_breakpoint(bkpt, thr_act)) {
db_printf("Already set.\n");
return;
} else {
if (!DB_CHECK_ACCESS(addr, BKPT_SIZE, task)) {
if (task) {
- db_printf("Warning: non-resident page for breakpoint at %lX",
- addr);
+ db_printf("Warning: non-resident page for breakpoint at %llX",
+ (unsigned long long)addr);
db_printf(" in task %lX.\n", task);
} else {
- db_printf("Cannot set breakpoint at %lX in kernel space.\n",
- addr);
+ db_printf("Cannot set breakpoint at %llX in kernel space.\n",
+ (unsigned long long)addr);
return;
}
}
return;
}
bkpt->task = task;
- bkpt->flags = (task && thr_act == THR_ACT_NULL)?
+ bkpt->flags = (task && thr_act == THREAD_NULL)?
(BKPT_USR_GLOBAL|BKPT_1ST_SET): 0;
bkpt->address = addr;
bkpt->threads = 0;
register db_breakpoint_t bkpt;
register task_t task;
db_expr_t inst;
- thread_act_t cur_act = current_act();
+ thread_t cur_act = current_act();
task_t cur_task =
- (cur_act && !cur_act->kernel_loaded) ?
+ (cur_act) ?
cur_act->task : TASK_NULL;
boolean_t inserted = TRUE;
register db_breakpoint_t bkpt, *bkptp;
register task_t task;
db_expr_t inst;
- thread_act_t cur_act = current_act();
- task_t cur_task = (cur_act && !cur_act->kernel_loaded) ?
+ thread_t cur_act = current_act();
+ task_t cur_task = (cur_act) ?
cur_act->task: TASK_NULL;
if (db_breakpoints_inserted) {
else
db_printf("task%03d ", task_id);
} else {
- thread_act_t thd = (thread_act_t)(tp->tb_task_thd);
+ thread_t thd = (thread_t)(tp->tb_task_thd);
task_id = db_lookup_task(thd->task);
act_id = db_lookup_task_act(thd->task, thd);
if (task_id < 0 || act_id < 0)
db_delete_cmd(void)
{
register int n;
- thread_act_t thr_act;
+ thread_t thr_act;
vm_offset_t task_thd;
boolean_t user_global = FALSE;
boolean_t task_bpt = FALSE;
user_space = TRUE;
}
if (!DB_VALID_ADDRESS(addr, user_space)) {
- db_printf("Address %#X is not in %s space\n", addr,
+ db_printf("Address %#llX is not in %s space\n", (unsigned long long)addr,
(user_space)? "user": "kernel");
db_error(0);
}
if (thd_bpt || task_bpt) {
for (n = 0; db_get_next_act(&thr_act, n); n++) {
- if (thr_act == THR_ACT_NULL)
+ if (thr_act == THREAD_NULL)
db_error("No active thr_act\n");
if (task_bpt) {
if (thr_act->task == TASK_NULL)
(db_addr_t)addr, task_thd);
}
} else {
- db_delete_breakpoint(db_target_space(THR_ACT_NULL, user_space),
+ db_delete_breakpoint(db_target_space(THREAD_NULL, user_space),
(db_addr_t)addr, 0);
}
}
char * modif)
{
register int n;
- thread_act_t thr_act;
+ thread_t thr_act;
boolean_t user_global = db_option(modif, 'U');
boolean_t task_bpt = db_option(modif, 'T');
boolean_t user_space;
if (user_space)
db_error("Invalid user space address\n");
user_space = TRUE;
- db_printf("%#X is in user space\n", addr);
+ db_printf("%#llX is in user space\n", (unsigned long long)addr);
#ifdef ppc
db_printf("kernel is from %#X to %#x\n", VM_MIN_KERNEL_ADDRESS, vm_last_addr);
#else
}
if (db_option(modif, 't') || task_bpt) {
for (n = 0; db_get_next_act(&thr_act, n); n++) {
- if (thr_act == THR_ACT_NULL)
+ if (thr_act == THREAD_NULL)
db_error("No active thr_act\n");
if (task_bpt && thr_act->task == TASK_NULL)
db_error("No task\n");
db_error("Cannot set break point in inactive user space\n");
db_set_breakpoint(db_target_space(thr_act, user_space),
(db_addr_t)addr, count,
- (user_global)? THR_ACT_NULL: thr_act,
+ (user_global)? THREAD_NULL: thr_act,
task_bpt);
}
} else {
- db_set_breakpoint(db_target_space(THR_ACT_NULL, user_space),
+ db_set_breakpoint(db_target_space(THREAD_NULL, user_space),
(db_addr_t)addr,
- count, THR_ACT_NULL, FALSE);
+ count, THREAD_NULL, FALSE);
}
}
projects / apple / xnu.git / blobdiff