xnu-3789.70.16.tar.gz

[apple/xnu.git] / libkern / kxld / kxld_kext.h

diff --git a/libkern/kxld/kxld_kext.h b/libkern/kxld/kxld_kext.h
index 20eeaf50184aef11a70d4499630297eaff58fa9b..58b68bce33c54b92bd8d5ae7d51c0822bf9fe9bb 100644 (file)
--- a/libkern/kxld/kxld_kext.h
+++ b/libkern/kxld/kxld_kext.h
@@ -28,7 +28,6 @@
 #ifndef _KXLD_KEXT_H_
 #define _KXLD_KEXT_H_
 
-#include <mach/machine.h>
 #include <sys/types.h>
 #if KERNEL
     #include <libkern/kxld_types.h>
@@ -39,6 +38,7 @@
 struct kxld_array;
 struct kxld_kext;
 struct kxld_dict;
+struct kxld_object;
 struct kxld_sect;
 struct kxld_seg;
 struct kxld_symtab;
@@ -50,12 +50,11 @@ typedef struct kxld_kext KXLDKext;
 *******************************************************************************/
 
 size_t kxld_kext_sizeof(void)
-    __attribute__((const, nonnull, visibility("hidden")));
+    __attribute__((const, visibility("hidden")));
 
-kern_return_t kxld_kext_init(KXLDKext *kext, u_char *file, u_long size,
-    const char *name, KXLDFlags flags, boolean_t is_kernel, KXLDArray *seg_order, 
-    cpu_type_t cputype, cpu_subtype_t cpusubtype)
-    __attribute__((nonnull(1,2,4), visibility("hidden")));
+kern_return_t kxld_kext_init(KXLDKext *kext, struct kxld_object *kext_object,
+    struct kxld_object *interface_object)
+    __attribute__((nonnull(1,2), visibility("hidden")));
 
 void kxld_kext_clear(KXLDKext *kext)
     __attribute__((nonnull, visibility("hidden")));
@@ -67,76 +66,45 @@ void kxld_kext_deinit(KXLDKext *kext)
 * Accessors
 *******************************************************************************/
 
-boolean_t kxld_kext_is_true_kext(const KXLDKext *kext) 
-    __attribute__((pure, nonnull, visibility("hidden")));
+kern_return_t kxld_kext_export_symbols(const KXLDKext *kext, 
+    struct kxld_dict *defined_symbols_by_name,
+    struct kxld_dict *obsolete_symbols_by_name,
+    struct kxld_dict *defined_cxx_symbols_by_value)
+    __attribute__((nonnull(1), visibility("hidden")));
 
-boolean_t kxld_kext_is_32_bit(const KXLDKext *kext)
-    __attribute__((pure, nonnull, visibility("hidden")));
+void kxld_kext_get_vmsize_for_seg_by_name(const KXLDKext *kext,
+                                          const char *segname,
+                                          u_long *vmsize)
+__attribute__((nonnull, visibility("hidden")));
 
-void kxld_kext_get_cputype(const KXLDKext *kext, cpu_type_t *cputype,
-    cpu_subtype_t *cpusubtype)
+void kxld_kext_get_vmsize(const KXLDKext *kext, 
+    u_long *header_size, u_long *vmsize)
     __attribute__((nonnull, visibility("hidden")));
 
-kern_return_t kxld_kext_validate_cputype(const KXLDKext *kext, cpu_type_t cputype,
-    cpu_subtype_t cpusubtype)
-    __attribute__((pure, nonnull, visibility("hidden")));
+void kxld_kext_set_linked_object_size(KXLDKext *kext, u_long vmsize)
+__attribute__((nonnull, visibility("hidden")));
 
-void kxld_kext_get_vmsize(const KXLDKext *kext, u_long *header_size, 
-    u_long *vmsize)
-    __attribute__((nonnull, visibility("hidden")));
-
-const struct kxld_symtab * kxld_kext_get_symtab(const KXLDKext *kext)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-u_int kxld_kext_get_num_symbols(const KXLDKext *kext)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-void kxld_kext_get_vtables(KXLDKext *kext, const struct kxld_array **vtables)
-    __attribute__((nonnull, visibility("hidden")));
-
-u_int kxld_kext_get_num_vtables(const KXLDKext *kext)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-struct kxld_seg * kxld_kext_get_seg_by_name(const KXLDKext *kext, 
-    const char *segname)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-struct kxld_sect * kxld_kext_get_sect_by_name(const KXLDKext *kext, 
-    const char *segname, const char *sectname)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-int kxld_kext_get_sectnum_for_sect(const KXLDKext *kext, 
-    const struct kxld_sect *sect)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-const struct kxld_array * kxld_kext_get_section_order(const KXLDKext *kext)
-    __attribute__((pure, nonnull, visibility("hidden")));
-
-/* This will be the same size as kxld_kext_get_vmsize */
 kern_return_t kxld_kext_export_linked_object(const KXLDKext *kext,
-    u_char *linked_object, kxld_addr_t *kmod_info_kern)
-    __attribute__((nonnull, visibility("hidden")));
-
-#if !KERNEL
-kern_return_t kxld_kext_export_symbol_file(const KXLDKext *kext, 
-    u_char **symbol_file, u_long *filesize)
+                                             void *linked_object,
+                                             kxld_addr_t *kmod_info)
     __attribute__((nonnull, visibility("hidden")));
-#endif
-
-boolean_t kxld_kext_target_needs_swap(const KXLDKext *kext)
-    __attribute__((pure, nonnull, visibility("hidden")));
 
 /*******************************************************************************
 * Modifiers
 *******************************************************************************/
-
-kern_return_t kxld_kext_resolve(KXLDKext *kext, struct kxld_dict *patched_vtables,
-    struct kxld_dict *defined_symbols)
+kern_return_t kxld_kext_export_vtables(KXLDKext *kext, 
+    const struct kxld_dict *defined_cxx_symbols, 
+    const struct kxld_dict *defined_symbols,
+    struct kxld_dict *vtables)
     __attribute__((nonnull, visibility("hidden")));
 
-kern_return_t kxld_kext_relocate(KXLDKext *kext, kxld_addr_t link_address,
-    struct kxld_dict *patched_vtables, struct kxld_dict *defined_symbols,
-    struct kxld_dict *obsolete_symbols)
-    __attribute__((nonnull(1,3,4), visibility("hidden")));
+kern_return_t kxld_kext_relocate(KXLDKext *kext,
+                                 kxld_addr_t link_address,
+                                 struct kxld_dict *patched_vtables,
+                                 const struct kxld_dict *defined_symbols,
+                                 const struct kxld_dict *obsolete_symbols,
+                                 const struct kxld_dict *defined_cxx_symbols)
+__attribute__((nonnull(1,3,4), visibility("hidden")));
+
 
 #endif /* _KXLD_KEXT_H_ */