Loading...
--- libmalloc/libmalloc-792.60.6/libmalloc.xcodeproj/project.pbxproj
+++ libmalloc/libmalloc-646.0.13/libmalloc.xcodeproj/project.pbxproj
@@ -13,8 +13,6 @@
buildPhases = (
3FC1927C16DD946500315C26 /* Install Man Pages */,
3FE9201D16A9143E00D1238A /* Sanitise Headers (rdar://problem/10241868) */,
- 4D0064DE2CB875050073E766 /* Install Trial namespace plists */,
- 4D0064E02CB875950073E766 /* Install Trial known factors plists */,
);
dependencies = (
F7B02A1729791423002DDF30 /* PBXTargetDependency */,
@@ -56,8 +54,8 @@
);
dependencies = (
93D0A0952B16AFD400009B69 /* PBXTargetDependency */,
+ 93D0A0972B16AFDB00009B69 /* PBXTargetDependency */,
93D0A0992B16AFE800009B69 /* PBXTargetDependency */,
- 93D0A0972B16AFDB00009B69 /* PBXTargetDependency */,
);
name = libmalloc_test_exclavecore;
productName = libmalloc_test_exclavecore;
@@ -103,6 +101,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 */; };
@@ -118,8 +117,6 @@
3FE9200116A9109E00D1238A /* magazine_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3FE91FD616A90A8D00D1238A /* magazine_malloc.c */; };
3FE9200216A9109E00D1238A /* magmallocProvider.d in Sources */ = {isa = PBXBuildFile; fileRef = 3FE91FD716A90A8D00D1238A /* magmallocProvider.d */; };
3FE9200316A9109E00D1238A /* malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3FE91FD816A90A8D00D1238A /* malloc.c */; };
- 4D0064DF2CB8752B0073E766 /* com.apple.Trial.NamespaceDescriptor.1900.plist in Install Trial namespace plists */ = {isa = PBXBuildFile; fileRef = 4D39B1A82CB491C500899E33 /* com.apple.Trial.NamespaceDescriptor.1900.plist */; };
- 4D0064E12CB875B00073E766 /* KnownFactors.PROBABILISTIC_GUARD_MALLOC_TARGETED_COVERAGE.plist in Install Trial known factors plists */ = {isa = PBXBuildFile; fileRef = 4D39B1A92CB491C500899E33 /* KnownFactors.PROBABILISTIC_GUARD_MALLOC_TARGETED_COVERAGE.plist */; };
4D10425125CB637F00F70ABD /* stack_trace.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DABD07E25CB621700AFF1F8 /* stack_trace.c */; };
4D10425225CB637F00F70ABD /* stack_trace.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DABD07E25CB621700AFF1F8 /* stack_trace.c */; };
4D10425325CB638000F70ABD /* stack_trace.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DABD07E25CB621700AFF1F8 /* stack_trace.c */; };
@@ -163,16 +160,16 @@
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 */; };
B218ABB32B0818CD00CB20FC /* xzone_introspect.h in Headers */ = {isa = PBXBuildFile; fileRef = B23096182AB4F3DE00917598 /* xzone_introspect.h */; };
B218ABB42B08219700CB20FC /* xzone_introspect.c in Sources */ = {isa = PBXBuildFile; fileRef = B293DBC22AB1223E00EA1B30 /* xzone_introspect.c */; };
B218ABB52B08219A00CB20FC /* xzone_introspect.h in Headers */ = {isa = PBXBuildFile; fileRef = B23096182AB4F3DE00917598 /* xzone_introspect.h */; };
- B21C130A2BF2F30200D41860 /* instrumentation.c in Sources */ = {isa = PBXBuildFile; fileRef = 06057A282A56B4B8005EF06B /* instrumentation.c */; };
- B21C130B2BF2F30800D41860 /* instrumentation.c in Sources */ = {isa = PBXBuildFile; fileRef = 06057A282A56B4B8005EF06B /* instrumentation.c */; };
B2226E192A9035AA001703BE /* malloc_common.c in Sources */ = {isa = PBXBuildFile; fileRef = B66C71D82034BFAE0047E265 /* malloc_common.c */; settings = {COMPILER_FLAGS = "$(MALLOC_BOUNDS_ATTRIBUTES_SUPPORT)"; }; };
B2226E1A2A9035AF001703BE /* xzone_segment.c in Sources */ = {isa = PBXBuildFile; fileRef = F765F92829217BAA00E9649E /* xzone_segment.c */; };
B2226E1B2A9035B2001703BE /* xzone_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = F765F92929217BAA00E9649E /* xzone_malloc.c */; };
@@ -182,14 +179,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 */; };
@@ -211,18 +208,15 @@
B24C35932AB27D0A00E3870E /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C957426D1BF2C0C80027269A /* internal.h */; };
B24C35A02AB2821800E3870E /* malloc_printf.c in Sources */ = {isa = PBXBuildFile; fileRef = B65FBE2B2087AA2F00E21F59 /* malloc_printf.c */; };
B24C35A32AB28FA400E3870E /* early_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 6E18E02B29777E0A00EE7E0D /* early_malloc.c */; };
- B24C5D7C2D14DA760050A0BE /* ktrace.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B61341DD20114B070038D163 /* ktrace.framework */; };
- B24C5D822D14DA8B0050A0BE /* ktrace_count.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24C5D812D14DA8B0050A0BE /* ktrace_count.cpp */; };
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 */; };
@@ -232,8 +226,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, ); }; };
@@ -423,6 +415,13 @@
/* 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 */;
@@ -538,6 +537,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,28 +553,6 @@
dstSubfolderSpec = 0;
files = (
);
- runOnlyForDeploymentPostprocessing = 1;
- };
- 4D0064DE2CB875050073E766 /* Install Trial namespace plists */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 8;
- dstPath = /System/Library/Trial/NamespaceDescriptors;
- dstSubfolderSpec = 0;
- files = (
- 4D0064DF2CB8752B0073E766 /* com.apple.Trial.NamespaceDescriptor.1900.plist in Install Trial namespace plists */,
- );
- name = "Install Trial namespace plists";
- runOnlyForDeploymentPostprocessing = 1;
- };
- 4D0064E02CB875950073E766 /* Install Trial known factors plists */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 8;
- dstPath = /System/Library/Trial/AllowedFactorsAndDefaults;
- dstSubfolderSpec = 0;
- files = (
- 4D0064E12CB875B00073E766 /* KnownFactors.PROBABILISTIC_GUARD_MALLOC_TARGETED_COVERAGE.plist in Install Trial known factors plists */,
- );
- name = "Install Trial known factors plists";
runOnlyForDeploymentPostprocessing = 1;
};
B24F716029B188100064241F /* CopyFiles */ = {
@@ -576,16 +562,6 @@
dstSubfolderSpec = 0;
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;
};
@@ -601,7 +577,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>"; };
@@ -624,8 +602,6 @@
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>"; };
- 4D39B1A82CB491C500899E33 /* com.apple.Trial.NamespaceDescriptor.1900.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.Trial.NamespaceDescriptor.1900.plist; sourceTree = "<group>"; };
- 4D39B1A92CB491C500899E33 /* KnownFactors.PROBABILISTIC_GUARD_MALLOC_TARGETED_COVERAGE.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = KnownFactors.PROBABILISTIC_GUARD_MALLOC_TARGETED_COVERAGE.plist; 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; };
@@ -659,21 +635,22 @@
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 = xzone_introspect.h; 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>"; };
- B24C5D802D14DA760050A0BE /* libmalloc_ktrace */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libmalloc_ktrace; sourceTree = BUILT_PRODUCTS_DIR; };
- B24C5D812D14DA8B0050A0BE /* ktrace_count.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ktrace_count.cpp; 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>"; };
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>"; };
@@ -682,10 +659,6 @@
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; };
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>"; };
B2F5F14329726BC500DFEFBB /* liblibc.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = liblibc.tbd; path = System/ExclaveKit/usr/lib/system/liblibc.tbd; sourceTree = SDKROOT; };
@@ -716,6 +689,7 @@
B6A494971F9918DD0016A799 /* calloc_test.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = calloc_test.c; sourceTree = "<group>"; };
B6A9C48C1F991716007D0853 /* malloc_free_test.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = malloc_free_test.c; sourceTree = "<group>"; };
B6AFD93B214C6198007983DA /* msl_lite_support.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = msl_lite_support.c; sourceTree = "<group>"; };
+ B6C1C9C720D9B70F002CCC0B /* nano_trace_replay.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = nano_trace_replay.c; sourceTree = "<group>"; };
B6CA644D1FCE2C0A00DEBA12 /* nanov2_zone.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nanov2_zone.h; sourceTree = "<group>"; };
B6CA64511FCF1AAD00DEBA12 /* nano_zone_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nano_zone_common.h; sourceTree = "<group>"; };
B6D2ED512007D76F007AF994 /* libmalloc_replay */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libmalloc_replay; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -784,6 +758,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 34B020C029A545320058A44B /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ B24F716329B2927B0064241F /* libmicrotest.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
3FE91FE516A90AEC00D1238A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -802,14 +784,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- B24C5D7A2D14DA760050A0BE /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- B24C5D7C2D14DA760050A0BE /* ktrace.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -883,11 +857,18 @@
08C28B411D501D2C000AE997 /* tools */ = {
isa = PBXGroup;
children = (
- B24C5D812D14DA8B0050A0BE /* ktrace_count.cpp */,
B6D2ED552007D91A007AF994 /* malloc_replay.cpp */,
B6D2ED562007D91A007AF994 /* malloc_replay.h */,
);
path = tools;
+ sourceTree = "<group>";
+ };
+ 34B020CB29A546FE0058A44B /* exclavekit */ = {
+ isa = PBXGroup;
+ children = (
+ 34B020CC29A547340058A44B /* libmalloc_exclavekit_test.c */,
+ );
+ path = exclavekit;
sourceTree = "<group>";
};
3FE91FC816A90A8D00D1238A /* man */ = {
@@ -906,7 +887,7 @@
children = (
06057A272A56B4B8005EF06B /* instrumentation.h */,
06057A282A56B4B8005EF06B /* instrumentation.c */,
- F765F92729217BAA00E9649E /* xzone_malloc */,
+ F765F92729217BAA00E9649E /* xzone */,
C95742891BF3FD290027269A /* base.h */,
3FE91FD116A90A8D00D1238A /* bitarray.c */,
3FE91FD216A90A8D00D1238A /* bitarray.h */,
@@ -1012,11 +993,11 @@
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 */,
- B24C5D802D14DA760050A0BE /* libmalloc_ktrace */,
);
name = Products;
sourceTree = "<group>";
@@ -1055,27 +1036,18 @@
3FE91FDF16A90A8D00D1238A /* xcodeconfig */,
3FE91FE216A90A8D00D1238A /* xcodescripts */,
08C28B411D501D2C000AE997 /* tools */,
- 4D39B1AA2CB491C500899E33 /* trial */,
3FE91FE916A90AEC00D1238A /* Products */,
084F5E821D50204F006CD296 /* Frameworks */,
);
sourceTree = "<group>";
tabWidth = 4;
usesTabs = 1;
- };
- 4D39B1AA2CB491C500899E33 /* trial */ = {
- isa = PBXGroup;
- children = (
- 4D39B1A82CB491C500899E33 /* com.apple.Trial.NamespaceDescriptor.1900.plist */,
- 4D39B1A92CB491C500899E33 /* KnownFactors.PROBABILISTIC_GUARD_MALLOC_TARGETED_COVERAGE.plist */,
- );
- path = trial;
- sourceTree = "<group>";
};
925383BD1BD03B4A00F745DB /* tests */ = {
isa = PBXGroup;
children = (
93D0A0742B16AA9100009B69 /* Definitions */,
+ 34B020CB29A546FE0058A44B /* exclavekit */,
C0ACD6C92510274B000C20CB /* xctests */,
8CB962B01F7E9F610046942E /* asan.c */,
8CB962B11F7E9FD00046942E /* tsan.c */,
@@ -1099,6 +1071,7 @@
925383D01BD03B4A00F745DB /* Makefile */,
B6536A6320475BA4005FBE22 /* basic_malloc_free_perf.c */,
B675F74520213D0A00B5038B /* nano_tests.c */,
+ B6C1C9C720D9B70F002CCC0B /* nano_trace_replay.c */,
4D87505A23F1D680005E25AA /* pgm_testing.h */,
4DD5962D23E22A3D00D573D2 /* pgm_internals.c */,
4D87505B23F1DB2E005E25AA /* pgm_allocator.c */,
@@ -1120,13 +1093,12 @@
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 */,
+ 93D0A0762B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json */,
+ 93D0A0782B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json */,
93D0A07B2B16AB1F00009B69 /* EVE.libmalloc.exclavecore-darwintest.component.definition.json */,
- B2BF0A9B2C069AB7008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.component.definition.json */,
- 93D0A0762B16AAE500009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json */,
- B2BF0A9A2C069910008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json */,
+ 93D0A07E2B16AB1F00009B69 /* EVE.libmalloc.exclavecore-darwintest.new.component.definition.json */,
93D0A07D2B16AB1F00009B69 /* EVE.libmalloc.exclavekit-darwintest.component.definition.json */,
- B2BF0A9C2C069AB7008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.component.definition.json */,
);
name = Definitions;
sourceTree = "<group>";
@@ -1168,7 +1140,7 @@
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 */,
4DFD596829524CEA00F1CA2F /* malloc_type_private.h */,
@@ -1178,7 +1150,7 @@
path = private;
sourceTree = "<group>";
};
- F765F92729217BAA00E9649E /* xzone_malloc */ = {
+ F765F92729217BAA00E9649E /* xzone */ = {
isa = PBXGroup;
children = (
93C629F42ACB71240006CBDA /* xzone_metapool.c */,
@@ -1190,7 +1162,7 @@
F765F92929217BAA00E9649E /* xzone_malloc.c */,
F765F92829217BAA00E9649E /* xzone_segment.c */,
);
- path = xzone_malloc;
+ path = xzone;
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -1208,7 +1180,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 */,
@@ -1299,7 +1271,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 */,
@@ -1390,6 +1361,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" */;
@@ -1477,22 +1466,6 @@
productReference = 93EF33422B16A224000BA829 /* exclavekit-darwintest-SystemBundle.bundle */;
productType = "com.apple.product-type.bundle";
};
- B24C5D772D14DA760050A0BE /* libmalloc_ktrace */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = B24C5D7D2D14DA760050A0BE /* Build configuration list for PBXNativeTarget "libmalloc_ktrace" */;
- buildPhases = (
- B24C5D782D14DA760050A0BE /* Sources */,
- B24C5D7A2D14DA760050A0BE /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = libmalloc_ktrace;
- productName = libmalloc_ktrace;
- productReference = B24C5D802D14DA760050A0BE /* libmalloc_ktrace */;
- productType = "com.apple.product-type.tool";
- };
B26D4A9F2A32B3CC00591E03 /* libmalloc_exclavecore */ = {
isa = PBXNativeTarget;
buildConfigurationList = B26D4AA62A32B3CC00591E03 /* Build configuration list for PBXNativeTarget "libmalloc_exclavecore" */;
@@ -1500,7 +1473,6 @@
B2226E222A903629001703BE /* Headers */,
B26D4A9C2A32B3CC00591E03 /* Sources */,
B26D4A9D2A32B3CC00591E03 /* Frameworks */,
- B26866982BCF22E0005FBF0B /* CopyFiles */,
);
buildRules = (
);
@@ -1641,6 +1613,9 @@
LastSwiftUpdateCheck = 1500;
LastUpgradeCheck = 0900;
TargetAttributes = {
+ 34B020C229A545320058A44B = {
+ CreatedOnToolsVersion = 15.0;
+ };
45039161198FFF73004EE2A3 = {
CreatedOnToolsVersion = 6.0;
};
@@ -1705,13 +1680,13 @@
3FE91FFD16A9109E00D1238A /* libmalloc_eOS */,
C0CE452F1C52C90500C24048 /* libmalloc_static */,
F7FC75702979045000D3F81F /* libmalloc_type_stubs */,
- B24C5D772D14DA760050A0BE /* libmalloc_ktrace */,
B6D2ED492007D76F007AF994 /* libmalloc_replay */,
456E51C8197DF0D600A7E488 /* libmalloc_stress_test */,
925383D41BD03C0500F745DB /* darwintests */,
B60A57932009307E006215CB /* executables */,
C0ACD6C72510274B000C20CB /* libmalloc_xctests */,
3409D692290DB96D006384F8 /* libsystem_malloc_exclavekit */,
+ 34B020C229A545320058A44B /* libsystem_malloc_exclavekit_test */,
B26D4A9F2A32B3CC00591E03 /* libmalloc_exclavecore */,
B2FE94B32ABA5A9500924E15 /* libmalloc_frameworks */,
B293DBCC2AB272BA00EA1B30 /* libmalloc_exclaves_introspector */,
@@ -1857,12 +1832,19 @@
B2444EF229C29C0D001D6839 /* malloc_type.c in Sources */,
B2CDBA0B2A8164C300E76A55 /* early_malloc.c in Sources */,
B29C114F2A7C2F2D00C00C07 /* malloc_printf.c in Sources */,
- B21C130A2BF2F30200D41860 /* instrumentation.c in Sources */,
B24F716629B7F10B0064241F /* sanitizer_malloc.c in Sources */,
B2CDBA122A81658D00E76A55 /* vm.c in Sources */,
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;
};
@@ -1944,8 +1926,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- B2BF0AD82C06BE97008F9700 /* EVE.libmalloc.exclavecore-darwintest.asan.bundle.definition.json in Sources */,
93D0A0922B16AFB700009B69 /* EVE.libmalloc.exclavecore-darwintest.bundle.definition.json in Sources */,
+ 93D0A0932B16AFB700009B69 /* EVE.libmalloc.exclavecore-darwintest.new.bundle.definition.json in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1953,16 +1935,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- B2BF0AD72C06BE8E008F9700 /* EVE.libmalloc.exclavekit-darwintest.asan.bundle.definition.json in Sources */,
93D0A0832B16ABBB00009B69 /* EVE.libmalloc.exclavekit-darwintest.bundle.definition.json in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- B24C5D782D14DA760050A0BE /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- B24C5D822D14DA8B0050A0BE /* ktrace_count.cpp in Sources */,
+ 93D0A0822B16ABAA00009B69 /* EVE.libmalloc.exclavekit-darwintest.new.bundle.definition.json in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1976,7 +1950,6 @@
B2226E1C2A9035CE001703BE /* malloc_type.c in Sources */,
B2226E1D2A9035D1001703BE /* early_malloc.c in Sources */,
B2226E1F2A9035F1001703BE /* malloc_printf.c in Sources */,
- B21C130B2BF2F30800D41860 /* instrumentation.c in Sources */,
B2226E202A9035F7001703BE /* sanitizer_malloc.c in Sources */,
B2226E1E2A9035D4001703BE /* vm.c in Sources */,
B2226E212A90360F001703BE /* malloc_exclaves.c in Sources */,
@@ -2127,6 +2100,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 */;
@@ -2225,6 +2203,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;
};
@@ -2438,82 +2433,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
GENERATE_INFOPLIST_FILE = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
- B24C5D7E2D14DA760050A0BE /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
- CLANG_WARN_ASSIGN_ENUM = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- COPY_PHASE_STRIP = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_PEDANTIC = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = "$(SRCROOT)/src";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
- SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
- VALID_ARCHS = "armv6 armv7 arm64 arm64_32 armv7k x86_64 x86_64h";
- };
- name = Debug;
- };
- B24C5D7F2D14DA760050A0BE /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
- CLANG_WARN_ASSIGN_ENUM = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_PEDANTIC = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = "$(SRCROOT)/src";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
- "SKIP_INSTALL[sdk=iphonesimulator*]" = YES;
- SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
- VALID_ARCHS = "armv6 armv7 arm64 arm64_32 armv7k x86_64 x86_64h";
};
name = Release;
};
@@ -2992,6 +2911,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 = (
@@ -3091,15 +3019,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- B24C5D7D2D14DA760050A0BE /* Build configuration list for PBXNativeTarget "libmalloc_ktrace" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- B24C5D7E2D14DA760050A0BE /* Debug */,
- B24C5D7F2D14DA760050A0BE /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
B26D4AA62A32B3CC00591E03 /* Build configuration list for PBXNativeTarget "libmalloc_exclavecore" */ = {
isa = XCConfigurationList;
buildConfigurations = (