Loading...
--- libmalloc/libmalloc-657.60.21/libmalloc.xcodeproj/project.pbxproj
+++ libmalloc/libmalloc-521.120.7/libmalloc.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 60;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -36,30 +36,6 @@
name = libmalloc_test;
productName = libmalloc_test;
};
- 93DB8E7E2B1563460036024F /* libmalloc_test_exclavekit */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = 93DB8E812B1563460036024F /* Build configuration list for PBXAggregateTarget "libmalloc_test_exclavekit" */;
- buildPhases = (
- );
- dependencies = (
- 93D0A09B2B16AFF600009B69 /* PBXTargetDependency */,
- );
- name = libmalloc_test_exclavekit;
- productName = libmalloc_test_exclavekit;
- };
- 93DB8E822B1563540036024F /* libmalloc_test_exclavecore */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = 93DB8E832B1563540036024F /* Build configuration list for PBXAggregateTarget "libmalloc_test_exclavecore" */;
- buildPhases = (
- );
- dependencies = (
- 93D0A0952B16AFD400009B69 /* PBXTargetDependency */,
- 93D0A0992B16AFE800009B69 /* PBXTargetDependency */,
- 93D0A0972B16AFDB00009B69 /* PBXTargetDependency */,
- );
- name = libmalloc_test_exclavecore;
- productName = libmalloc_test_exclavecore;
- };
B2FE94B32ABA5A9500924E15 /* libmalloc_frameworks */ = {
isa = PBXAggregateTarget;
buildConfigurationList = B2FE94B62ABA5A9500924E15 /* Build configuration list for PBXAggregateTarget "libmalloc_frameworks" */;
@@ -101,6 +77,7 @@
08315122215ED9CF00D97E04 /* malloc_implementation.h in Headers */ = {isa = PBXBuildFile; fileRef = 08315121215ED9C700D97E04 /* malloc_implementation.h */; settings = {ATTRIBUTES = (Private, ); }; };
08315123215EE9A100D97E04 /* stack_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = C9571C391C18AA1D00A67EE3 /* stack_logging.h */; settings = {ATTRIBUTES = (Private, ); }; };
2B67B5682040B3AF0003E78F /* _malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B67B5672040B3A50003E78F /* _malloc.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 34B020CD29A547340058A44B /* libmalloc_exclavekit_test.c in Sources */ = {isa = PBXBuildFile; fileRef = 34B020CC29A547340058A44B /* libmalloc_exclavekit_test.c */; };
3A3397C02981EF3500F9AFAD /* nano_common_tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A3397BF2981EF3500F9AFAD /* nano_common_tests.m */; };
3AE868452981F1A300A1625C /* nano_malloc_common.c in Sources */ = {isa = PBXBuildFile; fileRef = B68B7F9D1FCDCBC600BAD1AA /* nano_malloc_common.c */; };
3AE868462981F1D500A1625C /* malloc_common.c in Sources */ = {isa = PBXBuildFile; fileRef = B66C71D82034BFAE0047E265 /* malloc_common.c */; };
@@ -129,6 +106,7 @@
4D4812BF23D7C99E00FE6CC3 /* pgm_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DF318FF23D796550064A673 /* pgm_malloc.c */; };
4D4812C023D7C99F00FE6CC3 /* pgm_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DF318FF23D796550064A673 /* pgm_malloc.c */; };
4D4812C123D7C99F00FE6CC3 /* pgm_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DF318FF23D796550064A673 /* pgm_malloc.c */; };
+ 4D7879A828EFA64900DF15BE /* malloc_type.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D7879A728EFA64900DF15BE /* malloc_type.h */; settings = {ATTRIBUTES = (Private, ); }; };
4DA4F8142A2916B900981635 /* wrapper_zones.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DA4F8132A2916B900981635 /* wrapper_zones.c */; };
4DA4F8162A2916B900981635 /* wrapper_zones.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DA4F8132A2916B900981635 /* wrapper_zones.c */; };
4DA4F8172A2916B900981635 /* wrapper_zones.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DA4F8132A2916B900981635 /* wrapper_zones.c */; };
@@ -159,10 +137,6 @@
925383DA1BD03D5100F745DB /* stress_test.c in Sources */ = {isa = PBXBuildFile; fileRef = 925383D11BD03B4A00F745DB /* stress_test.c */; };
93C629F52ACB71240006CBDA /* xzone_metapool.c in Sources */ = {isa = PBXBuildFile; fileRef = 93C629F42ACB71240006CBDA /* xzone_metapool.c */; };
93C629F72ACB71240006CBDA /* xzone_metapool.c in Sources */ = {isa = PBXBuildFile; fileRef = 93C629F42ACB71240006CBDA /* xzone_metapool.c */; };
- 93D0A0822B16ABAA00009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json in Sources */ = {isa = PBXBuildFile; fileRef = 93D0A0782B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json */; };
- 93D0A0832B16ABBB00009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json in Sources */ = {isa = PBXBuildFile; fileRef = 93D0A0762B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json */; };
- 93D0A0922B16AFB700009B69 /* EVE.libmalloc.exclavecore-darwintest.bundle.definition.json in Sources */ = {isa = PBXBuildFile; fileRef = 93D0A0752B16AAE500009B69 /* EVE.libmalloc.exclavecore-darwintest.bundle.definition.json */; };
- 93D0A0932B16AFB700009B69 /* EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json in Sources */ = {isa = PBXBuildFile; fileRef = 93D0A0792B16AAE500009B69 /* EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json */; };
93D319B62AF5B2100045F3DF /* xzone_metapool.c in Sources */ = {isa = PBXBuildFile; fileRef = 93C629F42ACB71240006CBDA /* xzone_metapool.c */; };
96C6DA2027DAC25C008D0061 /* magazine_large_tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96C6DA1F27DAC25C008D0061 /* magazine_large_tests.m */; };
B218ABB22B0816DF00CB20FC /* xzone_introspect.c in Sources */ = {isa = PBXBuildFile; fileRef = B293DBC22AB1223E00EA1B30 /* xzone_introspect.c */; };
@@ -178,14 +152,14 @@
B2226E1F2A9035F1001703BE /* malloc_printf.c in Sources */ = {isa = PBXBuildFile; fileRef = B65FBE2B2087AA2F00E21F59 /* malloc_printf.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
B2226E202A9035F7001703BE /* sanitizer_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 8C32D36A255F4FD1006152A4 /* sanitizer_malloc.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
B2226E212A90360F001703BE /* malloc_exclaves.c in Sources */ = {isa = PBXBuildFile; fileRef = B29E9A5829FC651300C0EBFF /* malloc_exclaves.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
- B2226E232A90375E001703BE /* _malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B67B5672040B3A50003E78F /* _malloc.h */; settings = {ATTRIBUTES = (Public, ); }; };
- B2226E242A90375E001703BE /* _malloc_type.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFD596B295259B500F1CA2F /* _malloc_type.h */; settings = {ATTRIBUTES = (Public, ); }; };
- B2226E252A90375E001703BE /* _platform.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C02C0429A8529900BD0C10 /* _platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ B2226E232A90375E001703BE /* _malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B67B5672040B3A50003E78F /* _malloc.h */; };
+ B2226E242A90375E001703BE /* _malloc_type.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFD596B295259B500F1CA2F /* _malloc_type.h */; };
+ B2226E252A90375E001703BE /* _platform.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C02C0429A8529900BD0C10 /* _platform.h */; };
B2226E262A90375E001703BE /* _ptrcheck.h in Headers */ = {isa = PBXBuildFile; fileRef = B2395C7629EE0962006E9545 /* _ptrcheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
- B2226E272A90375E001703BE /* malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE91FF916A90BEF00D1238A /* malloc.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ B2226E272A90375E001703BE /* malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE91FF916A90BEF00D1238A /* malloc.h */; };
B2226E292A903780001703BE /* malloc_private.h in Headers */ = {isa = PBXBuildFile; fileRef = C0352EC61C3F3C3600DB5126 /* malloc_private.h */; settings = {ATTRIBUTES = (Private, ); }; };
B2226E2B2A903780001703BE /* malloc_type_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFD596829524CEA00F1CA2F /* malloc_type_private.h */; settings = {ATTRIBUTES = (Private, ); }; };
- B2226E2C2A903780001703BE /* malloc_implementation.h in Headers */ = {isa = PBXBuildFile; fileRef = 08315121215ED9C700D97E04 /* malloc_implementation.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ B2226E2C2A903780001703BE /* malloc_implementation.h in Headers */ = {isa = PBXBuildFile; fileRef = 08315121215ED9C700D97E04 /* malloc_implementation.h */; };
B2226E2D2A9037C5001703BE /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C957426D1BF2C0C80027269A /* internal.h */; };
B2226E2E2A9037CE001703BE /* xzone_inline_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = F765F92A29217BAA00E9649E /* xzone_inline_internal.h */; };
B2226E2F2A9037CE001703BE /* malloc_type_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFD596529524C9700F1CA2F /* malloc_type_internal.h */; };
@@ -210,13 +184,12 @@
B24F712F29AE9C880064241F /* _malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B67B5672040B3A50003E78F /* _malloc.h */; settings = {ATTRIBUTES = (Public, ); }; };
B24F713429B0052D0064241F /* malloc_common.c in Sources */ = {isa = PBXBuildFile; fileRef = B66C71D82034BFAE0047E265 /* malloc_common.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
B24F713529B005330064241F /* malloc_common.h in Headers */ = {isa = PBXBuildFile; fileRef = B66C71D72034BFAE0047E265 /* malloc_common.h */; };
+ B24F716329B2927B0064241F /* libmicrotest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B24F716229B2927B0064241F /* libmicrotest.a */; };
B24F716629B7F10B0064241F /* sanitizer_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 8C32D36A255F4FD1006152A4 /* sanitizer_malloc.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
B24F716829B7F11B0064241F /* sanitizer_malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CE61A27264EC6A9007EF8A3 /* sanitizer_malloc.h */; };
B24F716929B7F11C0064241F /* sanitizer_malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CE61A27264EC6A9007EF8A3 /* sanitizer_malloc.h */; };
- B2507D582A3A67B800FC0B66 /* malloc_private_exclaves.modulemap in Headers */ = {isa = PBXBuildFile; fileRef = B2507D572A3A677700FC0B66 /* malloc_private_exclaves.modulemap */; settings = {ATTRIBUTES = (Private, ); }; };
+ B2507D582A3A67B800FC0B66 /* malloc_private_exclavekit.modulemap in Headers */ = {isa = PBXBuildFile; fileRef = B2507D572A3A677700FC0B66 /* malloc_private_exclavekit.modulemap */; settings = {ATTRIBUTES = (Private, ); }; };
B260D0C529A70B350038CC9D /* malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE91FF916A90BEF00D1238A /* malloc.h */; settings = {ATTRIBUTES = (Public, ); }; };
- B26866992BCF22F2005FBF0B /* allocator.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = B2CDBA0A2A8164AA00E76A55 /* allocator.modulemap */; };
- B268669A2BCF2401005FBF0B /* malloc_private_exclaves.modulemap in Headers */ = {isa = PBXBuildFile; fileRef = B2507D572A3A677700FC0B66 /* malloc_private_exclaves.modulemap */; settings = {ATTRIBUTES = (Private, ); }; };
B28B6CFF2A44F90500234081 /* malloc_implementation.h in Headers */ = {isa = PBXBuildFile; fileRef = 08315121215ED9C700D97E04 /* malloc_implementation.h */; settings = {ATTRIBUTES = (Private, ); }; };
B28B6D002A44F90F00234081 /* malloc_private.h in Headers */ = {isa = PBXBuildFile; fileRef = C0352EC61C3F3C3600DB5126 /* malloc_private.h */; settings = {ATTRIBUTES = (Private, ); }; };
B293DBC32AB1223E00EA1B30 /* xzone_introspect.c in Sources */ = {isa = PBXBuildFile; fileRef = B293DBC22AB1223E00EA1B30 /* xzone_introspect.c */; };
@@ -226,8 +199,6 @@
B299F39F2B48D65D00EA6D23 /* xzone_introspect_stub.c in Sources */ = {isa = PBXBuildFile; fileRef = B299F39B2B48D5DB00EA6D23 /* xzone_introspect_stub.c */; };
B29C114F2A7C2F2D00C00C07 /* malloc_printf.c in Sources */ = {isa = PBXBuildFile; fileRef = B65FBE2B2087AA2F00E21F59 /* malloc_printf.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
B29E9A5929FC651300C0EBFF /* malloc_exclaves.c in Sources */ = {isa = PBXBuildFile; fileRef = B29E9A5829FC651300C0EBFF /* malloc_exclaves.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
- B2BF0AD72C06BE8E008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json in Sources */ = {isa = PBXBuildFile; fileRef = B2BF0A9A2C069910008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json */; };
- B2BF0AD82C06BE97008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json in Sources */ = {isa = PBXBuildFile; fileRef = B2BF0A992C069910008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json */; };
B2C02C0129A8345800BD0C10 /* printf.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE91FD916A90A8D00D1238A /* printf.h */; };
B2C02C0229A8347400BD0C10 /* base.h in Headers */ = {isa = PBXBuildFile; fileRef = C95742891BF3FD290027269A /* base.h */; };
B2C02C0529A8529900BD0C10 /* _platform.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C02C0429A8529900BD0C10 /* _platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -381,42 +352,14 @@
F7FC7599297905AA00D3F81F /* malloc_type_stubs.c in Sources */ = {isa = PBXBuildFile; fileRef = F7FC7598297905A900D3F81F /* malloc_type_stubs.c */; };
/* End PBXBuildFile section */
-/* Begin PBXBuildRule section */
- 93D0A08C2B16AFA000009B69 /* PBXBuildRule */ = {
- isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.proxy.script;
- filePatterns = "*.bundle.definition.json";
- fileType = pattern.proxy;
- inputFiles = (
- );
- isEditable = 1;
- outputFileLists = (
- "$(SRCROOT)/xcodescripts/bundle_output.xcfilelist",
- );
- outputFiles = (
- );
- runOncePerArchitecture = 0;
- script = "$SRCROOT/xcodescripts/bundle_rule.sh\n";
- };
- 93EF33472B16A288000BA829 /* PBXBuildRule */ = {
- isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.proxy.script;
- filePatterns = "*.bundle.definition.json";
- fileType = pattern.proxy;
- inputFiles = (
- );
- isEditable = 1;
- outputFileLists = (
- "$(SRCROOT)/xcodescripts/bundle_output.xcfilelist",
- );
- outputFiles = (
- );
- runOncePerArchitecture = 0;
- script = "$SRCROOT/xcodescripts/bundle_rule.sh\n";
- };
-/* End PBXBuildRule section */
-
/* Begin PBXContainerItemProxy section */
+ 34B020CE29A558B10058A44B /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 3409D692290DB96D006384F8;
+ remoteInfo = libsystem_malloc_exclavekit;
+ };
3FE9201516A9111400D1238A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
@@ -445,34 +388,6 @@
remoteGlobalIDString = 925383D41BD03C0500F745DB;
remoteInfo = darwintests;
};
- 93D0A0942B16AFD400009B69 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 925383D41BD03C0500F745DB;
- remoteInfo = darwintests;
- };
- 93D0A0962B16AFDB00009B69 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 93EF33412B16A224000BA829;
- remoteInfo = "exclavekit-darwintest-SystemBundle";
- };
- 93D0A0982B16AFE800009B69 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 93D0A0872B16AFA000009B69;
- remoteInfo = "exclavecore-darwintest-SystemBundle";
- };
- 93D0A09A2B16AFF600009B69 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 925383D41BD03C0500F745DB;
- remoteInfo = darwintests;
- };
B2FE94B72ABA5A9F00924E15 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3FFC1BE516A908F800027192 /* Project object */;
@@ -532,6 +447,15 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
+ 34B020C129A545320058A44B /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = /usr/share/man/man1/;
+ dstSubfolderSpec = 0;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ };
456E51C7197DF0D600A7E488 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -545,19 +469,9 @@
isa = PBXCopyFilesBuildPhase;
buildActionMask = 8;
dstPath = "$(SYSTEM_PREFIX)/usr/include";
- dstSubfolderSpec = 0;
+ dstSubfolderSpec = 16;
files = (
B2CDBA112A81653400E76A55 /* allocator.modulemap in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 1;
- };
- B26866982BCF22E0005FBF0B /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 8;
- dstPath = "$(SYSTEM_PREFIX)/usr/include";
- dstSubfolderSpec = 0;
- files = (
- B26866992BCF22F2005FBF0B /* allocator.modulemap in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
};
@@ -573,7 +487,9 @@
2BED1E6A203E2F7700CB8C15 /* make_tapi_happy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = make_tapi_happy.h; sourceTree = "<group>"; };
3408F6B92912EC2E0036FFCF /* libmalloc_exclavekit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_exclavekit.xcconfig; sourceTree = "<group>"; };
3409D6D8290DB96D006384F8 /* libsystem_malloc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_malloc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 34B020C329A545320058A44B /* libsystem_malloc_exclavekit_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libsystem_malloc_exclavekit_test; sourceTree = BUILT_PRODUCTS_DIR; };
34B020CA29A545570058A44B /* libmalloc_exclavekit_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_exclavekit_test.xcconfig; sourceTree = "<group>"; };
+ 34B020CC29A547340058A44B /* libmalloc_exclavekit_test.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = libmalloc_exclavekit_test.c; sourceTree = "<group>"; };
3A3397BF2981EF3500F9AFAD /* nano_common_tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = nano_common_tests.m; sourceTree = "<group>"; };
3D157E7320354E02001630BF /* perfdata.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = perfdata.framework; path = ../MacOSX10.14.Internal.sdk/System/Library/PrivateFrameworks/perfdata.framework; sourceTree = SDKROOT; };
3FC452FF18E4ABFE003D6A38 /* manpages.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = manpages.sh; sourceTree = "<group>"; };
@@ -596,6 +512,7 @@
456E51C9197DF0D600A7E488 /* libmalloc_stress_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libmalloc_stress_test; sourceTree = BUILT_PRODUCTS_DIR; };
4D20007425BA687B0018FFE6 /* malloc_zone_unregister_test.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = malloc_zone_unregister_test.c; sourceTree = "<group>"; };
4D38D0F828EF983000B75207 /* malloc_type.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = malloc_type.c; sourceTree = "<group>"; };
+ 4D7879A728EFA64900DF15BE /* malloc_type.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = malloc_type.h; sourceTree = "<group>"; };
4D83DB142422F91A00CECCFE /* pgm_integration.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pgm_integration.c; sourceTree = "<group>"; tabWidth = 2; };
4D87505A23F1D680005E25AA /* pgm_testing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pgm_testing.h; sourceTree = "<group>"; tabWidth = 2; };
4D87505B23F1DB2E005E25AA /* pgm_allocator.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pgm_allocator.c; sourceTree = "<group>"; tabWidth = 2; };
@@ -627,24 +544,14 @@
925383D11BD03B4A00F745DB /* stress_test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stress_test.c; sourceTree = "<group>"; };
925383D31BD03B8F00F745DB /* manpages.lst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = manpages.lst; sourceTree = "<group>"; };
93C629F42ACB71240006CBDA /* xzone_metapool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xzone_metapool.c; sourceTree = "<group>"; };
- 93D0A0752B16AAE500009B69 /* EVE.libmalloc.exclavecore-darwintest.bundle.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavecore-darwintest.bundle.definition.json"; path = "System/ExclaveCore/usr/local/share/bundle/EVE.libmalloc.exclavecore-darwintest.bundle.definition.json"; sourceTree = SDKROOT; };
- 93D0A0762B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavekit-darwintest.bundle.definition.json"; path = "System/ExclaveCore/usr/local/share/bundle/EVE.libmalloc.exclavekit-darwintest.bundle.definition.json"; sourceTree = SDKROOT; };
- 93D0A0782B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json"; path = "System/ExclaveCore/usr/local/share/bundle/EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json"; sourceTree = SDKROOT; };
- 93D0A0792B16AAE500009B69 /* EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json"; path = "System/ExclaveCore/usr/local/share/bundle/EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json"; sourceTree = SDKROOT; };
- 93D0A07B2B16AB1F00009B69 /* EVE.libmalloc.exclavecore-darwintest.component.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavecore-darwintest.component.definition.json"; path = "System/ExclaveCore/usr/local/share/component/EVE.libmalloc.exclavecore-darwintest.component.definition.json"; sourceTree = SDKROOT; };
- 93D0A07D2B16AB1F00009B69 /* EVE.libmalloc.exclavekit-darwintest.component.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavekit-darwintest.component.definition.json"; path = "System/ExclaveCore/usr/local/share/component/EVE.libmalloc.exclavekit-darwintest.component.definition.json"; sourceTree = SDKROOT; };
- 93D0A07E2B16AB1F00009B69 /* EVE.libmalloc.exclavecore-darwintest.new.component.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavecore-darwintest.new.component.definition.json"; path = "System/ExclaveCore/usr/local/share/component/EVE.libmalloc.exclavecore-darwintest.new.component.definition.json"; sourceTree = SDKROOT; };
- 93D0A0852B16AE5A00009B69 /* libmalloc_exclavecore_darwintests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_exclavecore_darwintests.xcconfig; sourceTree = "<group>"; };
- 93D0A0862B16AE5A00009B69 /* libmalloc_exclavekit_darwintests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_exclavekit_darwintests.xcconfig; sourceTree = "<group>"; };
- 93D0A0902B16AFA000009B69 /* exclavecore-darwintest-SystemBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "exclavecore-darwintest-SystemBundle.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
- 93EF33422B16A224000BA829 /* exclavekit-darwintest-SystemBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "exclavekit-darwintest-SystemBundle.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
96C6DA1F27DAC25C008D0061 /* magazine_large_tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = magazine_large_tests.m; sourceTree = "<group>"; };
96E1C8ED2653373700B23906 /* magazine_medium_test.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = magazine_medium_test.c; sourceTree = "<group>"; };
B23096182AB4F3DE00917598 /* xzone_introspect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = xzone_introspect.h; path = src/xzone/xzone_introspect.h; sourceTree = SOURCE_ROOT; };
B2395C7629EE0962006E9545 /* _ptrcheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _ptrcheck.h; sourceTree = "<group>"; };
B23F6AB02A982F630062A4E0 /* libmalloc_common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_common.xcconfig; sourceTree = "<group>"; };
B24F716229B2927B0064241F /* libmicrotest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmicrotest.a; path = System/ExclaveKit/usr/lib/libmicrotest.a; sourceTree = SDKROOT; };
- B2507D572A3A677700FC0B66 /* malloc_private_exclaves.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = malloc_private_exclaves.modulemap; sourceTree = "<group>"; };
+ B2507D572A3A677700FC0B66 /* malloc_private_exclavekit.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = malloc_private_exclavekit.modulemap; sourceTree = "<group>"; };
+ B260D0BC29A5973B0038CC9D /* zone.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = zone.c; sourceTree = "<group>"; };
B26D4A9B2A32B1D000591E03 /* libmalloc_exclavecore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_exclavecore.xcconfig; sourceTree = "<group>"; };
B26D4AA02A32B3CC00591E03 /* libmalloc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmalloc.a; sourceTree = BUILT_PRODUCTS_DIR; };
B293DBC12AB11FF500EA1B30 /* libmalloc_exclaves_introspector.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_exclaves_introspector.xcconfig; sourceTree = "<group>"; };
@@ -653,13 +560,11 @@
B299F39B2B48D5DB00EA6D23 /* xzone_introspect_stub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xzone_introspect_stub.c; sourceTree = "<group>"; };
B29E9A5829FC651300C0EBFF /* malloc_exclaves.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = malloc_exclaves.c; sourceTree = "<group>"; };
B2B1803329BBCB2F00B4D3D3 /* bounds_test.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = bounds_test.c; sourceTree = "<group>"; };
- B2BF0A992C069910008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json"; path = "System/ExclaveCore/usr/local/share/bundle/EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json"; sourceTree = SDKROOT; };
- B2BF0A9A2C069910008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json"; path = "System/ExclaveCore/usr/local/share/bundle/EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json"; sourceTree = SDKROOT; };
- B2BF0A9B2C069AB7008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.component.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavecore-darwintest.asan.component.definition.json"; path = "System/ExclaveCore/usr/local/share/component/EVE.libmalloc.exclavecore-darwintest.asan.component.definition.json"; sourceTree = SDKROOT; };
- B2BF0A9C2C069AB7008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.component.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavekit-darwintest.asan.component.definition.json"; path = "System/ExclaveCore/usr/local/share/component/EVE.libmalloc.exclavekit-darwintest.asan.component.definition.json"; sourceTree = SDKROOT; };
- B2BF0A9D2C069BA8008F9700 /* EVE.libmalloc.exclavekit-darwintest.new.component.definition.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "EVE.libmalloc.exclavekit-darwintest.new.component.definition.json"; path = "System/ExclaveCore/usr/local/share/componen/EVE.libmalloc.exclavekit-darwintest.new.component.definition.json"; sourceTree = SDKROOT; };
B2C02C0429A8529900BD0C10 /* _platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _platform.h; sourceTree = "<group>"; };
B2CDBA0A2A8164AA00E76A55 /* allocator.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = allocator.modulemap; sourceTree = "<group>"; };
+ B2D3BDD72A673A01003FBE1C /* knrheap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = knrheap.c; sourceTree = "<group>"; };
+ B2F5F12E297202CE00DFEFBB /* k_r_malloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = k_r_malloc.h; sourceTree = "<group>"; };
+ B2F5F13E2972042700DFEFBB /* heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = heap.h; sourceTree = "<group>"; };
B2F5F14329726BC500DFEFBB /* liblibc.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = liblibc.tbd; path = System/ExclaveKit/usr/lib/system/liblibc.tbd; sourceTree = SDKROOT; };
B61341DD20114B070038D163 /* ktrace.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ktrace.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.Internal.sdk/System/Library/PrivateFrameworks/ktrace.framework; sourceTree = DEVELOPER_DIR; };
B629CF29202BA3C2007719B9 /* libmalloc_resolver.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libmalloc_resolver.xcconfig; sourceTree = "<group>"; };
@@ -757,6 +662,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 34B020C029A545320058A44B /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ B24F716329B2927B0064241F /* libmicrotest.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
3FE91FE516A90AEC00D1238A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -854,6 +767,14 @@
path = tools;
sourceTree = "<group>";
};
+ 34B020CB29A546FE0058A44B /* exclavekit */ = {
+ isa = PBXGroup;
+ children = (
+ 34B020CC29A547340058A44B /* libmalloc_exclavekit_test.c */,
+ );
+ path = exclavekit;
+ sourceTree = "<group>";
+ };
3FE91FC816A90A8D00D1238A /* man */ = {
isa = PBXGroup;
children = (
@@ -870,6 +791,7 @@
children = (
06057A272A56B4B8005EF06B /* instrumentation.h */,
06057A282A56B4B8005EF06B /* instrumentation.c */,
+ B2F5F129297202CE00DFEFBB /* knrheap */,
F765F92729217BAA00E9649E /* xzone */,
C95742891BF3FD290027269A /* base.h */,
3FE91FD116A90A8D00D1238A /* bitarray.c */,
@@ -935,8 +857,6 @@
3FE91FDF16A90A8D00D1238A /* xcodeconfig */ = {
isa = PBXGroup;
children = (
- 93D0A0852B16AE5A00009B69 /* libmalloc_exclavecore_darwintests.xcconfig */,
- 93D0A0862B16AE5A00009B69 /* libmalloc_exclavekit_darwintests.xcconfig */,
B293DBC12AB11FF500EA1B30 /* libmalloc_exclaves_introspector.xcconfig */,
3FE91FE016A90A8D00D1238A /* libmalloc.xcconfig */,
B23F6AB02A982F630062A4E0 /* libmalloc_common.xcconfig */,
@@ -976,10 +896,9 @@
C0ACD6C82510274B000C20CB /* libmalloc_xctests.xctest */,
3409D6D8290DB96D006384F8 /* libsystem_malloc.dylib */,
F7FC75962979045000D3F81F /* libmalloc_type_stubs.a */,
+ 34B020C329A545320058A44B /* libsystem_malloc_exclavekit_test */,
B26D4AA02A32B3CC00591E03 /* libmalloc.a */,
B293DBCD2AB272BA00EA1B30 /* libmalloc_exclaves_introspector.framework */,
- 93EF33422B16A224000BA829 /* exclavekit-darwintest-SystemBundle.bundle */,
- 93D0A0902B16AFA000009B69 /* exclavecore-darwintest-SystemBundle.bundle */,
);
name = Products;
sourceTree = "<group>";
@@ -987,6 +906,7 @@
3FE91FF716A90BEF00D1238A /* include */ = {
isa = PBXGroup;
children = (
+ B2F5F13D2972042700DFEFBB /* knrheap */,
3FE91FF816A90BEF00D1238A /* malloc */,
);
path = include;
@@ -1028,7 +948,7 @@
925383BD1BD03B4A00F745DB /* tests */ = {
isa = PBXGroup;
children = (
- 93D0A0742B16AA9100009B69 /* Definitions */,
+ 34B020CB29A546FE0058A44B /* exclavekit */,
C0ACD6C92510274B000C20CB /* xctests */,
8CB962B01F7E9F610046942E /* asan.c */,
8CB962B11F7E9FD00046942E /* tsan.c */,
@@ -1070,23 +990,22 @@
path = tests;
sourceTree = "<group>";
};
- 93D0A0742B16AA9100009B69 /* Definitions */ = {
+ B2F5F129297202CE00DFEFBB /* knrheap */ = {
isa = PBXGroup;
children = (
- 93D0A0752B16AAE500009B69 /* EVE.libmalloc.exclavecore-darwintest.bundle.definition.json */,
- B2BF0A992C069910008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json */,
- 93D0A0792B16AAE500009B69 /* EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json */,
- 93D0A07B2B16AB1F00009B69 /* EVE.libmalloc.exclavecore-darwintest.component.definition.json */,
- B2BF0A9B2C069AB7008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.component.definition.json */,
- 93D0A07E2B16AB1F00009B69 /* EVE.libmalloc.exclavecore-darwintest.new.component.definition.json */,
- 93D0A0762B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json */,
- B2BF0A9A2C069910008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json */,
- 93D0A0782B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json */,
- 93D0A07D2B16AB1F00009B69 /* EVE.libmalloc.exclavekit-darwintest.component.definition.json */,
- B2BF0A9C2C069AB7008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.component.definition.json */,
- B2BF0A9D2C069BA8008F9700 /* EVE.libmalloc.exclavekit-darwintest.new.component.definition.json */,
- );
- name = Definitions;
+ B2D3BDD72A673A01003FBE1C /* knrheap.c */,
+ B260D0BC29A5973B0038CC9D /* zone.c */,
+ B2F5F12E297202CE00DFEFBB /* k_r_malloc.h */,
+ );
+ path = knrheap;
+ sourceTree = "<group>";
+ };
+ B2F5F13D2972042700DFEFBB /* knrheap */ = {
+ isa = PBXGroup;
+ children = (
+ B2F5F13E2972042700DFEFBB /* heap.h */,
+ );
+ path = knrheap;
sourceTree = "<group>";
};
B629CF45202BBDCC007719B9 /* resolver */ = {
@@ -1126,9 +1045,10 @@
isa = PBXGroup;
children = (
84637F8025C9289100D36067 /* malloc_private.modulemap */,
- B2507D572A3A677700FC0B66 /* malloc_private_exclaves.modulemap */,
+ B2507D572A3A677700FC0B66 /* malloc_private_exclavekit.modulemap */,
C9571C391C18AA1D00A67EE3 /* stack_logging.h */,
C0352EC61C3F3C3600DB5126 /* malloc_private.h */,
+ 4D7879A728EFA64900DF15BE /* malloc_type.h */,
4DFD596829524CEA00F1CA2F /* malloc_type_private.h */,
08315121215ED9C700D97E04 /* malloc_implementation.h */,
2BED1E6A203E2F7700CB8C15 /* make_tapi_happy.h */,
@@ -1166,7 +1086,7 @@
B260D0C529A70B350038CC9D /* malloc.h in Headers */,
B218ABB52B08219A00CB20FC /* xzone_introspect.h in Headers */,
B2C02C0529A8529900BD0C10 /* _platform.h in Headers */,
- B2507D582A3A67B800FC0B66 /* malloc_private_exclaves.modulemap in Headers */,
+ B2507D582A3A67B800FC0B66 /* malloc_private_exclavekit.modulemap in Headers */,
B24F713529B005330064241F /* malloc_common.h in Headers */,
B2CDBA0C2A8164C700E76A55 /* early_malloc.h in Headers */,
B28B6D002A44F90F00234081 /* malloc_private.h in Headers */,
@@ -1185,6 +1105,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ 4D7879A828EFA64900DF15BE /* malloc_type.h in Headers */,
C957428A1BF3FD290027269A /* base.h in Headers */,
6E18E02C29777E0A00EE7E0D /* early_malloc.h in Headers */,
C0352EC71C3F3C4400DB5126 /* malloc_private.h in Headers */,
@@ -1257,7 +1178,6 @@
B2226E242A90375E001703BE /* _malloc_type.h in Headers */,
B2226E252A90375E001703BE /* _platform.h in Headers */,
B2226E262A90375E001703BE /* _ptrcheck.h in Headers */,
- B268669A2BCF2401005FBF0B /* malloc_private_exclaves.modulemap in Headers */,
B2226E272A90375E001703BE /* malloc.h in Headers */,
B2226E362A9037EF001703BE /* base.h in Headers */,
B2226E352A9037EC001703BE /* printf.h in Headers */,
@@ -1348,6 +1268,24 @@
productReference = 3409D6D8290DB96D006384F8 /* libsystem_malloc.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
+ 34B020C229A545320058A44B /* libsystem_malloc_exclavekit_test */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 34B020C729A545320058A44B /* Build configuration list for PBXNativeTarget "libsystem_malloc_exclavekit_test" */;
+ buildPhases = (
+ 34B020BF29A545320058A44B /* Sources */,
+ 34B020C029A545320058A44B /* Frameworks */,
+ 34B020C129A545320058A44B /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ 34B020CF29A558B10058A44B /* PBXTargetDependency */,
+ );
+ name = libsystem_malloc_exclavekit_test;
+ productName = libsystem_malloc_exclavekit_test;
+ productReference = 34B020C329A545320058A44B /* libsystem_malloc_exclavekit_test */;
+ productType = "com.apple.product-type.tool";
+ };
3FE91FE716A90AEC00D1238A /* libsystem_malloc */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3FE91FEA16A90AEC00D1238A /* Build configuration list for PBXNativeTarget "libsystem_malloc" */;
@@ -1403,38 +1341,6 @@
productReference = 456E51C9197DF0D600A7E488 /* libmalloc_stress_test */;
productType = "com.apple.product-type.tool";
};
- 93D0A0872B16AFA000009B69 /* exclavecore-darwintest-SystemBundle */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 93D0A08D2B16AFA000009B69 /* Build configuration list for PBXNativeTarget "exclavecore-darwintest-SystemBundle" */;
- buildPhases = (
- 93D0A0882B16AFA000009B69 /* Sources */,
- );
- buildRules = (
- 93D0A08C2B16AFA000009B69 /* PBXBuildRule */,
- );
- dependencies = (
- );
- name = "exclavecore-darwintest-SystemBundle";
- productName = "exclavekit-darwintest-SystemBundle";
- productReference = 93D0A0902B16AFA000009B69 /* exclavecore-darwintest-SystemBundle.bundle */;
- productType = "com.apple.product-type.bundle";
- };
- 93EF33412B16A224000BA829 /* exclavekit-darwintest-SystemBundle */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 93EF33462B16A224000BA829 /* Build configuration list for PBXNativeTarget "exclavekit-darwintest-SystemBundle" */;
- buildPhases = (
- 93EF333E2B16A224000BA829 /* Sources */,
- );
- buildRules = (
- 93EF33472B16A288000BA829 /* PBXBuildRule */,
- );
- dependencies = (
- );
- name = "exclavekit-darwintest-SystemBundle";
- productName = "exclavekit-darwintest-SystemBundle";
- productReference = 93EF33422B16A224000BA829 /* exclavekit-darwintest-SystemBundle.bundle */;
- productType = "com.apple.product-type.bundle";
- };
B26D4A9F2A32B3CC00591E03 /* libmalloc_exclavecore */ = {
isa = PBXNativeTarget;
buildConfigurationList = B26D4AA62A32B3CC00591E03 /* Build configuration list for PBXNativeTarget "libmalloc_exclavecore" */;
@@ -1442,7 +1348,7 @@
B2226E222A903629001703BE /* Headers */,
B26D4A9C2A32B3CC00591E03 /* Sources */,
B26D4A9D2A32B3CC00591E03 /* Frameworks */,
- B26866982BCF22E0005FBF0B /* CopyFiles */,
+ B260715E2ADDE8790093A2A9 /* Create libknrheap.a/libknrheap_asan.a */,
);
buildRules = (
);
@@ -1583,6 +1489,9 @@
LastSwiftUpdateCheck = 1500;
LastUpgradeCheck = 0900;
TargetAttributes = {
+ 34B020C229A545320058A44B = {
+ CreatedOnToolsVersion = 15.0;
+ };
45039161198FFF73004EE2A3 = {
CreatedOnToolsVersion = 6.0;
};
@@ -1591,15 +1500,6 @@
};
925383D41BD03C0500F745DB = {
CreatedOnToolsVersion = 7.1;
- };
- 93DB8E7E2B1563460036024F = {
- CreatedOnToolsVersion = 15.2;
- };
- 93DB8E822B1563540036024F = {
- CreatedOnToolsVersion = 15.2;
- };
- 93EF33412B16A224000BA829 = {
- CreatedOnToolsVersion = 15.2;
};
B26D4A9F2A32B3CC00591E03 = {
CreatedOnToolsVersion = 15.0;
@@ -1639,8 +1539,6 @@
3FE9201116A9111000D1238A /* libmalloc */,
E4B7FCB222000DAD0010A840 /* libmalloc_driverkit */,
45039161198FFF73004EE2A3 /* libmalloc_test */,
- 93DB8E7E2B1563460036024F /* libmalloc_test_exclavekit */,
- 93DB8E822B1563540036024F /* libmalloc_test_exclavecore */,
3FE91FE716A90AEC00D1238A /* libsystem_malloc */,
B6910F65202B630D00FF2EB0 /* libmalloc_mp */,
B629CF2B202BB337007719B9 /* libmalloc_alt */,
@@ -1653,11 +1551,10 @@
B60A57932009307E006215CB /* executables */,
C0ACD6C72510274B000C20CB /* libmalloc_xctests */,
3409D692290DB96D006384F8 /* libsystem_malloc_exclavekit */,
+ 34B020C229A545320058A44B /* libsystem_malloc_exclavekit_test */,
B26D4A9F2A32B3CC00591E03 /* libmalloc_exclavecore */,
B2FE94B32ABA5A9500924E15 /* libmalloc_frameworks */,
B293DBCC2AB272BA00EA1B30 /* libmalloc_exclaves_introspector */,
- 93EF33412B16A224000BA829 /* exclavekit-darwintest-SystemBundle */,
- 93D0A0872B16AFA000009B69 /* exclavecore-darwintest-SystemBundle */,
);
};
/* End PBXProject section */
@@ -1702,6 +1599,24 @@
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/bash;
shellScript = ". \"${SCRIPT_INPUT_FILE_0}\"\n";
+ };
+ B260715E2ADDE8790093A2A9 /* Create libknrheap.a/libknrheap_asan.a */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "Create libknrheap.a/libknrheap_asan.a";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "cp $INSTALL_DIR/libmalloc.a $INSTALL_DIR/libknrheap.a\ncp $INSTALL_DIR/libmalloc_asan.a $INSTALL_DIR/libknrheap_asan.a\n";
};
B629CF2A202BB226007719B9 /* Symlink normal variant */ = {
isa = PBXShellScriptBuildPhase;
@@ -1803,6 +1718,14 @@
B29E9A5929FC651300C0EBFF /* malloc_exclaves.c in Sources */,
B218ABB22B0816DF00CB20FC /* xzone_introspect.c in Sources */,
93C629F72ACB71240006CBDA /* xzone_metapool.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 34B020BF29A545320058A44B /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 34B020CD29A547340058A44B /* libmalloc_exclavekit_test.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1880,26 +1803,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 93D0A0882B16AFA000009B69 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- B2BF0AD82C06BE97008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json in Sources */,
- 93D0A0932B16AFB700009B69 /* EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json in Sources */,
- 93D0A0922B16AFB700009B69 /* EVE.libmalloc.exclavecore-darwintest.bundle.definition.json in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- 93EF333E2B16A224000BA829 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- B2BF0AD72C06BE8E008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json in Sources */,
- 93D0A0822B16ABAA00009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json in Sources */,
- 93D0A0832B16ABBB00009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
B26D4A9C2A32B3CC00591E03 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2060,6 +1963,11 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
+ 34B020CF29A558B10058A44B /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 3409D692290DB96D006384F8 /* libsystem_malloc_exclavekit */;
+ targetProxy = 34B020CE29A558B10058A44B /* PBXContainerItemProxy */;
+ };
3FE9201616A9111400D1238A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3FE91FFD16A9109E00D1238A /* libmalloc_eOS */;
@@ -2080,26 +1988,6 @@
target = 925383D41BD03C0500F745DB /* darwintests */;
targetProxy = 925383D81BD03D0000F745DB /* PBXContainerItemProxy */;
};
- 93D0A0952B16AFD400009B69 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 925383D41BD03C0500F745DB /* darwintests */;
- targetProxy = 93D0A0942B16AFD400009B69 /* PBXContainerItemProxy */;
- };
- 93D0A0972B16AFDB00009B69 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 93EF33412B16A224000BA829 /* exclavekit-darwintest-SystemBundle */;
- targetProxy = 93D0A0962B16AFDB00009B69 /* PBXContainerItemProxy */;
- };
- 93D0A0992B16AFE800009B69 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 93D0A0872B16AFA000009B69 /* exclavecore-darwintest-SystemBundle */;
- targetProxy = 93D0A0982B16AFE800009B69 /* PBXContainerItemProxy */;
- };
- 93D0A09B2B16AFF600009B69 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 925383D41BD03C0500F745DB /* darwintests */;
- targetProxy = 93D0A09A2B16AFF600009B69 /* PBXContainerItemProxy */;
- };
B2FE94B82ABA5A9F00924E15 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = B293DBCC2AB272BA00EA1B30 /* libmalloc_exclaves_introspector */;
@@ -2158,6 +2046,23 @@
baseConfigurationReference = 3408F6B92912EC2E0036FFCF /* libmalloc_exclavekit.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
+ };
+ name = Release;
+ };
+ 34B020C829A545320058A44B /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 34B020CA29A545570058A44B /* libmalloc_exclavekit_test.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = exclavekit.iphoneos.internal;
+ };
+ name = Debug;
+ };
+ 34B020C929A545320058A44B /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 34B020CA29A545570058A44B /* libmalloc_exclavekit_test.xcconfig */;
+ buildSettings = {
+ SDKROOT = exclavekit.iphoneos.internal;
};
name = Release;
};
@@ -2299,78 +2204,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx.internal;
SUPPORTED_PLATFORMS = "macosx iphoneos appletvos watchos";
- };
- name = Release;
- };
- 93D0A08E2B16AFA000009B69 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 93D0A0852B16AE5A00009B69 /* libmalloc_exclavecore_darwintests.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- GENERATE_INFOPLIST_FILE = YES;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- 93D0A08F2B16AFA000009B69 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 93D0A0852B16AE5A00009B69 /* libmalloc_exclavecore_darwintests.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- GENERATE_INFOPLIST_FILE = YES;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
- 93DB8E7F2B1563460036024F /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- CODE_SIGN_STYLE = Automatic;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- 93DB8E802B1563460036024F /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- CODE_SIGN_STYLE = Automatic;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
- 93DB8E842B1563540036024F /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- CODE_SIGN_STYLE = Automatic;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- 93DB8E852B1563540036024F /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- CODE_SIGN_STYLE = Automatic;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
- 93EF33442B16A224000BA829 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 93D0A0862B16AE5A00009B69 /* libmalloc_exclavekit_darwintests.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- GENERATE_INFOPLIST_FILE = YES;
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- 93EF33452B16A224000BA829 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 93D0A0862B16AE5A00009B69 /* libmalloc_exclavekit_darwintests.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- GENERATE_INFOPLIST_FILE = YES;
- PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
@@ -2849,6 +2682,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ 34B020C729A545320058A44B /* Build configuration list for PBXNativeTarget "libsystem_malloc_exclavekit_test" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 34B020C829A545320058A44B /* Debug */,
+ 34B020C929A545320058A44B /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
3FE91FEA16A90AEC00D1238A /* Build configuration list for PBXNativeTarget "libsystem_malloc" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -2912,42 +2754,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 93D0A08D2B16AFA000009B69 /* Build configuration list for PBXNativeTarget "exclavecore-darwintest-SystemBundle" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 93D0A08E2B16AFA000009B69 /* Debug */,
- 93D0A08F2B16AFA000009B69 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 93DB8E812B1563460036024F /* Build configuration list for PBXAggregateTarget "libmalloc_test_exclavekit" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 93DB8E7F2B1563460036024F /* Debug */,
- 93DB8E802B1563460036024F /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 93DB8E832B1563540036024F /* Build configuration list for PBXAggregateTarget "libmalloc_test_exclavecore" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 93DB8E842B1563540036024F /* Debug */,
- 93DB8E852B1563540036024F /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 93EF33462B16A224000BA829 /* Build configuration list for PBXNativeTarget "exclavekit-darwintest-SystemBundle" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 93EF33442B16A224000BA829 /* Debug */,
- 93EF33452B16A224000BA829 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
B26D4AA62A32B3CC00591E03 /* Build configuration list for PBXNativeTarget "libmalloc_exclavecore" */ = {
isa = XCConfigurationList;
buildConfigurations = (