xnu-2782.30.5.tar.gz

[apple/xnu.git] / osfmk / mach / shared_memory_server.h

diff --git a/osfmk/mach/shared_memory_server.h b/osfmk/mach/shared_memory_server.h
index 7d2f103b28d3f55a33ce12d408e13694ad212d7a..ea7b9127f9e6bc4afe2fa980f409d7b541c654a3 100644 (file)
--- a/osfmk/mach/shared_memory_server.h
+++ b/osfmk/mach/shared_memory_server.h
@@ -32,9 +32,21 @@
  *     protos and struct definitions for shared library
  *     server and interface
  */
  *     protos and struct definitions for shared library
  *     server and interface
  */

+
+/*
+ * XXX
+ * 
+ * NOTE: this file is deprecated and will be removed in the near future.
+ * Any project that includes this file should be changed to:
+ * 1. use <mach/shared_region.h> instead of this file,
+ * 2. handle the new shared regions, now available on more platforms
+ */
+

 #ifndef _MACH_SHARED_MEMORY_SERVER_H_
 #define _MACH_SHARED_MEMORY_SERVER_H_
 
 #ifndef _MACH_SHARED_MEMORY_SERVER_H_
 #define _MACH_SHARED_MEMORY_SERVER_H_
 

+#warning "<mach/shared_memory_server.h> is deprecated.  Please use <mach/shared_region.h> instead."
+

 #include <sys/cdefs.h>
 #include <mach/vm_prot.h>
 #include <mach/vm_types.h>
 #include <sys/cdefs.h>
 #include <mach/vm_prot.h>
 #include <mach/vm_types.h>


@@ -43,16 +55,17 @@
 #define VM_PROT_COW  0x8  /* must not interfere with normal prot assignments */
 #define VM_PROT_ZF  0x10  /* must not interfere with normal prot assignments */
 
 #define VM_PROT_COW  0x8  /* must not interfere with normal prot assignments */
 #define VM_PROT_ZF  0x10  /* must not interfere with normal prot assignments */
 

+#define GLOBAL_SHARED_TEXT_SEGMENT     0x90000000U
+#define GLOBAL_SHARED_DATA_SEGMENT     0xA0000000U
+#define GLOBAL_SHARED_SEGMENT_MASK     0xF0000000U
+
+#define        SHARED_TEXT_REGION_SIZE         0x10000000
+#define        SHARED_DATA_REGION_SIZE         0x10000000

 
 #if !defined(__LP64__)
 
 #define        SHARED_LIBRARY_SERVER_SUPPORTED
 
 #if !defined(__LP64__)
 
 #define        SHARED_LIBRARY_SERVER_SUPPORTED

-#define GLOBAL_SHARED_TEXT_SEGMENT     0x90000000
-#define GLOBAL_SHARED_DATA_SEGMENT     0xA0000000
-#define GLOBAL_SHARED_SEGMENT_MASK     0xF0000000

 
 

-#define        SHARED_TEXT_REGION_SIZE         0x10000000
-#define        SHARED_DATA_REGION_SIZE         0x10000000

 #define        SHARED_ALTERNATE_LOAD_BASE      0x09000000
 
 /* 
 #define        SHARED_ALTERNATE_LOAD_BASE      0x09000000
 
 /* 


@@ -64,8 +77,6 @@
 #define        SHARED_TEXT_REGION_MASK         0x0FFFFFFF
 #define        SHARED_DATA_REGION_MASK         0x0FFFFFFF
 
 #define        SHARED_TEXT_REGION_MASK         0x0FFFFFFF
 #define        SHARED_DATA_REGION_MASK         0x0FFFFFFF
 

-#define SHARED_LIB_ALIAS  0x10
-

 
 /* flags field aliases for copyin_shared_file and load_shared_file */
 
 
 /* flags field aliases for copyin_shared_file and load_shared_file */
 


@@ -88,16 +99,6 @@ struct sf_mapping {
 };
 typedef struct sf_mapping sf_mapping_t;
 
 };
 typedef struct sf_mapping sf_mapping_t;
 

-#ifndef KERNEL
-/* load_shared_file and friends is deprecated */
-__BEGIN_DECLS
-int    load_shared_file(char *, caddr_t, u_long,
-               caddr_t *, int, sf_mapping_t *, int *);
-int    reset_shared_file(caddr_t *, int, sf_mapping_t *);
-int    new_system_shared_regions(void);
-__END_DECLS
-#endif /* !KERNEL */
-

 #endif  /* !defined(__LP64__) */
 
 /* 
 #endif  /* !defined(__LP64__) */
 
 /*