xnu-6153.81.5

Imported from https://opensource.apple.com/tarballs/xnu/xnu-6153.81.5.tar.gz

Author: Darwin

.clang-format

@@ -25,6 +25,9 @@ compile_commands.json
 # /libkern/kmod/libkmod.xcodeproj/
 /libkern/kmod/libkmod.xcodeproj/xcuserdata
 
+# /libkdd/kdd.xcodeproj/
+/libkdd/kdd.xcodeproj/xcuserdata
+
 # /libsyscall/Libsyscall.xcodeproj/
 /libsyscall/Libsyscall.xcodeproj/xcuserdata
 /libsyscall/Libsyscall.xcodeproj/project.xcworkspace
@@ -44,16 +47,25 @@ compile_commands.json
 # /tools/tests/testkext/testkext.xcodeproj/
 /tools/tests/testkext/testkext.xcodeproj/xcuserdata
 
+#/tools/tests/unit_tests/cpu_monitor_tests_11646922_src/CatchRN/CatchRN.xcodeproj/
+/tools/tests/unit_tests/cpu_monitor_tests_11646922_src/CatchRN/CatchRN.xcodeproj/xcuserdata
+
 # /tools/tests/unit_tests/cpu_monitor_tests_11646922_src/cpu_hog/cpu_hog.xcodeproj/
 /tools/tests/unit_tests/cpu_monitor_tests_11646922_src/cpu_hog/cpu_hog.xcodeproj/xcuserdata
 
+# /tools/tests/unit_tests/mach_test_15789220_src/mach_test.xcodeproj/
+/tools/tests/unit_tests/mach_test_15789220_src/mach_test.xcodeproj/xcuserdata
+
 # /tools/tests/unit_tests/monitor_stress_12901965_src/monitor_stress.xcodeproj/
 /tools/tests/unit_tests/monitor_stress_12901965_src/monitor_stress.xcodeproj/xcuserdata
 
 # /tools/tests/unit_tests/monitor_stress_12901965_src/monitor_stress.xcodeproj/project.xcworkspace/
 /tools/tests/unit_tests/monitor_stress_12901965_src/monitor_stress.xcodeproj/project.xcworkspace/xcuserdata
 
+#/tools/tests/unit_tests/test_14395574/test_14395574.xcodeproj/
+/tools/tests/unit_tests/test_14395574/test_14395574.xcodeproj/xcuserdata
+
 # /tools/tests/zero-to-n
 /tools/tests/zero-to-n/zn*
-BUILD.hdrs
-BUILD
+
+# do not add *.orig, *.rej, use `git clean` instead

.gitignore

@@ -8,7 +8,8 @@ include $(MakeInc_def)
 
 INSTINC_SUBDIRS =	\
 	architecture	\
-	mach-o
+	mach-o			\
+	sys
 
 INSTINC_SUBDIRS_X86_64 =	\
 	architecture
@@ -32,9 +33,7 @@ KERNEL_FILES = \
 	stdatomic.h	\
 	stdbool.h	\
 	stddef.h	\
-	stdint.h
-
-KERNEL_FILES += \
+	stdint.h	\
 	ptrauth.h
 
 INSTALL_MI_LIST =

