xnu-792.21.3.tar.gz

[apple/xnu.git] / osfmk / ddb / db_aout.c

diff --git a/osfmk/ddb/db_aout.c b/osfmk/ddb/db_aout.c
index 7c02d170cd297cad5c8c54936c751b76a23bae38..d5eaab0cf3f8bd4d00250407510ab9dd2e63f385 100644 (file)
--- a/osfmk/ddb/db_aout.c
+++ b/osfmk/ddb/db_aout.c
@@ -1,16 +1,19 @@
 /*
 /*

- * 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.
+ * @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
  * 
  * 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.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -59,9 +62,11 @@
 /*
  * Symbol table routines for a.out format files.
  */
 /*
  * Symbol table routines for a.out format files.
  */

+#include <mach/mach_types.h>

 #include <mach/boolean.h>
 #include <mach/std_types.h>
 #include <machine/db_machdep.h>                /* data types */
 #include <mach/boolean.h>
 #include <mach/std_types.h>
 #include <machine/db_machdep.h>                /* data types */

+#include <vm/pmap.h>

 #include <string.h>                    /* For strcpy(), strcmp() */
 #include <ddb/db_aout.h>
 #include <ddb/db_output.h>             /* For db_printf() */
 #include <string.h>                    /* For strcpy(), strcmp() */
 #include <ddb/db_aout.h>
 #include <ddb/db_output.h>             /* For db_printf() */


@@ -663,7 +668,7 @@ aout_db_search_symbol(
        db_strategy_t   strategy,
        db_expr_t       *diffp)         /* in/out */
 {
        db_strategy_t   strategy,
        db_expr_t       *diffp)         /* in/out */
 {

-       register unsigned long  diff = *diffp;
+       db_expr_t diff = *diffp;

        register struct nlist   *symp = 0;
        struct nlist            *sp, *ep, *cp;
        boolean_t               first_pass = FALSE;
        register struct nlist   *symp = 0;
        struct nlist            *sp, *ep, *cp;
        boolean_t               first_pass = FALSE;