X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b4c24cb9d3df001f2892dc4ed451bc769ff28a9f..d7e50217d7adf6e52786a38bcaa4cd698cb9a79e:/osfmk/ppc/db_machdep.h?ds=sidebyside

diff --git a/osfmk/ppc/db_machdep.h b/osfmk/ppc/db_machdep.h
index fb95f0608..cde656d26 100644
--- a/osfmk/ppc/db_machdep.h
+++ b/osfmk/ppc/db_machdep.h
@@ -3,19 +3,22 @@
  *
  * @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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 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@
  */
@@ -65,8 +68,8 @@
 #include <ppc/proc_reg.h>
 #include <ppc/savearea.h>
 
-typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
-typedef	int		db_expr_t;	/* expression - signed */
+typedef	addr64_t db_addr_t;	/* address - unsigned */
+typedef	uint64_t db_expr_t;	/* expression - signed???  try unsigned */
 
 typedef struct savearea db_regs_t;
 db_regs_t	ddb_regs;	/* register state */
@@ -101,7 +104,7 @@ int db_inst_store(unsigned long);
 	db_phys_eq(task1,addr1,task2,addr2)
 #define DB_VALID_KERN_ADDR(addr)				\
 	((addr) >= VM_MIN_KERNEL_ADDRESS && 			\
-	 (addr) < VM_MAX_KERNEL_ADDRESS)
+	 (addr) < vm_last_addr)
 #define DB_VALID_ADDRESS(addr,user)				\
 	((!(user) && DB_VALID_KERN_ADDR(addr)) ||		\
 	 ((user) && (addr) < VM_MAX_ADDRESS))
@@ -127,10 +130,6 @@ extern db_addr_t	db_disasm(
 				db_addr_t	loc,
 				boolean_t	altfmt,
 				task_t		task);
-extern vm_offset_t	db_kvtophys( 
-				space_t space,
-				vm_offset_t va);
-
 extern void		db_read_bytes(
 				vm_offset_t	addr,
 				int		size,
@@ -183,11 +182,6 @@ extern void		kdb_on(
 				int			cpu);
 extern void		cnpollc(
 				boolean_t		on);
-				
-extern void		db_phys_copy(
-				vm_offset_t, 
-				vm_offset_t, 
-				vm_size_t);
 
 extern boolean_t	db_phys_cmp(
 				vm_offset_t,