xnu-792.13.8.tar.gz

[apple/xnu.git] / osfmk / ppc / db_machdep.h

diff --git a/osfmk/ppc/db_machdep.h b/osfmk/ppc/db_machdep.h
index fb95f0608d41798730b7097f76080e249dcc1d74..f45fbeea9055fb3b8b6027b58b3b73c0e8502512 100644 (file)
--- a/osfmk/ppc/db_machdep.h
+++ b/osfmk/ppc/db_machdep.h
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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
- * 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -60,13 +68,13 @@
 #include <kern/kern_types.h>
 #include <mach/ppc/vm_types.h>
 #include <mach/ppc/vm_param.h>
-#include <ppc/thread.h>                /* for thread_status */
+#include <kern/thread.h>
 #include <ppc/trap.h>
 #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 +109,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 +135,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,
@@ -156,8 +160,6 @@ extern void         db_low_trace(
                                int             have_addr,
                                db_expr_t       count,
                                char            *modif);
-extern void            db_to_gdb(
-                               void);
 
 
 /* macros for printing OS server dependent task name */
@@ -183,11 +185,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,