xnu-1228.3.13.tar.gz

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

diff --git a/osfmk/ppc/savearea.h b/osfmk/ppc/savearea.h
index d8c96f2b6b4fbab9d5ee978da8c7a6161e62f769..496591cb6713564a80aace23142a8793ec9d65f1 100644 (file)
--- a/osfmk/ppc/savearea.h
+++ b/osfmk/ppc/savearea.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -36,7 +36,7 @@
 
 #ifdef __APPLE_API_PRIVATE
 
 
 #ifdef __APPLE_API_PRIVATE
 

-#ifdef MACH_KERNEL_PRIVATE
+#if    defined(MACH_KERNEL_PRIVATE) || defined(BSD_KERNEL_PRIVATE)

 #include <stdint.h>
 #include <mach/vm_types.h>
 
 #include <stdint.h>
 #include <mach/vm_types.h>
 


@@ -82,15 +82,7 @@ typedef struct savearea_comm {
                                                                                                /* offset 0x0060 */
 } savearea_comm;
 #pragma pack()
                                                                                                /* offset 0x0060 */
 } savearea_comm;
 #pragma pack()

-#endif
-
-#ifdef BSD_KERNEL_PRIVATE
-typedef struct savearea_comm {
-       unsigned int    save_000[24];
-} savearea_comm;
-#endif

 
 

-#if    defined(MACH_KERNEL_PRIVATE) || defined(BSD_KERNEL_PRIVATE)

 /*
  *     This type of savearea contains all of the general context.
  */
 /*
  *     This type of savearea contains all of the general context.
  */


@@ -171,9 +163,9 @@ typedef struct savearea {
 
        unsigned int    save_238[2];
                                                                                                /* offset 0x240 */
 
        unsigned int    save_238[2];
                                                                                                /* offset 0x240 */

-       unsigned int    save_instr[16];                         /* Instrumentation */
+       unsigned int    save_instr[16];                         /* Instrumentation or emulation. Note: save_instr[0] is number of instructions */

                                                                                                /* offset 0x280 */
                                                                                                /* offset 0x280 */

-} savearea;
+} savearea_t;

 #pragma pack()
 
 
 #pragma pack()
 
 


@@ -326,7 +318,7 @@ struct Saveanchor {
 
 extern struct Saveanchor       saveanchor;                     /* Aliged savearea anchor */
 
 
 extern struct Saveanchor       saveanchor;                     /* Aliged savearea anchor */
 

-#define sac_cnt                (4096 / sizeof(savearea))       /* Number of saveareas per page */
+#define sac_cnt                (4096 / sizeof(struct savearea))        /* Number of saveareas per page */

 #define sac_empty      (0xFFFFFFFF << (32 - sac_cnt))  /* Mask with all entries empty */
 #define sac_perm       0x40000000                              /* Page permanently assigned */
 #define sac_permb      1                                               /* Page permanently assigned - bit position */
 #define sac_empty      (0xFFFFFFFF << (32 - sac_cnt))  /* Mask with all entries empty */
 #define sac_perm       0x40000000                              /* Page permanently assigned */
 #define sac_permb      1                                               /* Page permanently assigned - bit position */


@@ -369,6 +361,7 @@ void                        save_fake_zone_info(            /* report savearea usage statistics as fake zone i
 
 void                   save_snapshot(void);
 void                   save_snapshot_restore(void);
 
 void                   save_snapshot(void);
 void                   save_snapshot_restore(void);

+void save_release(struct savearea *);

 
 #endif /* MACH_KERNEL_PRIVATE */
 #endif /* __APPLE_API_PRIVATE */
 
 #endif /* MACH_KERNEL_PRIVATE */
 #endif /* __APPLE_API_PRIVATE */


@@ -384,6 +377,8 @@ void                        save_snapshot_restore(void);
 #define        SAVinstrumentb 12                                       /* Indicates that we should return instrumentation data */
 #define        SAVeat          0x00100000                              /* Indicates that interruption should be ignored */
 #define        SAVeatb         11                                              /* Indicates that interruption should be ignored */
 #define        SAVinstrumentb 12                                       /* Indicates that we should return instrumentation data */
 #define        SAVeat          0x00100000                              /* Indicates that interruption should be ignored */
 #define        SAVeatb         11                                              /* Indicates that interruption should be ignored */

+#define        SAVinject       0x00200000                              /* Indicates that save_instr contains code to inject */
+#define        SAVinjectb      10                                              /* Indicates that save_instr contains code to inject */

 #define SAVtype                0x0000FF00                              /* Shows type of savearea */
 #define SAVtypeshft    8                                               /* Shift to position type */
 #define SAVempty       0x86                                    /* Savearea is on free list */
 #define SAVtype                0x0000FF00                              /* Shows type of savearea */
 #define SAVtypeshft    8                                               /* Shift to position type */
 #define SAVempty       0x86                                    /* Savearea is on free list */