EXTERNAL_HEADERS/Makefile

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -50,7 +50,8 @@ typedef struct code_desc {
 			dpl	:2,
 			present	:1;
     unsigned char	limit16	:4,
-				:2,
+				:1,
+                        Lflag   :1,
 			opsz	:1,
 #define DESC_CODE_16B	0
 #define DESC_CODE_32B	1

EXTERNAL_HEADERS/architecture/i386/desc.h

@@ -16,12 +16,41 @@
 #include <string.h>
 #include <stdint.h>
 
+#if __has_feature(attribute_availability_with_replacement)
+#if __has_feature(attribute_availability_bridgeos)
+  #ifndef __CC_BRIDGE_OS_DEPRECATED
+    #define __CC_BRIDGEOS_DEPRECATED(_dep, _msg) __attribute__((availability(bridgeos,deprecated=_dep, replacement=_msg)))
+  #endif
+#endif
+
+#ifndef __CC_BRIDGEOS_DEPRECATED
+  #define __CC_BRIDGEOS_DEPRECATED(_dep, _msg)
+#endif
+
+#define cc_deprecate_with_replacement(replacement_message, ios_version, macos_version, tvos_version, watchos_version, bridgeos_version) \
+__attribute__((availability(macos,deprecated=macos_version,       replacement=replacement_message)))\
+__attribute__((availability(ios,deprecated=ios_version,           replacement=replacement_message)))\
+__attribute__((availability(watchos,deprecated=watchos_version,   replacement=replacement_message)))\
+__attribute__((availability(tvos,deprecated=tvos_version,         replacement=replacement_message)))\
+__CC_BRIDGEOS_DEPRECATED(bridgeos_version, replacement_message)
+
+#else /* !__has_feature(attribute_availability_with_replacement) */
+
+#define cc_deprecate_with_replacement(replacement_message, ios_version, macos_version, tvos_version, watchos_version, bridgeos_version)
+
+#endif /* __has_feature(attribute_availability_with_replacement) */
+
 /* Provide a general purpose macro concat method. */
 #define cc_concat_(a, b) a##b
 #define cc_concat(a, b) cc_concat_(a, b)
 
 /* Manage asserts here because a few functions in header public files do use asserts */
+#if CORECRYPTO_DEBUG
 #define cc_assert(x) assert(x)
+#else
+#define cc_assert(x)
+#endif
+
 #if CC_KERNEL
 #include <kern/assert.h>
 #elif CC_USE_S3
@@ -32,7 +61,7 @@
 
 /* Provide a static assert that can be used to create compile-type failures. */
 #define cc_static_assert(e,m)                                               \
-    ;enum { cc_concat(static_assert_, __COUNTER__) = 1/(int)(!!(e)) }
+    enum { cc_concat(static_assert_, __COUNTER__) = 1/(int)(!!(e)) }
 
 /* Declare a struct element with a guarenteed alignment of _alignment_.
    The resulting struct can be used to create arrays that are aligned by
@@ -42,6 +71,15 @@ typedef struct { \
 uint8_t b[_alignment_]; \
 } CC_ALIGNED(_alignment_)
 
+#if defined(__BIGGEST_ALIGNMENT__)
+#define CC_MAX_ALIGNMENT __BIGGEST_ALIGNMENT__
+#else
+#define CC_MAX_ALIGNMENT 16
+#endif
+
+/* pads a given size to be a multiple of the biggest alignment for any type */
+#define cc_pad_align(_size_) ((_size_ + CC_MAX_ALIGNMENT - 1) & (~(CC_MAX_ALIGNMENT - 1)))
+
 /* number of array elements used in a cc_ctx_decl */
 #define cc_ctx_n(_type_, _size_) ((_size_ + sizeof(_type_) - 1) / sizeof(_type_))
 
@@ -55,14 +93,14 @@ uint8_t b[_alignment_]; \
   3. Never use sizeof() operator for the variables declared with cc_ctx_decl(), because it is not be compatible with the _MSC_VER version of cc_ctx_decl().
  */
 #if defined(_MSC_VER)
+#include <malloc.h>
 #define cc_ctx_decl(_type_, _size_, _name_)  _type_ * _name_ = (_type_ *) _alloca(sizeof(_type_) * cc_ctx_n(_type_, _size_) )
 #else
 #define cc_ctx_decl(_type_, _size_, _name_)  _type_ _name_ [cc_ctx_n(_type_, _size_)]
 #endif
 
-/* bzero is deprecated. memset is the way to go */
-/* FWIW, L4, HEXAGON and ARMCC even with gnu compatibility mode don't have bzero */
-#define cc_zero(_size_,_data_) memset((_data_),0 ,(_size_))
+// cc_zero is deprecated, please use cc_clear instead.
+#define cc_zero(_size_,_data_) _Pragma ("corecrypto deprecation warning \"'cc_zero' macro is deprecated. Use 'cc_clear' instead.\"") cc_clear(_size_,_data_)
 
 /*!
  @brief cc_clear(len, dst) zeroizes array dst and it will not be optimized out.
@@ -99,12 +137,16 @@ int cc_cmp_safe (size_t num, const void * ptr1, const void * ptr2);
 /* Exchange S and T of any type.  NOTE: Both and S and T are evaluated
    mutliple times and MUST NOT be expressions. */
 #define CC_SWAP(S,T)  do { \
-    __typeof__(S) _cc_swap_tmp = S; S = T; T = _cc_swap_tmp; \
+    volatile __typeof__(S) _cc_swap_tmp = S; S = T; T = _cc_swap_tmp; \
+    _cc_swap_tmp = 0;\
 } while(0)
 
 /* Return the maximum value between S and T. */
 #define CC_MAX(S, T) ({__typeof__(S) _cc_max_s = S; __typeof__(T) _cc_max_t = T; _cc_max_s > _cc_max_t ? _cc_max_s : _cc_max_t;})
 
+/* Clone of CC_MAX() that evalutes S and T multiple times to allow nesting. */
+#define CC_MAX_EVAL(S, T) ((S) > (T) ? (S) : (T))
+
 /* Return the minimum value between S and T. */
 #define CC_MIN(S, T) ({__typeof__(S) _cc_min_s = S; __typeof__(T) _cc_min_t = T; _cc_min_s <= _cc_min_t ? _cc_min_s : _cc_min_t;})