X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..378393581903b274cb7a4d18e0d978071a6b592d:/osfmk/ddb/db_macro.c

diff --git a/osfmk/ddb/db_macro.c b/osfmk/ddb/db_macro.c
index 84e69782c..5365f9c6d 100644
--- a/osfmk/ddb/db_macro.c
+++ b/osfmk/ddb/db_macro.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -22,80 +22,6 @@
 /*
  * @OSF_COPYRIGHT@
  */
-/*
- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:48  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:26:09  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.2.10.4  1996/01/09  19:15:54  devrcs
- * 	Change 'register foo' to 'register int foo'.
- * 	[1995/12/01  21:42:14  jfraser]
- *
- * 	Merged '64-bit safe' changes from DEC alpha port.
- * 	[1995/11/21  18:03:15  jfraser]
- *
- * Revision 1.2.10.3  1995/01/06  19:10:28  devrcs
- * 	mk6 CR668 - 1.3b26 merge
- * 	fix typing
- * 	[1994/11/04  08:49:38  dwm]
- * 
- * Revision 1.2.10.2  1994/09/23  01:20:19  ezf
- * 	change marker to not FREE
- * 	[1994/09/22  21:10:23  ezf]
- * 
- * Revision 1.2.10.1  1994/06/11  21:11:52  bolinger
- * 	Merge up to NMK17.2.
- * 	[1994/06/11  20:01:51  bolinger]
- * 
- * Revision 1.2.8.1  1994/02/08  10:58:03  bernadat
- * 	Fixed reinitialization of db_macro_level to -1.
- * 	Put DB_MACRO_LEVEL and DB_NARGS macros to <ddb/db_variables.h>.
- * 	Changed name of DB_NARGS to DB_MACRO_NARGS.
- * 	Added support of DB_VAR_SHOW.
- * 	[93/08/12            paire]
- * 	[94/02/07            bernadat]
- * 
- * Revision 1.2.2.4  1993/08/11  20:37:58  elliston
- * 	Add ANSI Prototypes.  CR #9523.
- * 	[1993/08/11  03:33:33  elliston]
- * 
- * Revision 1.2.2.3  1993/07/27  18:27:42  elliston
- * 	Add ANSI prototypes.  CR #9523.
- * 	[1993/07/27  18:12:24  elliston]
- * 
- * Revision 1.2.2.2  1993/06/09  02:20:18  gm
- * 	Added to OSF/1 R1.3 from NMK15.0.
- * 	[1993/06/02  20:56:40  jeffc]
- * 
- * Revision 1.2  1993/04/19  16:02:25  devrcs
- * 	Changes from mk78:
- * 	Removed unused variable from db_exec_macro().
- * 	Added include of <ddb/db_command.h>.
- * 	[92/05/16            jfriedl]
- * 	[93/02/02            bruel]
- * 
- * Revision 1.1  1992/09/30  02:01:12  robert
- * 	Initial revision
- * 
- * $EndLog$
- */
-/* CMU_HIST */
-/*
- * Revision 2.2  91/10/09  16:01:09  af
- * 	 Revision 2.1.3.1  91/10/05  13:06:40  jeffreyh
- * 	 	Created for macro support.
- * 	 	[91/08/29            tak]
- * 
- * Revision 2.1.3.1  91/10/05  13:06:40  jeffreyh
- * 	Created for macro support.
- * 	[91/08/29            tak]
- * 
- */
-/* CMU_ENDHIST */
 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
@@ -275,12 +201,12 @@ db_arg_variable(
 
 	if (flag == DB_VAR_SHOW) {
 	    value = db_macro_args[ap->hidden_level][ap->suffix[0]-1];
-	    db_printf("%#n", value);
+	    db_printf("%#lln", (unsigned long long)value);
 	    db_find_xtrn_task_sym_and_offset(value, &name, &offset, TASK_NULL);
 	    if (name != (char *)0 && offset <= db_maxoff && offset != value) {
 		db_printf("\t%s", name);
 		if (offset != 0)
-		    db_printf("+%#r", offset);
+		    db_printf("+%#llr", (unsigned long long)offset);
 	    }
 	    return(0);
 	}