xnu-6153.81.5.tar.gz

[apple/xnu.git] / osfmk / kern / kalloc.h

diff --git a/osfmk/kern/kalloc.h b/osfmk/kern/kalloc.h
index 3c6f5804bb72dfc7015a138dde9b05d272d3a319..0a1d56917c35aed1a4d778ebc4e33d7c57ed878f 100644 (file)
--- a/osfmk/kern/kalloc.h
+++ b/osfmk/kern/kalloc.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * 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
  * 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


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The 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,


@@ -22,41 +22,41 @@
  * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 

-#ifdef KERNEL_PRIVATE
+#ifdef  KERNEL_PRIVATE

 
 

-#ifndef        _KERN_KALLOC_H_
+#ifndef _KERN_KALLOC_H_

 #define _KERN_KALLOC_H_
 
 #include <mach/machine/vm_types.h>
 #define _KERN_KALLOC_H_
 
 #include <mach/machine/vm_types.h>


@@ -70,21 +70,21 @@ __BEGIN_DECLS
 
 extern void *
 kalloc_canblock(
 
 extern void *
 kalloc_canblock(

-               vm_size_t                * size,
-               boolean_t              canblock,
-               vm_allocation_site_t * site);
+       vm_size_t                * size,
+       boolean_t              canblock,
+       vm_allocation_site_t * site);

 
 extern vm_size_t
 kalloc_size(
 
 extern vm_size_t
 kalloc_size(

-               void                             * addr);
+       void                             * addr);

 
 extern vm_size_t
 kfree_addr(
 
 extern vm_size_t
 kfree_addr(

-               void                             * addr);
+       void                             * addr);

 
 extern vm_size_t
 kalloc_bucket_size(
 
 extern vm_size_t
 kalloc_bucket_size(

-               vm_size_t                          size);
+       vm_size_t                          size);

 
 #define kalloc(size)                                \
        ({ VM_ALLOC_SITE_STATIC(0, 0);                  \
 
 #define kalloc(size)                                \
        ({ VM_ALLOC_SITE_STATIC(0, 0);                  \


@@ -141,44 +141,67 @@ kalloc_bucket_size(
 
 
 
 
 
 

-extern void kfree(void         *data,
-                 vm_size_t     size);
+extern void kfree(void          *data,
+    vm_size_t     size);
+
+#define kfree(data, size) \
+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Wshadow\"") \
+       do { \
+               _Static_assert(sizeof (data) == sizeof (void *) || sizeof (data) == sizeof (mach_vm_address_t), "data is not a pointer"); \
+               void *__tmp_addr = (void *) data; \
+               vm_size_t __tmp_size = size; \
+               data = (__typeof__(data)) NULL; \
+               (kfree)(__tmp_addr, __tmp_size); \
+       } while (0) \
+_Pragma("clang diagnostic pop")
+
+#define kfree_addr(addr) \
+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Wshadow\"") \
+       do { \
+               _Static_assert(sizeof (addr) == sizeof (void *) || sizeof (addr) == sizeof (mach_vm_address_t), "addr is not a pointer"); \
+               void *__tmp_addr = (void *) addr; \
+               addr = (__typeof__(addr)) NULL; \
+               (kfree_addr)(__tmp_addr); \
+       } while (0) \
+_Pragma("clang diagnostic pop")

 
 #else /* XNU_KERNEL_PRIVATE */
 
 
 #else /* XNU_KERNEL_PRIVATE */
 

-extern void *kalloc(vm_size_t  size) __attribute__((alloc_size(1)));
+extern void *kalloc(vm_size_t   size) __attribute__((alloc_size(1)));

 
 

-extern void *kalloc_noblock(vm_size_t  size) __attribute__((alloc_size(1)));
+extern void *kalloc_noblock(vm_size_t   size) __attribute__((alloc_size(1)));

 
 

-extern void kfree(void         *data,
-                 vm_size_t     size);
+extern void kfree(void          *data,
+    vm_size_t     size);

 
 #endif /* !XNU_KERNEL_PRIVATE */
 
 __END_DECLS
 
 
 #endif /* !XNU_KERNEL_PRIVATE */
 
 __END_DECLS
 

-#ifdef MACH_KERNEL_PRIVATE
+#ifdef  MACH_KERNEL_PRIVATE

 
 

-extern void            kalloc_init(void);
+extern void             kalloc_init(void);

 
 

-extern void            kalloc_fake_zone_init( int );
+extern void             kalloc_fake_zone_init( int );

 
 

-extern void            kalloc_fake_zone_info(
-                               int             *count,
-                               vm_size_t       *cur_size,
-                               vm_size_t       *max_size,
-                               vm_size_t       *elem_size,
-                               vm_size_t       *alloc_size,
-                               uint64_t        *sum_size,
-                               int             *collectable,
-                               int             *exhaustable,
-                               int             *caller_acct);
+extern void             kalloc_fake_zone_info(
+       int             *count,
+       vm_size_t       *cur_size,
+       vm_size_t       *max_size,
+       vm_size_t       *elem_size,
+       vm_size_t       *alloc_size,
+       uint64_t        *sum_size,
+       int             *collectable,
+       int             *exhaustable,
+       int             *caller_acct);

 
 extern vm_size_t kalloc_max_prerounded;
 extern vm_size_t kalloc_large_total;
 
 
 extern vm_size_t kalloc_max_prerounded;
 extern vm_size_t kalloc_large_total;
 

-#endif /* MACH_KERNEL_PRIVATE */
+#endif  /* MACH_KERNEL_PRIVATE */

 
 

-#endif /* _KERN_KALLOC_H_ */
+#endif  /* _KERN_KALLOC_H_ */

 
 

-#endif /* KERNEL_PRIVATE */
+#endif  /* KERNEL_PRIVATE */