xnu-1486.2.11.tar.gz

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

diff --git a/osfmk/ppc/trap.h b/osfmk/ppc/trap.h
index bb758d7d56a0e73d1d565af08d283be8bb5135aa..2a4a33ca8d3f71605aa5bdd3ed4d338b148324c4 100644 (file)
--- a/osfmk/ppc/trap.h
+++ b/osfmk/ppc/trap.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
@@ -68,7 +74,8 @@
 #include <mach/kern_return.h>
 #include <ppc/thread.h>
 
-extern void                    doexception(int exc, int code, int sub);
+extern void                    doexception(int exc, mach_exception_code_t code,
+                                       mach_exception_subcode_t sub);
 
 extern struct savearea*        trap(int trapno,
                                     struct savearea *ss,
@@ -78,9 +85,9 @@ extern struct savearea*       trap(int trapno,
 typedef kern_return_t (*perfCallback)(int trapno, struct savearea *ss, 
        unsigned int dsisr, addr64_t dar);
 
-extern perfCallback perfTrapHook;
-extern perfCallback perfASTHook;
-extern perfCallback perfIntHook;
+extern volatile perfCallback perfTrapHook;
+extern volatile perfCallback perfASTHook;
+extern volatile perfCallback perfIntHook;
 
 extern struct savearea* interrupt(int intno,
                                         struct savearea *ss,
@@ -88,8 +95,8 @@ extern struct savearea* interrupt(int intno,
                                         unsigned int dar);
 
 extern int                     syscall_error(int exception,
-                                             int code,
-                                             int subcode,
+                                             int64_t code,
+                                             int64_t subcode,
                                              struct savearea *ss);