/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_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
+ * @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 OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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@
+ * @APPLE_OSREFERENCE_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)
- *
- * Revision 1.2 1998/04/24 19:34:23 semeria
- * KDP and KDB support
- *
- * Revision 1.1.1.1 1998/03/07 02:26:09 wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.2.42.2 1997/09/12 17:15:15 stephen
- * make x/x do zero fill right justified hex display
- * [1997/09/12 16:31:04 stephen]
- *
- * Revision 1.2.42.1 1997/03/27 18:46:31 barbou
- * Add 'p' option to the "examine" command - values in
- * memory treated as addresses and rendered as sym+offset
- * [1995/12/29 21:32:33 mod]
- * ri-osc CR1560: make search command output address of any matching
- * data it finds (so user knows it did something).
- * [1995/09/20 15:24:55 bolinger]
- * [97/02/25 barbou]
- *
- * Revision 1.2.25.5 1996/01/09 19:15:38 devrcs
- * Add db_print_loc() & db_print_inst() functions.
- * Make 'l' display 32 bits and new 'q' to display 64 bits.
- * Allow 'u' to display unsigned decimal values (same as 'U').
- * Changed declarations of 'register foo' to 'register int foo'.
- * [1995/12/01 21:42:03 jfraser]
- *
- * Merged '64-bit safe' changes from DEC alpha port.
- * [1995/11/21 18:02:58 jfraser]
- *
- * Revision 1.2.25.4 1995/06/13 18:21:27 sjs
- * Merge with flipc_shared.
- * [95/05/22 sjs]
- *
- * Revision 1.2.30.1 1995/04/03 17:35:17 randys
- * Minor change; allow a repeat count to work properly when multiple
- * modifier flags are given to the ddb 'x' command. This allows,
- * for instance, examination of multiple words in activations other
- * than the current one.
- * [95/04/03 randys]
- *
- * Revision 1.2.25.3 1995/01/06 19:10:09 devrcs
- * mk6 CR668 - 1.3b26 merge
- * * Revision 1.2.6.7 1994/05/06 18:39:09 tmt
- * Merged osc1.3dec/shared with osc1.3b19
- * Merge Alpha changes into osc1.312b source code.
- * 64bit cleanup.
- * * End1.3merge
- * [1994/11/04 08:49:22 dwm]
- *
- * Revision 1.2.25.2 1994/09/23 01:18:44 ezf
- * change marker to not FREE
- * [1994/09/22 21:09:44 ezf]
- *
- * Revision 1.2.25.1 1994/06/11 21:11:43 bolinger
- * Merge up to NMK17.2.
- * [1994/06/11 20:01:31 bolinger]
- *
- * Revision 1.2.23.1 1994/02/08 10:57:47 bernadat
- * Fixed output of an examine command to have a power of 2
- * number of fields.
- * [93/09/29 paire]
- *
- * Added dump of hexadecimal address in each line of examine command.
- * Fixed beginning of line to be always located at position 0.
- * [93/08/11 paire]
- * [94/02/07 bernadat]
- *
- * Revision 1.2.21.4 1994/03/17 22:35:27 dwm
- * The infamous name change: thread_activation + thread_shuttle = thread.
- * [1994/03/17 21:25:43 dwm]
- *
- * Revision 1.2.21.3 1994/01/12 17:50:40 dwm
- * Coloc: initial restructuring to follow Utah model.
- * [1994/01/12 17:13:08 dwm]
- *
- * Revision 1.2.21.2 1993/10/12 16:38:58 dwm
- * Print '\n' in x/s statements. [rwd]
- * [1993/10/12 16:14:41 dwm]
- *
- * Revision 1.2.6.5 1993/08/11 20:37:37 elliston
- * Add ANSI Prototypes. CR #9523.
- * [1993/08/11 03:33:05 elliston]
- *
- * Revision 1.2.6.4 1993/08/09 19:34:42 dswartz
- * Add ANSI prototypes - CR#9523
- * [1993/08/06 15:47:32 dswartz]
- *
- * Revision 1.2.6.3 1993/07/27 18:27:07 elliston
- * Add ANSI prototypes. CR #9523.
- * [1993/07/27 18:11:21 elliston]
- *
- * Revision 1.2.6.2 1993/06/09 02:20:00 gm
- * Added to OSF/1 R1.3 from NMK15.0.
- * [1993/06/02 20:56:10 jeffc]
- *
- * Revision 1.2 1993/04/19 16:01:58 devrcs
- * Changes from mk78:
- * Added void type to functions that needed it.
- * Added init to 'size' in db_search_cmd(). Removed unused variables.
- * Other cleanup to quiet gcc warnings.
- * [92/05/16 jfriedl]
- * x/u now examines current user space. x/t still examines user
- * space of the the specified thread. x/tu is redundant.
- * To examine an value as unsigned decimal, use x/U.
- * [92/04/18 danner]
- * [93/02/02 bruel]
- *
- * Remember count argument when repeating commands instead of the
- * default command, also apply all the formats to current address
- * instead of incrementing addresses when switching to next format.
- * [barbou@gr.osf.org]
- *
- * Support 'A' format for print 'p' command [barbou@gr.osf.org]
- * [92/12/03 bernadat]
- *
- * Revision 1.1 1992/09/30 02:01:01 robert
- * Initial revision
- *
- * $EndLog$
- */
-/* CMU_HIST */
-/*
- * Revision 2.7 91/10/09 15:59:28 af
- * Revision 2.6.1.1 91/10/05 13:05:49 jeffreyh
- * Supported non current task space data examination and search.
- * Added 'm' format and db_xcdump to print with hex and characters.
- * Added db_examine_{forward, backward}.
- * Changed db_print_cmd to support variable number of parameters
- * including string constant.
- * Included "db_access.h".
- * [91/08/29 tak]
- *
- * Revision 2.6.1.1 91/10/05 13:05:49 jeffreyh
- * Supported non current task space data examination and search.
- * Added 'm' format and db_xcdump to print with hex and characters.
- * Added db_examine_{forward, backward}.
- * Changed db_print_cmd to support variable number of parameters
- * including string constant.
- * Included "db_access.h".
- * [91/08/29 tak]
- *
- * Revision 2.6 91/08/28 11:11:01 jsb
- * Added 'A' flag to examine: just like 'a' (address), but prints addr
- * as a procedure type, thus printing file/line info if available.
- * Useful when called as 'x/Ai'.
- * [91/08/13 18:14:55 jsb]
- *
- * Revision 2.5 91/05/14 15:33:31 mrt
- * Correcting copyright
- *
- * Revision 2.4 91/02/05 17:06:20 mrt
- * Changed to new Mach copyright
- * [91/01/31 16:17:37 mrt]
- *
- * Revision 2.3 90/11/07 16:49:23 rpd
- * Added db_search_cmd, db_search.
- * [90/11/06 rpd]
- *
- * Revision 2.2 90/08/27 21:50:38 dbg
- * Add 'r', 'z' to print and examine formats.
- * Change calling sequence of db_disasm.
- * db_examine sets db_prev and db_next instead of explicitly
- * advancing dot.
- * [90/08/20 dbg]
- * Reflected changes in db_printsym()'s calling seq.
- * [90/08/20 af]
- * Reduce lint.
- * [90/08/07 dbg]
- * Created.
- * [90/07/25 dbg]
- *
- */
-/* CMU_ENDHIST */
/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include <string.h> /* For strcpy() */
+#include <string.h> /* For strlcpy() */
#include <mach/boolean.h>
#include <machine/db_machdep.h>
char db_examine_format[TOK_STRING_SIZE] = "x";
int db_examine_count = 1;
db_addr_t db_examine_prev_addr = 0;
-thread_act_t db_examine_act = THR_ACT_NULL;
+thread_t db_examine_act = THREAD_NULL;
extern int db_max_width;
int *items,
int *remainder);
+extern char db_last_modifier[];
+
/*
* Examine (print) data.
*/
void
-db_examine_cmd(
- db_expr_t addr,
- int have_addr,
- db_expr_t count,
- char * modif)
+db_examine_cmd(db_expr_t addr, __unused boolean_t have_addr, db_expr_t count,
+ char *modif)
{
- thread_act_t thr_act;
- extern char db_last_modifier[];
+ thread_t thr_act;
if (modif[0] != '\0')
- strcpy(db_examine_format, modif);
+ strlcpy(db_examine_format, modif, TOK_STRING_SIZE);
- if (count == -1)
+ if (count == (db_expr_t)-1)
count = 1;
db_examine_count = count;
if (db_option(modif, 't')) {
return;
} else
if (db_option(modif,'u'))
- thr_act = current_act();
+ thr_act = current_thread();
else
- thr_act = THR_ACT_NULL;
+ thr_act = THREAD_NULL;
db_examine_act = thr_act;
db_examine((db_addr_t) addr, db_examine_format, count,
}
void
-db_examine_forward(
- db_expr_t addr,
- int have_addr,
- db_expr_t count,
- char * modif)
+db_examine_forward(__unused db_expr_t addr, __unused boolean_t have_addr,
+ __unused db_expr_t count, __unused char *modif)
{
db_examine(db_next, db_examine_format, db_examine_count,
db_act_to_task(db_examine_act));
}
void
-db_examine_backward(
- db_expr_t addr,
- int have_addr,
- db_expr_t count,
- char * modif)
+db_examine_backward(__unused db_expr_t addr, __unused boolean_t have_addr,
+ __unused db_expr_t count, __unused char *modif)
{
db_examine(db_examine_prev_addr - (db_next - db_examine_prev_addr),
db_examine_format, db_examine_count,
int width;
int leader;
int items;
- int nitems;
+ int nitems = 0;
char * fp;
- db_addr_t next_addr;
+ db_addr_t next_addr = 0;
int sz;
db_examine_prev_addr = addr;
db_find_task_sym_and_offset(addr,&name,&off,task);
if (off == 0)
db_printf("\r%s:\n", name);
- db_printf("%#n: ", addr);
+ db_printf("%#lln: ", (unsigned long long)addr);
for (sz = 0; sz < leader; sz++)
db_putchar(' ');
db_prev = addr;
sizeof(db_expr_t), FALSE, task );
db_find_task_sym_and_offset( value,
&symName, &offset, task);
- db_printf("\n\t*%8x(%8X) = %s",
- next_addr, value, symName );
+ db_printf("\n\t*%8llX(%8llX) = %s",
+ (unsigned long long)next_addr, (unsigned long long)value, symName );
if( offset ) {
- db_printf("+%X", offset );
+ db_printf("+%llX", (unsigned long long)offset );
}
next_addr += size;
}
break;
case 'r': /* signed, current radix */
for (sz = size, next_addr = addr;
- sz >= sizeof (db_expr_t);
+ sz >= (signed)sizeof (db_expr_t);
sz -= sizeof (db_expr_t)) {
if (nitems-- == 0) {
db_putchar('\n');
value = db_get_task_value(next_addr,
sizeof (db_expr_t),
TRUE,task);
- db_printf("%-*r", width, value);
+ db_printf("%-*llr", width, (unsigned long long)value);
next_addr += sizeof (db_expr_t);
}
if (sz > 0) {
}
value = db_get_task_value(next_addr, sz,
TRUE, task);
- db_printf("%-*R", width, value);
+ db_printf("%-*llR", width, (unsigned long long)value);
next_addr += sz;
}
break;
-#ifdef APPLE
case 'X': /* unsigned hex */
-#endif
case 'x': /* unsigned hex */
for (sz = size, next_addr = addr;
- sz >= sizeof (db_expr_t);
+ sz >= (signed)sizeof (db_expr_t);
sz -= sizeof (db_expr_t)) {
if (nitems-- == 0) {
db_putchar('\n');
value = db_get_task_value(next_addr,
sizeof (db_expr_t),
FALSE,task);
-#ifdef APPLE
if ( c == 'X')
- db_printf("%0*X ", 2*size, value);
+ db_printf("%0*llX ", 2*size, (unsigned long long)value);
else
- db_printf("%-*x", width, value);
-#else
- db_printf("%-*x", width, value);
-#endif
+ db_printf("%-*llx", width, (unsigned long long)value);
next_addr += sizeof (db_expr_t);
}
if (sz > 0) {
}
value = db_get_task_value(next_addr, sz,
FALSE, task);
-#ifdef APPLE
if ( c == 'X')
- db_printf("%0*X ", 2*size, value);
+ db_printf("%0*llX ", 2*size, (unsigned long long)value);
else
- db_printf("%-*X", width, value);
-#else
- db_printf("%-*X", width, value);
-#endif
+ db_printf("%-*llX", width, (unsigned long long)value);
next_addr += sz;
}
break;
case 'z': /* signed hex */
for (sz = size, next_addr = addr;
- sz >= sizeof (db_expr_t);
+ sz >= (signed)sizeof (db_expr_t);
sz -= sizeof (db_expr_t)) {
if (nitems-- == 0) {
db_putchar('\n');
value = db_get_task_value(next_addr,
sizeof (db_expr_t),
TRUE, task);
- db_printf("%-*z", width, value);
+ db_printf("%-*llz", width, (unsigned long long)value);
next_addr += sizeof (db_expr_t);
}
if (sz > 0) {
}
value = db_get_task_value(next_addr,sz,
TRUE,task);
- db_printf("%-*Z", width, value);
+ db_printf("%-*llZ", width, (unsigned long long)value);
next_addr += sz;
}
break;
case 'd': /* signed decimal */
for (sz = size, next_addr = addr;
- sz >= sizeof (db_expr_t);
+ sz >= (signed)sizeof (db_expr_t);
sz -= sizeof (db_expr_t)) {
if (nitems-- == 0) {
db_putchar('\n');
value = db_get_task_value(next_addr,
sizeof (db_expr_t),
TRUE,task);
- db_printf("%-*d", width, value);
+ db_printf("%-*lld", width, (unsigned long long)value);
next_addr += sizeof (db_expr_t);
}
if (sz > 0) {
}
value = db_get_task_value(next_addr, sz,
TRUE, task);
- db_printf("%-*D", width, value);
+ db_printf("%-*llD", width, (unsigned long long)value);
next_addr += sz;
}
break;
case 'U': /* unsigned decimal */
case 'u':
for (sz = size, next_addr = addr;
- sz >= sizeof (db_expr_t);
+ sz >= (signed)sizeof (db_expr_t);
sz -= sizeof (db_expr_t)) {
if (nitems-- == 0) {
db_putchar('\n');
value = db_get_task_value(next_addr,
sizeof (db_expr_t),
FALSE,task);
- db_printf("%-*u", width, value);
+ db_printf("%-*llu", width, (unsigned long long)value);
next_addr += sizeof (db_expr_t);
}
if (sz > 0) {
}
value = db_get_task_value(next_addr, sz,
FALSE, task);
- db_printf("%-*U", width, value);
+ db_printf("%-*llU", width, (unsigned long long)value);
next_addr += sz;
}
break;
case 'o': /* unsigned octal */
for (sz = size, next_addr = addr;
- sz >= sizeof (db_expr_t);
+ sz >= (signed)sizeof (db_expr_t);
sz -= sizeof (db_expr_t)) {
if (nitems-- == 0) {
db_putchar('\n');
value = db_get_task_value(next_addr,
sizeof (db_expr_t),
FALSE,task);
- db_printf("%-*o", width, value);
+ db_printf("%-*llo", width, (unsigned long long)value);
next_addr += sizeof (db_expr_t);
}
if (sz > 0) {
}
value = db_get_task_value(next_addr, sz,
FALSE, task);
- db_printf("%-*o", width, value);
+ db_printf("%-*llo", width, (unsigned long long)value);
next_addr += sz;
}
break;
if ((value >= ' ' && value <= '~') ||
value == '\n' ||
value == '\t')
- db_printf("%c", value);
+ db_printf("%llc", (unsigned long long)value);
else
- db_printf("\\%03o", value);
+ db_printf("\\%03llo", (unsigned long long)value);
}
break;
case 's': /* null-terminated string */
if (value == 0)
break;
if (value >= ' ' && value <= '~')
- db_printf("%c", value);
+ db_printf("%llc", (unsigned long long)value);
else
- db_printf("\\%03o", value);
+ db_printf("\\%03llo", (unsigned long long)value);
}
break;
case 'i': /* instruction */
task);
break;
case 'r':
- db_printf("%11r", value);
+ db_printf("%11llr", (unsigned long long)value);
+ break;
+ case 'X':
+ db_printf("%016llX", (unsigned long long)value);
break;
case 'x':
- db_printf("%08x", value);
+ db_printf("%016llx", (unsigned long long)value);
break;
case 'z':
- db_printf("%8z", value);
+ db_printf("%16llz", (unsigned long long)value);
break;
case 'd':
- db_printf("%11d", value);
+ db_printf("%11lld", (unsigned long long)value);
break;
case 'u':
- db_printf("%11u", value);
+ db_printf("%11llu", (unsigned long long)value);
break;
case 'o':
- db_printf("%16o", value);
+ db_printf("%16llo", (unsigned long long)value);
break;
case 'c':
value = value & 0xFF;
if (value >= ' ' && value <= '~')
- db_printf("%c", value);
+ db_printf("%llc", (unsigned long long)value);
else
- db_printf("\\%03o", value);
+ db_printf("\\%03llo", (unsigned long long)value);
break;
default:
db_printf("Unknown format %c\n", db_print_format);
db_expr_t value;
db_expr_t mask;
db_addr_t count;
- thread_act_t thr_act;
+ thread_t thr_act;
boolean_t thread_flag = FALSE;
register char *p;
if (!db_get_next_act(&thr_act, 0))
return;
} else
- thr_act = THR_ACT_NULL;
+ thr_act = THREAD_NULL;
db_search(addr, size, value, mask, count, db_act_to_task(thr_act));
}
break;
addr += size;
}
- db_printf("0x%x: ", addr);
+ db_printf("0x%llx: ", (unsigned long long)addr);
db_next = addr;
}
db_printf("%s:\n", name);
off = -1;
}
- db_printf("%0*X:%s", 2*sizeof(db_addr_t), addr,
+ db_printf("%0*llX:%s", 2*sizeof(db_addr_t),(unsigned long long) addr,
(size != 1) ? " " : "" );
bcount = ((n > DB_XCDUMP_NC)? DB_XCDUMP_NC: n);
- if (trunc_page(addr) != trunc_page(addr+bcount-1)) {
- db_addr_t next_page_addr = trunc_page(addr+bcount-1);
+ if (trunc_page_32(addr) != trunc_page_32(addr+bcount-1)) {
+ db_addr_t next_page_addr = trunc_page_32(addr+bcount-1);
if (!DB_CHECK_ACCESS(next_page_addr, sizeof(int), task))
bcount = next_page_addr - addr;
}
if (i % 4 == 0)
db_printf(" ");
value = db_get_task_value(addr, size, FALSE, task);
- db_printf("%0*x ", size*2, value);
+ db_printf("%0*llX ", size*2, (unsigned long long)value);
addr += size;
db_find_task_sym_and_offset(addr, &name, &off, task);
}
db_printf("%s*", (size != 1)? " ": "");
for (i = 0; i < bcount; i++) {
value = data[i];
- db_printf("%c", (value >= ' ' && value <= '~')? value: '.');
+ db_printf("%llc", (value >= ' ' && value <= '~')? (unsigned long long)value: (unsigned long long)'.');
}
db_printf("*\n");
}
projects / apple / xnu.git / blobdiff