xnu-792.1.5.tar.gz

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

diff --git a/osfmk/ppc/trap.h b/osfmk/ppc/trap.h
index cd3525a0ae00ccd0809fdd8295d6dbd22f2da1d2..bb758d7d56a0e73d1d565af08d283be8bb5135aa 100644 (file)
--- a/osfmk/ppc/trap.h
+++ b/osfmk/ppc/trap.h
@@ -1,24 +1,21 @@
 /*
- * 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.
+ * 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. 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
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * 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@
  */
@@ -58,7 +55,7 @@
 #define NARGS  12
 /* Size to reserve in frame for arguments - first 8 are in registers */
 #define ARG_SIZE FM_ALIGN((NARGS-8)*4)
-
+#define MUNGE_ARGS_SIZE FM_ALIGN(8*8)
 
 /*
  * Hardware exception vectors for powerpc are in exception.h
@@ -73,17 +70,17 @@
 
 extern void                    doexception(int exc, int code, int sub);
 
-extern void                    thread_exception_return(void);
-
 extern struct savearea*        trap(int trapno,
                                     struct savearea *ss,
                                     unsigned int dsisr,
-                                    unsigned int dar);
+                                    addr64_t dar);
 
-typedef kern_return_t (*perfTrap)(int trapno, struct savearea *ss, 
-       unsigned int dsisr, unsigned int dar);
+typedef kern_return_t (*perfCallback)(int trapno, struct savearea *ss, 
+       unsigned int dsisr, addr64_t dar);
 
-extern perfTrap perfTrapHook;
+extern perfCallback perfTrapHook;
+extern perfCallback perfASTHook;
+extern perfCallback perfIntHook;
 
 extern struct savearea* interrupt(int intno,
                                         struct savearea *ss,