xnu-4903.221.2.tar.gz

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

diff --git a/osfmk/i386/trap.h b/osfmk/i386/trap.h
index d5c14fe4fbf1c5e4aa63d883b6ea03839952c0b3..6966aeca2c008e0d7fa1626457a67ef5717655b7 100644 (file)
--- a/osfmk/i386/trap.h
+++ b/osfmk/i386/trap.h
@@ -109,10 +109,8 @@
 #define        T_PF_WRITE              0x2             /* write access */
 #define        T_PF_USER               0x4             /* from user state */
 
 #define        T_PF_WRITE              0x2             /* write access */
 #define        T_PF_USER               0x4             /* from user state */
 

-#ifdef PAE

 #define        T_PF_RSVD               0x8             /* reserved bit set to 1 */
 #define T_PF_EXECUTE           0x10            /* instruction fetch when NX */
 #define        T_PF_RSVD               0x8             /* reserved bit set to 1 */
 #define T_PF_EXECUTE           0x10            /* instruction fetch when NX */

-#endif

 
 #if !defined(ASSEMBLER) && defined(MACH_KERNEL)
 
 
 #if !defined(ASSEMBLER) && defined(MACH_KERNEL)
 


@@ -137,22 +135,20 @@ extern void               interrupt(x86_saved_state_t *regs);
 extern void            panic_double_fault64(x86_saved_state_t *regs);
 extern void            panic_machine_check64(x86_saved_state_t *regs);
 
 extern void            panic_double_fault64(x86_saved_state_t *regs);
 extern void            panic_machine_check64(x86_saved_state_t *regs);
 

-extern void            i386_astintr(int preemption);
-
-

 typedef kern_return_t (*perfCallback)(
                                int                     trapno,
                                void                    *regs,
                                uintptr_t               *lo_spp,
                                      int);
 
 typedef kern_return_t (*perfCallback)(
                                int                     trapno,
                                void                    *regs,
                                uintptr_t               *lo_spp,
                                      int);
 

-typedef kern_return_t (*perfASTCallback)(ast_t reasons, ast_t *myast);
-
-extern volatile perfCallback perfTrapHook;
-extern volatile perfASTCallback perfASTHook;
-extern volatile perfCallback perfIntHook;
-

 extern void            panic_i386_backtrace(void *, int, const char *, boolean_t, x86_saved_state_t *);
 extern void            panic_i386_backtrace(void *, int, const char *, boolean_t, x86_saved_state_t *);

+extern void    print_one_backtrace(pmap_t pmap, vm_offset_t topfp, const char *cur_marker, boolean_t is_64_bit);
+extern void    print_thread_num_that_crashed(task_t task);
+extern void    print_tasks_user_threads(task_t task);
+extern void    print_threads_registers(thread_t thread);
+extern void    print_uuid_info(task_t task);
+extern void    print_launchd_info(void);
+

 #if MACH_KDP
 extern boolean_t       kdp_i386_trap(
                                unsigned int,
 #if MACH_KDP
 extern boolean_t       kdp_i386_trap(
                                unsigned int,