diff options
| author | Richard Brooksby | 2012-05-22 20:02:28 +0100 |
|---|---|---|
| committer | Richard Brooksby | 2012-05-22 20:02:28 +0100 |
| commit | 5dc28bfc61deeb7dca77b9d74194286aa15c330f (patch) | |
| tree | 31a904a729b1d998a2ce11aaa3201db1c5836186 /mps/code | |
| parent | 177133e65a3c36feee0d61fee921d2cc550ce12f (diff) | |
| parent | eb81034355461d8be8656d8d42ec7d1cbca5944b (diff) | |
| download | emacs-5dc28bfc61deeb7dca77b9d74194286aa15c330f.tar.gz emacs-5dc28bfc61deeb7dca77b9d74194286aa15c330f.zip | |
Several tests running on xci6ll target.
Copied from Perforce
Change: 178286
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
| -rw-r--r-- | mps/code/amcss.c | 6 | ||||
| -rw-r--r-- | mps/code/misc.h | 4 | ||||
| -rw-r--r-- | mps/code/mpmss.c | 20 | ||||
| -rw-r--r-- | mps/code/mps.xcodeproj/project.pbxproj | 489 | ||||
| -rw-r--r-- | mps/code/mpstd.h | 9 | ||||
| -rw-r--r-- | mps/code/testlib.h | 7 |
6 files changed, 470 insertions, 65 deletions
diff --git a/mps/code/amcss.c b/mps/code/amcss.c index 7055bf94b70..b1a0d5e4e6b 100644 --- a/mps/code/amcss.c +++ b/mps/code/amcss.c | |||
| @@ -38,7 +38,7 @@ static mps_gen_param_s testChain[genCOUNT] = { | |||
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | /* objNULL needs to be odd so that it's ignored in exactRoots. */ | 40 | /* objNULL needs to be odd so that it's ignored in exactRoots. */ |
| 41 | #define objNULL ((mps_addr_t)0xDECEA5ED) | 41 | #define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED)) |
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | static mps_pool_t pool; | 44 | static mps_pool_t pool; |
| @@ -210,7 +210,7 @@ static void *test(void *arg, size_t s) | |||
| 210 | ramping = 1; | 210 | ramping = 1; |
| 211 | objs = 0; | 211 | objs = 0; |
| 212 | while (collections < collectionsCOUNT) { | 212 | while (collections < collectionsCOUNT) { |
| 213 | unsigned long c; | 213 | mps_word_t c; |
| 214 | size_t r; | 214 | size_t r; |
| 215 | 215 | ||
| 216 | c = mps_collections(arena); | 216 | c = mps_collections(arena); |
| @@ -221,7 +221,7 @@ static void *test(void *arg, size_t s) | |||
| 221 | printf("%lu objects (mps_collections says: %lu)\n", objs, c); | 221 | printf("%lu objects (mps_collections says: %lu)\n", objs, c); |
| 222 | 222 | ||
| 223 | /* test mps_arena_has_addr */ | 223 | /* test mps_arena_has_addr */ |
| 224 | { | 224 | if (sizeof(mps_addr_t) == 4) { /* @@@@ W3I6MV This test is bogus for 64-bit address space. */ |
| 225 | size_t hitRatio; | 225 | size_t hitRatio; |
| 226 | int hitsWanted = 4; /* aim for 4 hits (on average) */ | 226 | int hitsWanted = 4; /* aim for 4 hits (on average) */ |
| 227 | /* [Note: The for-loop condition used to be "i < 4 * hitRatio", | 227 | /* [Note: The for-loop condition used to be "i < 4 * hitRatio", |
diff --git a/mps/code/misc.h b/mps/code/misc.h index 11612fece3d..68f7a33da9e 100644 --- a/mps/code/misc.h +++ b/mps/code/misc.h | |||
| @@ -40,9 +40,9 @@ typedef const struct SrcIdStruct { | |||
| 40 | } SrcIdStruct; | 40 | } SrcIdStruct; |
| 41 | 41 | ||
| 42 | #define SRCID(id, scmid) \ | 42 | #define SRCID(id, scmid) \ |
| 43 | static SrcIdStruct FileSrcIdStruct = \ | 43 | static SrcIdStruct id ## FileSrcIdStruct = \ |
| 44 | {__FILE__, (scmid), __DATE__, __TIME__}; \ | 44 | {__FILE__, (scmid), __DATE__, __TIME__}; \ |
| 45 | SrcId id ## SrcId = &FileSrcIdStruct | 45 | SrcId id ## SrcId = &id ## FileSrcIdStruct |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | /* BEGIN and END -- statement brackets | 48 | /* BEGIN and END -- statement brackets |
diff --git a/mps/code/mpmss.c b/mps/code/mpmss.c index c98f32c63a5..ef790dc5616 100644 --- a/mps/code/mpmss.c +++ b/mps/code/mpmss.c | |||
| @@ -129,11 +129,19 @@ static size_t fixedSize(int i) | |||
| 129 | 129 | ||
| 130 | /* testInArena -- test all the pool classes in the given arena */ | 130 | /* testInArena -- test all the pool classes in the given arena */ |
| 131 | 131 | ||
| 132 | static mps_pool_debug_option_s bothOptions = | 132 | static mps_pool_debug_option_s bothOptions = { |
| 133 | { (void *)"postpost", 8, (void *)"DEAD", 4 }; | 133 | /* .fence_template = */ (void *)"postpostpostpost", |
| 134 | 134 | /* .fence_size = */ 16, | |
| 135 | static mps_pool_debug_option_s fenceOptions = | 135 | /* .free_template = */ (void *)"DEAD", |
| 136 | { (void *)"\0XXX ''\"\"'' XXX\0", 16, NULL, 0 }; | 136 | /* .free_size = */ 4 |
| 137 | }; | ||
| 138 | |||
| 139 | static mps_pool_debug_option_s fenceOptions = { | ||
| 140 | /* .fence_template = */ (void *)"\0XXX ''\"\"'' XXX\0", | ||
| 141 | /* .fence_size = */ 16, | ||
| 142 | /* .free_template = */ NULL, | ||
| 143 | /* .free_size = */ 0 | ||
| 144 | }; | ||
| 137 | 145 | ||
| 138 | static int testInArena(mps_arena_t arena, mps_pool_debug_option_s *options) | 146 | static int testInArena(mps_arena_t arena, mps_pool_debug_option_s *options) |
| 139 | { | 147 | { |
| @@ -141,7 +149,7 @@ static int testInArena(mps_arena_t arena, mps_pool_debug_option_s *options) | |||
| 141 | /* cross-segment allocation (possibly MVFF ought not to). */ | 149 | /* cross-segment allocation (possibly MVFF ought not to). */ |
| 142 | printf("MVFF\n"); | 150 | printf("MVFF\n"); |
| 143 | die(stress(mps_class_mvff(), randomSize8, arena, | 151 | die(stress(mps_class_mvff(), randomSize8, arena, |
| 144 | (size_t)65536, (size_t)32, (size_t)4, TRUE, TRUE, TRUE), | 152 | (size_t)65536, (size_t)32, sizeof(void *), TRUE, TRUE, TRUE), |
| 145 | "stress MVFF"); | 153 | "stress MVFF"); |
| 146 | printf("MV debug\n"); | 154 | printf("MV debug\n"); |
| 147 | die(stress(mps_class_mv_debug(), randomSize, arena, | 155 | die(stress(mps_class_mv_debug(), randomSize, arena, |
diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj index 66fae204309..bcca0e8d621 100644 --- a/mps/code/mps.xcodeproj/project.pbxproj +++ b/mps/code/mps.xcodeproj/project.pbxproj | |||
| @@ -7,6 +7,28 @@ | |||
| 7 | objects = { | 7 | objects = { |
| 8 | 8 | ||
| 9 | /* Begin PBXBuildFile section */ | 9 | /* Begin PBXBuildFile section */ |
| 10 | 3124CAC3156BE40100753214 /* awlut.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC2156BE40100753214 /* awlut.c */; }; | ||
| 11 | 3124CAC4156BE40D00753214 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; }; | ||
| 12 | 3124CAC5156BE41700753214 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; }; | ||
| 13 | 3124CAC8156BE48D00753214 /* fmtdy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC6156BE48D00753214 /* fmtdy.c */; }; | ||
| 14 | 3124CAC9156BE48D00753214 /* fmtdytst.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC7156BE48D00753214 /* fmtdytst.c */; }; | ||
| 15 | 3124CACB156BE4A300753214 /* poollo.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CACA156BE4A300753214 /* poollo.c */; }; | ||
| 16 | 3124CACD156BE4C200753214 /* fmtno.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CACC156BE4C200753214 /* fmtno.c */; }; | ||
| 17 | 3124CACF156BE4CF00753214 /* poolawl.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CACE156BE4CF00753214 /* poolawl.c */; }; | ||
| 18 | 3124CADF156BE65900753214 /* mpsicv.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CADE156BE65900753214 /* mpsicv.c */; }; | ||
| 19 | 3124CAE0156BE66B00753214 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; }; | ||
| 20 | 3124CAE1156BE67000753214 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; }; | ||
| 21 | 3124CAE2156BE68E00753214 /* fmtdy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC6156BE48D00753214 /* fmtdy.c */; }; | ||
| 22 | 3124CAE3156BE69B00753214 /* fmtno.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CACC156BE4C200753214 /* fmtno.c */; }; | ||
| 23 | 3124CAE5156BE6D500753214 /* fmthe.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAE4156BE6D500753214 /* fmthe.c */; }; | ||
| 24 | 3124CAE6156BE6F700753214 /* fmtdytst.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC7156BE48D00753214 /* fmtdytst.c */; }; | ||
| 25 | 3124CAF6156BE81100753214 /* amcss.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAF5156BE81100753214 /* amcss.c */; }; | ||
| 26 | 3124CAF7156BE82000753214 /* fmtdy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC6156BE48D00753214 /* fmtdy.c */; }; | ||
| 27 | 3124CAF8156BE82000753214 /* fmtdytst.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC7156BE48D00753214 /* fmtdytst.c */; }; | ||
| 28 | 3124CAF9156BE82000753214 /* fmthe.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAE4156BE6D500753214 /* fmthe.c */; }; | ||
| 29 | 3124CAFA156BE82000753214 /* fmtno.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CACC156BE4C200753214 /* fmtno.c */; }; | ||
| 30 | 3124CAFB156BE82000753214 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; }; | ||
| 31 | 3124CAFC156BE82900753214 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; }; | ||
| 10 | 3150AE53156ABA2500A6E22A /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; }; | 32 | 3150AE53156ABA2500A6E22A /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; }; |
| 11 | 3150AE54156ABA5000A6E22A /* mpsioan.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC70156AB56000714D05 /* mpsioan.c */; }; | 33 | 3150AE54156ABA5000A6E22A /* mpsioan.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC70156AB56000714D05 /* mpsioan.c */; }; |
| 12 | 3150AE55156ABA5000A6E22A /* mpsliban.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC71156AB56000714D05 /* mpsliban.c */; }; | 34 | 3150AE55156ABA5000A6E22A /* mpsliban.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC71156AB56000714D05 /* mpsliban.c */; }; |
| @@ -64,6 +86,33 @@ | |||
| 64 | /* End PBXBuildFile section */ | 86 | /* End PBXBuildFile section */ |
| 65 | 87 | ||
| 66 | /* Begin PBXCopyFilesBuildPhase section */ | 88 | /* Begin PBXCopyFilesBuildPhase section */ |
| 89 | 3124CAB6156BE3EC00753214 /* CopyFiles */ = { | ||
| 90 | isa = PBXCopyFilesBuildPhase; | ||
| 91 | buildActionMask = 2147483647; | ||
| 92 | dstPath = /usr/share/man/man1/; | ||
| 93 | dstSubfolderSpec = 0; | ||
| 94 | files = ( | ||
| 95 | ); | ||
| 96 | runOnlyForDeploymentPostprocessing = 1; | ||
| 97 | }; | ||
| 98 | 3124CAD2156BE64A00753214 /* CopyFiles */ = { | ||
| 99 | isa = PBXCopyFilesBuildPhase; | ||
| 100 | buildActionMask = 2147483647; | ||
| 101 | dstPath = /usr/share/man/man1/; | ||
| 102 | dstSubfolderSpec = 0; | ||
| 103 | files = ( | ||
| 104 | ); | ||
| 105 | runOnlyForDeploymentPostprocessing = 1; | ||
| 106 | }; | ||
| 107 | 3124CAE9156BE7F300753214 /* CopyFiles */ = { | ||
| 108 | isa = PBXCopyFilesBuildPhase; | ||
| 109 | buildActionMask = 2147483647; | ||
| 110 | dstPath = /usr/share/man/man1/; | ||
| 111 | dstSubfolderSpec = 0; | ||
| 112 | files = ( | ||
| 113 | ); | ||
| 114 | runOnlyForDeploymentPostprocessing = 1; | ||
| 115 | }; | ||
| 67 | 31EEAC63156AB52600714D05 /* CopyFiles */ = { | 116 | 31EEAC63156AB52600714D05 /* CopyFiles */ = { |
| 68 | isa = PBXCopyFilesBuildPhase; | 117 | isa = PBXCopyFilesBuildPhase; |
| 69 | buildActionMask = 2147483647; | 118 | buildActionMask = 2147483647; |
| @@ -76,6 +125,18 @@ | |||
| 76 | /* End PBXCopyFilesBuildPhase section */ | 125 | /* End PBXCopyFilesBuildPhase section */ |
| 77 | 126 | ||
| 78 | /* Begin PBXFileReference section */ | 127 | /* Begin PBXFileReference section */ |
| 128 | 3124CAB8156BE3EC00753214 /* awlut */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = awlut; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| 129 | 3124CAC2156BE40100753214 /* awlut.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = awlut.c; sourceTree = "<group>"; }; | ||
| 130 | 3124CAC6156BE48D00753214 /* fmtdy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fmtdy.c; sourceTree = "<group>"; }; | ||
| 131 | 3124CAC7156BE48D00753214 /* fmtdytst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fmtdytst.c; sourceTree = "<group>"; }; | ||
| 132 | 3124CACA156BE4A300753214 /* poollo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poollo.c; sourceTree = "<group>"; }; | ||
| 133 | 3124CACC156BE4C200753214 /* fmtno.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fmtno.c; sourceTree = "<group>"; }; | ||
| 134 | 3124CACE156BE4CF00753214 /* poolawl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolawl.c; sourceTree = "<group>"; }; | ||
| 135 | 3124CAD4156BE64A00753214 /* mpsicv */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mpsicv; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| 136 | 3124CADE156BE65900753214 /* mpsicv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpsicv.c; sourceTree = "<group>"; }; | ||
| 137 | 3124CAE4156BE6D500753214 /* fmthe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fmthe.c; sourceTree = "<group>"; }; | ||
| 138 | 3124CAEB156BE7F300753214 /* amcss */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = amcss; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| 139 | 3124CAF5156BE81100753214 /* amcss.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = amcss.c; sourceTree = "<group>"; }; | ||
| 79 | 31EEABF5156AAF7C00714D05 /* mpsi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpsi.c; sourceTree = "<group>"; }; | 140 | 31EEABF5156AAF7C00714D05 /* mpsi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpsi.c; sourceTree = "<group>"; }; |
| 80 | 31EEABFB156AAF9D00714D05 /* libmps.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmps.a; sourceTree = BUILT_PRODUCTS_DIR; }; | 141 | 31EEABFB156AAF9D00714D05 /* libmps.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmps.a; sourceTree = BUILT_PRODUCTS_DIR; }; |
| 81 | 31EEAC01156AB21B00714D05 /* mpm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpm.c; sourceTree = "<group>"; }; | 142 | 31EEAC01156AB21B00714D05 /* mpm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpm.c; sourceTree = "<group>"; }; |
| @@ -134,6 +195,30 @@ | |||
| 134 | /* End PBXFileReference section */ | 195 | /* End PBXFileReference section */ |
| 135 | 196 | ||
| 136 | /* Begin PBXFrameworksBuildPhase section */ | 197 | /* Begin PBXFrameworksBuildPhase section */ |
| 198 | 3124CAB5156BE3EC00753214 /* Frameworks */ = { | ||
| 199 | isa = PBXFrameworksBuildPhase; | ||
| 200 | buildActionMask = 2147483647; | ||
| 201 | files = ( | ||
| 202 | 3124CAC4156BE40D00753214 /* libmps.a in Frameworks */, | ||
| 203 | ); | ||
| 204 | runOnlyForDeploymentPostprocessing = 0; | ||
| 205 | }; | ||
| 206 | 3124CAD1156BE64A00753214 /* Frameworks */ = { | ||
| 207 | isa = PBXFrameworksBuildPhase; | ||
| 208 | buildActionMask = 2147483647; | ||
| 209 | files = ( | ||
| 210 | 3124CAE1156BE67000753214 /* libmps.a in Frameworks */, | ||
| 211 | ); | ||
| 212 | runOnlyForDeploymentPostprocessing = 0; | ||
| 213 | }; | ||
| 214 | 3124CAE8156BE7F300753214 /* Frameworks */ = { | ||
| 215 | isa = PBXFrameworksBuildPhase; | ||
| 216 | buildActionMask = 2147483647; | ||
| 217 | files = ( | ||
| 218 | 3124CAFC156BE82900753214 /* libmps.a in Frameworks */, | ||
| 219 | ); | ||
| 220 | runOnlyForDeploymentPostprocessing = 0; | ||
| 221 | }; | ||
| 137 | 31EEABF8156AAF9D00714D05 /* Frameworks */ = { | 222 | 31EEABF8156AAF9D00714D05 /* Frameworks */ = { |
| 138 | isa = PBXFrameworksBuildPhase; | 223 | isa = PBXFrameworksBuildPhase; |
| 139 | buildActionMask = 2147483647; | 224 | buildActionMask = 2147483647; |
| @@ -152,15 +237,30 @@ | |||
| 152 | /* End PBXFrameworksBuildPhase section */ | 237 | /* End PBXFrameworksBuildPhase section */ |
| 153 | 238 | ||
| 154 | /* Begin PBXGroup section */ | 239 | /* Begin PBXGroup section */ |
| 240 | 3124CAB3156BE1B700753214 /* Tests */ = { | ||
| 241 | isa = PBXGroup; | ||
| 242 | children = ( | ||
| 243 | 3124CAF5156BE81100753214 /* amcss.c */, | ||
| 244 | 3124CAC2156BE40100753214 /* awlut.c */, | ||
| 245 | 3124CAC6156BE48D00753214 /* fmtdy.c */, | ||
| 246 | 3124CAC7156BE48D00753214 /* fmtdytst.c */, | ||
| 247 | 3124CAE4156BE6D500753214 /* fmthe.c */, | ||
| 248 | 3124CACC156BE4C200753214 /* fmtno.c */, | ||
| 249 | 31EEAC74156AB58E00714D05 /* mpmss.c */, | ||
| 250 | 31EEAC9E156AB73400714D05 /* testlib.c */, | ||
| 251 | 3124CADE156BE65900753214 /* mpsicv.c */, | ||
| 252 | ); | ||
| 253 | name = Tests; | ||
| 254 | sourceTree = "<group>"; | ||
| 255 | }; | ||
| 155 | 31EEABD8156AAE9E00714D05 = { | 256 | 31EEABD8156AAE9E00714D05 = { |
| 156 | isa = PBXGroup; | 257 | isa = PBXGroup; |
| 157 | children = ( | 258 | children = ( |
| 158 | 31EEAC9D156AB72400714D05 /* testlib */, | ||
| 159 | 31EEABF4156AAF6500714D05 /* MPM Core */, | 259 | 31EEABF4156AAF6500714D05 /* MPM Core */, |
| 160 | 31EEAC5A156AB40800714D05 /* AMC */, | 260 | 31EEAC5A156AB40800714D05 /* Extra pools */, |
| 161 | 31EEAC4B156AB39C00714D05 /* XCI6LL */, | 261 | 31EEAC4B156AB39C00714D05 /* Platform XCI6LL */, |
| 162 | 31EEAC6F156AB54300714D05 /* Plinth */, | 262 | 31EEAC6F156AB54300714D05 /* ANSI Plinth */, |
| 163 | 31EEAC67156AB52600714D05 /* mpmss */, | 263 | 3124CAB3156BE1B700753214 /* Tests */, |
| 164 | 31EEABEF156AAF5C00714D05 /* Products */, | 264 | 31EEABEF156AAF5C00714D05 /* Products */, |
| 165 | ); | 265 | ); |
| 166 | sourceTree = "<group>"; | 266 | sourceTree = "<group>"; |
| @@ -170,6 +270,9 @@ | |||
| 170 | children = ( | 270 | children = ( |
| 171 | 31EEABFB156AAF9D00714D05 /* libmps.a */, | 271 | 31EEABFB156AAF9D00714D05 /* libmps.a */, |
| 172 | 31EEAC65156AB52600714D05 /* mpmss */, | 272 | 31EEAC65156AB52600714D05 /* mpmss */, |
| 273 | 3124CAB8156BE3EC00753214 /* awlut */, | ||
| 274 | 3124CAD4156BE64A00753214 /* mpsicv */, | ||
| 275 | 3124CAEB156BE7F300753214 /* amcss */, | ||
| 173 | ); | 276 | ); |
| 174 | name = Products; | 277 | name = Products; |
| 175 | sourceTree = "<group>"; | 278 | sourceTree = "<group>"; |
| @@ -177,96 +280,82 @@ | |||
| 177 | 31EEABF4156AAF6500714D05 /* MPM Core */ = { | 280 | 31EEABF4156AAF6500714D05 /* MPM Core */ = { |
| 178 | isa = PBXGroup; | 281 | isa = PBXGroup; |
| 179 | children = ( | 282 | children = ( |
| 180 | 31EEABF5156AAF7C00714D05 /* mpsi.c */, | ||
| 181 | 31EEAC01156AB21B00714D05 /* mpm.c */, | ||
| 182 | 31EEAC03156AB23A00714D05 /* arenavm.c */, | ||
| 183 | 31EEAC05156AB27B00714D05 /* arena.c */, | 283 | 31EEAC05156AB27B00714D05 /* arena.c */, |
| 184 | 31EEAC06156AB27B00714D05 /* arenacl.c */, | 284 | 31EEAC06156AB27B00714D05 /* arenacl.c */, |
| 185 | 31EEAC07156AB27B00714D05 /* global.c */, | 285 | 31EEAC03156AB23A00714D05 /* arenavm.c */, |
| 186 | 31EEAC08156AB27B00714D05 /* locus.c */, | 286 | 31EEAC3F156AB32500714D05 /* boot.c */, |
| 187 | 31EEAC09156AB27B00714D05 /* pool.c */, | ||
| 188 | 31EEAC0A156AB27B00714D05 /* poolabs.c */, | ||
| 189 | 31EEAC0B156AB27B00714D05 /* protocol.c */, | ||
| 190 | 31EEAC0C156AB27B00714D05 /* reserv.c */, | ||
| 191 | 31EEAC0D156AB27B00714D05 /* tract.c */, | ||
| 192 | 31EEAC0E156AB27B00714D05 /* walk.c */, | ||
| 193 | 31EEAC19156AB2B200714D05 /* buffer.c */, | ||
| 194 | 31EEAC1A156AB2B200714D05 /* format.c */, | ||
| 195 | 31EEAC1B156AB2B200714D05 /* ref.c */, | ||
| 196 | 31EEAC1C156AB2B200714D05 /* root.c */, | ||
| 197 | 31EEAC1D156AB2B200714D05 /* seg.c */, | ||
| 198 | 31EEAC1E156AB2B200714D05 /* trace.c */, | ||
| 199 | 31EEAC1F156AB2B200714D05 /* traceanc.c */, | ||
| 200 | 31EEAC27156AB2F200714D05 /* bt.c */, | 287 | 31EEAC27156AB2F200714D05 /* bt.c */, |
| 288 | 31EEAC19156AB2B200714D05 /* buffer.c */, | ||
| 289 | 31EEAC40156AB32500714D05 /* cbs.c */, | ||
| 201 | 31EEAC28156AB2F200714D05 /* dbgpool.c */, | 290 | 31EEAC28156AB2F200714D05 /* dbgpool.c */, |
| 202 | 31EEAC29156AB2F200714D05 /* dbgpooli.c */, | 291 | 31EEAC29156AB2F200714D05 /* dbgpooli.c */, |
| 292 | 31EEAC41156AB32500714D05 /* diag.c */, | ||
| 203 | 31EEAC2A156AB2F200714D05 /* event.c */, | 293 | 31EEAC2A156AB2F200714D05 /* event.c */, |
| 294 | 31EEAC1A156AB2B200714D05 /* format.c */, | ||
| 295 | 31EEAC07156AB27B00714D05 /* global.c */, | ||
| 204 | 31EEAC2B156AB2F200714D05 /* ld.c */, | 296 | 31EEAC2B156AB2F200714D05 /* ld.c */, |
| 297 | 31EEAC08156AB27B00714D05 /* locus.c */, | ||
| 205 | 31EEAC2C156AB2F200714D05 /* message.c */, | 298 | 31EEAC2C156AB2F200714D05 /* message.c */, |
| 299 | 31EEAC42156AB32500714D05 /* meter.c */, | ||
| 300 | 31EEAC01156AB21B00714D05 /* mpm.c */, | ||
| 301 | 31EEABF5156AAF7C00714D05 /* mpsi.c */, | ||
| 302 | 31EEAC09156AB27B00714D05 /* pool.c */, | ||
| 303 | 31EEAC0A156AB27B00714D05 /* poolabs.c */, | ||
| 206 | 31EEAC2D156AB2F200714D05 /* poolmfs.c */, | 304 | 31EEAC2D156AB2F200714D05 /* poolmfs.c */, |
| 207 | 31EEAC2E156AB2F200714D05 /* poolmrg.c */, | 305 | 31EEAC2E156AB2F200714D05 /* poolmrg.c */, |
| 208 | 31EEAC2F156AB2F200714D05 /* poolmv.c */, | 306 | 31EEAC2F156AB2F200714D05 /* poolmv.c */, |
| 307 | 31EEAC0B156AB27B00714D05 /* protocol.c */, | ||
| 308 | 31EEAC1B156AB2B200714D05 /* ref.c */, | ||
| 309 | 31EEAC0C156AB27B00714D05 /* reserv.c */, | ||
| 209 | 31EEAC30156AB2F200714D05 /* ring.c */, | 310 | 31EEAC30156AB2F200714D05 /* ring.c */, |
| 311 | 31EEAC1C156AB2B200714D05 /* root.c */, | ||
| 210 | 31EEAC31156AB2F200714D05 /* sac.c */, | 312 | 31EEAC31156AB2F200714D05 /* sac.c */, |
| 313 | 31EEAC1D156AB2B200714D05 /* seg.c */, | ||
| 211 | 31EEAC32156AB2F200714D05 /* shield.c */, | 314 | 31EEAC32156AB2F200714D05 /* shield.c */, |
| 212 | 31EEAC3F156AB32500714D05 /* boot.c */, | ||
| 213 | 31EEAC40156AB32500714D05 /* cbs.c */, | ||
| 214 | 31EEAC41156AB32500714D05 /* diag.c */, | ||
| 215 | 31EEAC42156AB32500714D05 /* meter.c */, | ||
| 216 | 31EEAC43156AB32500714D05 /* splay.c */, | 315 | 31EEAC43156AB32500714D05 /* splay.c */, |
| 316 | 31EEAC1E156AB2B200714D05 /* trace.c */, | ||
| 317 | 31EEAC1F156AB2B200714D05 /* traceanc.c */, | ||
| 318 | 31EEAC0D156AB27B00714D05 /* tract.c */, | ||
| 217 | 31EEAC44156AB32500714D05 /* version.c */, | 319 | 31EEAC44156AB32500714D05 /* version.c */, |
| 320 | 31EEAC0E156AB27B00714D05 /* walk.c */, | ||
| 218 | ); | 321 | ); |
| 219 | name = "MPM Core"; | 322 | name = "MPM Core"; |
| 220 | sourceTree = "<group>"; | 323 | sourceTree = "<group>"; |
| 221 | }; | 324 | }; |
| 222 | 31EEAC4B156AB39C00714D05 /* XCI6LL */ = { | 325 | 31EEAC4B156AB39C00714D05 /* Platform XCI6LL */ = { |
| 223 | isa = PBXGroup; | 326 | isa = PBXGroup; |
| 224 | children = ( | 327 | children = ( |
| 225 | 31EEACA7156AB79800714D05 /* span.c */, | ||
| 226 | 31EEAC4C156AB3B000714D05 /* lockix.c */, | 328 | 31EEAC4C156AB3B000714D05 /* lockix.c */, |
| 227 | 31EEAC4E156AB3E300714D05 /* prmcan.c */, | 329 | 31EEAC4E156AB3E300714D05 /* prmcan.c */, |
| 228 | 31EEAC4F156AB3E300714D05 /* protix.c */, | 330 | 31EEAC4F156AB3E300714D05 /* protix.c */, |
| 229 | 31EEAC50156AB3E300714D05 /* protsgix.c */, | 331 | 31EEAC50156AB3E300714D05 /* protsgix.c */, |
| 332 | 31EEACA7156AB79800714D05 /* span.c */, | ||
| 230 | 31EEAC51156AB3E300714D05 /* ssan.c */, | 333 | 31EEAC51156AB3E300714D05 /* ssan.c */, |
| 231 | 31EEAC52156AB3E300714D05 /* than.c */, | 334 | 31EEAC52156AB3E300714D05 /* than.c */, |
| 232 | 31EEAC53156AB3E300714D05 /* vmix.c */, | 335 | 31EEAC53156AB3E300714D05 /* vmix.c */, |
| 233 | ); | 336 | ); |
| 234 | name = XCI6LL; | 337 | name = "Platform XCI6LL"; |
| 235 | sourceTree = "<group>"; | 338 | sourceTree = "<group>"; |
| 236 | }; | 339 | }; |
| 237 | 31EEAC5A156AB40800714D05 /* AMC */ = { | 340 | 31EEAC5A156AB40800714D05 /* Extra pools */ = { |
| 238 | isa = PBXGroup; | 341 | isa = PBXGroup; |
| 239 | children = ( | 342 | children = ( |
| 240 | 31EEAC5B156AB41900714D05 /* poolamc.c */, | 343 | 31EEAC5B156AB41900714D05 /* poolamc.c */, |
| 241 | 31EEAC5D156AB43F00714D05 /* poolsnc.c */, | 344 | 3124CACE156BE4CF00753214 /* poolawl.c */, |
| 345 | 3124CACA156BE4A300753214 /* poollo.c */, | ||
| 242 | 31EEAC5F156AB44D00714D05 /* poolmvff.c */, | 346 | 31EEAC5F156AB44D00714D05 /* poolmvff.c */, |
| 347 | 31EEAC5D156AB43F00714D05 /* poolsnc.c */, | ||
| 243 | ); | 348 | ); |
| 244 | name = AMC; | 349 | name = "Extra pools"; |
| 245 | sourceTree = "<group>"; | ||
| 246 | }; | ||
| 247 | 31EEAC67156AB52600714D05 /* mpmss */ = { | ||
| 248 | isa = PBXGroup; | ||
| 249 | children = ( | ||
| 250 | 31EEAC74156AB58E00714D05 /* mpmss.c */, | ||
| 251 | ); | ||
| 252 | path = mpmss; | ||
| 253 | sourceTree = "<group>"; | 350 | sourceTree = "<group>"; |
| 254 | }; | 351 | }; |
| 255 | 31EEAC6F156AB54300714D05 /* Plinth */ = { | 352 | 31EEAC6F156AB54300714D05 /* ANSI Plinth */ = { |
| 256 | isa = PBXGroup; | 353 | isa = PBXGroup; |
| 257 | children = ( | 354 | children = ( |
| 258 | 31EEAC70156AB56000714D05 /* mpsioan.c */, | 355 | 31EEAC70156AB56000714D05 /* mpsioan.c */, |
| 259 | 31EEAC71156AB56000714D05 /* mpsliban.c */, | 356 | 31EEAC71156AB56000714D05 /* mpsliban.c */, |
| 260 | ); | 357 | ); |
| 261 | name = Plinth; | 358 | name = "ANSI Plinth"; |
| 262 | sourceTree = "<group>"; | ||
| 263 | }; | ||
| 264 | 31EEAC9D156AB72400714D05 /* testlib */ = { | ||
| 265 | isa = PBXGroup; | ||
| 266 | children = ( | ||
| 267 | 31EEAC9E156AB73400714D05 /* testlib.c */, | ||
| 268 | ); | ||
| 269 | name = testlib; | ||
| 270 | sourceTree = "<group>"; | 359 | sourceTree = "<group>"; |
| 271 | }; | 360 | }; |
| 272 | /* End PBXGroup section */ | 361 | /* End PBXGroup section */ |
| @@ -282,6 +371,57 @@ | |||
| 282 | /* End PBXHeadersBuildPhase section */ | 371 | /* End PBXHeadersBuildPhase section */ |
| 283 | 372 | ||
| 284 | /* Begin PBXNativeTarget section */ | 373 | /* Begin PBXNativeTarget section */ |
| 374 | 3124CAB7156BE3EC00753214 /* awlut */ = { | ||
| 375 | isa = PBXNativeTarget; | ||
| 376 | buildConfigurationList = 3124CABF156BE3EC00753214 /* Build configuration list for PBXNativeTarget "awlut" */; | ||
| 377 | buildPhases = ( | ||
| 378 | 3124CAB4156BE3EC00753214 /* Sources */, | ||
| 379 | 3124CAB5156BE3EC00753214 /* Frameworks */, | ||
| 380 | 3124CAB6156BE3EC00753214 /* CopyFiles */, | ||
| 381 | ); | ||
| 382 | buildRules = ( | ||
| 383 | ); | ||
| 384 | dependencies = ( | ||
| 385 | ); | ||
| 386 | name = awlut; | ||
| 387 | productName = awlut; | ||
| 388 | productReference = 3124CAB8156BE3EC00753214 /* awlut */; | ||
| 389 | productType = "com.apple.product-type.tool"; | ||
| 390 | }; | ||
| 391 | 3124CAD3156BE64A00753214 /* mpsicv */ = { | ||
| 392 | isa = PBXNativeTarget; | ||
| 393 | buildConfigurationList = 3124CADB156BE64A00753214 /* Build configuration list for PBXNativeTarget "mpsicv" */; | ||
| 394 | buildPhases = ( | ||
| 395 | 3124CAD0156BE64A00753214 /* Sources */, | ||
| 396 | 3124CAD1156BE64A00753214 /* Frameworks */, | ||
| 397 | 3124CAD2156BE64A00753214 /* CopyFiles */, | ||
| 398 | ); | ||
| 399 | buildRules = ( | ||
| 400 | ); | ||
| 401 | dependencies = ( | ||
| 402 | ); | ||
| 403 | name = mpsicv; | ||
| 404 | productName = mpsicv; | ||
| 405 | productReference = 3124CAD4156BE64A00753214 /* mpsicv */; | ||
| 406 | productType = "com.apple.product-type.tool"; | ||
| 407 | }; | ||
| 408 | 3124CAEA156BE7F300753214 /* amcss */ = { | ||
| 409 | isa = PBXNativeTarget; | ||
| 410 | buildConfigurationList = 3124CAF2156BE7F300753214 /* Build configuration list for PBXNativeTarget "amcss" */; | ||
| 411 | buildPhases = ( | ||
| 412 | 3124CAE7156BE7F300753214 /* Sources */, | ||
| 413 | 3124CAE8156BE7F300753214 /* Frameworks */, | ||
| 414 | 3124CAE9156BE7F300753214 /* CopyFiles */, | ||
| 415 | ); | ||
| 416 | buildRules = ( | ||
| 417 | ); | ||
| 418 | dependencies = ( | ||
| 419 | ); | ||
| 420 | name = amcss; | ||
| 421 | productName = amcss; | ||
| 422 | productReference = 3124CAEB156BE7F300753214 /* amcss */; | ||
| 423 | productType = "com.apple.product-type.tool"; | ||
| 424 | }; | ||
| 285 | 31EEABFA156AAF9D00714D05 /* mps */ = { | 425 | 31EEABFA156AAF9D00714D05 /* mps */ = { |
| 286 | isa = PBXNativeTarget; | 426 | isa = PBXNativeTarget; |
| 287 | buildConfigurationList = 31EEABFC156AAF9D00714D05 /* Build configuration list for PBXNativeTarget "mps" */; | 427 | buildConfigurationList = 31EEABFC156AAF9D00714D05 /* Build configuration list for PBXNativeTarget "mps" */; |
| @@ -338,11 +478,52 @@ | |||
| 338 | targets = ( | 478 | targets = ( |
| 339 | 31EEABFA156AAF9D00714D05 /* mps */, | 479 | 31EEABFA156AAF9D00714D05 /* mps */, |
| 340 | 31EEAC64156AB52600714D05 /* mpmss */, | 480 | 31EEAC64156AB52600714D05 /* mpmss */, |
| 481 | 3124CAB7156BE3EC00753214 /* awlut */, | ||
| 482 | 3124CAD3156BE64A00753214 /* mpsicv */, | ||
| 483 | 3124CAEA156BE7F300753214 /* amcss */, | ||
| 341 | ); | 484 | ); |
| 342 | }; | 485 | }; |
| 343 | /* End PBXProject section */ | 486 | /* End PBXProject section */ |
| 344 | 487 | ||
| 345 | /* Begin PBXSourcesBuildPhase section */ | 488 | /* Begin PBXSourcesBuildPhase section */ |
| 489 | 3124CAB4156BE3EC00753214 /* Sources */ = { | ||
| 490 | isa = PBXSourcesBuildPhase; | ||
| 491 | buildActionMask = 2147483647; | ||
| 492 | files = ( | ||
| 493 | 3124CAC3156BE40100753214 /* awlut.c in Sources */, | ||
| 494 | 3124CAC5156BE41700753214 /* testlib.c in Sources */, | ||
| 495 | 3124CAC8156BE48D00753214 /* fmtdy.c in Sources */, | ||
| 496 | 3124CAC9156BE48D00753214 /* fmtdytst.c in Sources */, | ||
| 497 | 3124CACD156BE4C200753214 /* fmtno.c in Sources */, | ||
| 498 | ); | ||
| 499 | runOnlyForDeploymentPostprocessing = 0; | ||
| 500 | }; | ||
| 501 | 3124CAD0156BE64A00753214 /* Sources */ = { | ||
| 502 | isa = PBXSourcesBuildPhase; | ||
| 503 | buildActionMask = 2147483647; | ||
| 504 | files = ( | ||
| 505 | 3124CADF156BE65900753214 /* mpsicv.c in Sources */, | ||
| 506 | 3124CAE0156BE66B00753214 /* testlib.c in Sources */, | ||
| 507 | 3124CAE2156BE68E00753214 /* fmtdy.c in Sources */, | ||
| 508 | 3124CAE3156BE69B00753214 /* fmtno.c in Sources */, | ||
| 509 | 3124CAE5156BE6D500753214 /* fmthe.c in Sources */, | ||
| 510 | 3124CAE6156BE6F700753214 /* fmtdytst.c in Sources */, | ||
| 511 | ); | ||
| 512 | runOnlyForDeploymentPostprocessing = 0; | ||
| 513 | }; | ||
| 514 | 3124CAE7156BE7F300753214 /* Sources */ = { | ||
| 515 | isa = PBXSourcesBuildPhase; | ||
| 516 | buildActionMask = 2147483647; | ||
| 517 | files = ( | ||
| 518 | 3124CAF6156BE81100753214 /* amcss.c in Sources */, | ||
| 519 | 3124CAF7156BE82000753214 /* fmtdy.c in Sources */, | ||
| 520 | 3124CAF8156BE82000753214 /* fmtdytst.c in Sources */, | ||
| 521 | 3124CAF9156BE82000753214 /* fmthe.c in Sources */, | ||
| 522 | 3124CAFA156BE82000753214 /* fmtno.c in Sources */, | ||
| 523 | 3124CAFB156BE82000753214 /* testlib.c in Sources */, | ||
| 524 | ); | ||
| 525 | runOnlyForDeploymentPostprocessing = 0; | ||
| 526 | }; | ||
| 346 | 31EEABF7156AAF9D00714D05 /* Sources */ = { | 527 | 31EEABF7156AAF9D00714D05 /* Sources */ = { |
| 347 | isa = PBXSourcesBuildPhase; | 528 | isa = PBXSourcesBuildPhase; |
| 348 | buildActionMask = 2147483647; | 529 | buildActionMask = 2147483647; |
| @@ -398,6 +579,8 @@ | |||
| 398 | 31EEACA8156AB79800714D05 /* span.c in Sources */, | 579 | 31EEACA8156AB79800714D05 /* span.c in Sources */, |
| 399 | 3150AE54156ABA5000A6E22A /* mpsioan.c in Sources */, | 580 | 3150AE54156ABA5000A6E22A /* mpsioan.c in Sources */, |
| 400 | 3150AE55156ABA5000A6E22A /* mpsliban.c in Sources */, | 581 | 3150AE55156ABA5000A6E22A /* mpsliban.c in Sources */, |
| 582 | 3124CACB156BE4A300753214 /* poollo.c in Sources */, | ||
| 583 | 3124CACF156BE4CF00753214 /* poolawl.c in Sources */, | ||
| 401 | ); | 584 | ); |
| 402 | runOnlyForDeploymentPostprocessing = 0; | 585 | runOnlyForDeploymentPostprocessing = 0; |
| 403 | }; | 586 | }; |
| @@ -413,18 +596,156 @@ | |||
| 413 | /* End PBXSourcesBuildPhase section */ | 596 | /* End PBXSourcesBuildPhase section */ |
| 414 | 597 | ||
| 415 | /* Begin XCBuildConfiguration section */ | 598 | /* Begin XCBuildConfiguration section */ |
| 599 | 3124CAC0156BE3EC00753214 /* Debug */ = { | ||
| 600 | isa = XCBuildConfiguration; | ||
| 601 | buildSettings = { | ||
| 602 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 603 | COPY_PHASE_STRIP = NO; | ||
| 604 | GCC_C_LANGUAGE_STANDARD = gnu99; | ||
| 605 | GCC_DYNAMIC_NO_PIC = NO; | ||
| 606 | GCC_ENABLE_OBJC_EXCEPTIONS = YES; | ||
| 607 | GCC_OPTIMIZATION_LEVEL = 0; | ||
| 608 | GCC_PREPROCESSOR_DEFINITIONS = ( | ||
| 609 | "DEBUG=1", | ||
| 610 | "$(inherited)", | ||
| 611 | ); | ||
| 612 | GCC_SYMBOLS_PRIVATE_EXTERN = NO; | ||
| 613 | MACOSX_DEPLOYMENT_TARGET = 10.7; | ||
| 614 | ONLY_ACTIVE_ARCH = YES; | ||
| 615 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 616 | }; | ||
| 617 | name = Debug; | ||
| 618 | }; | ||
| 619 | 3124CAC1156BE3EC00753214 /* Release */ = { | ||
| 620 | isa = XCBuildConfiguration; | ||
| 621 | buildSettings = { | ||
| 622 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 623 | COPY_PHASE_STRIP = YES; | ||
| 624 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||
| 625 | GCC_C_LANGUAGE_STANDARD = gnu99; | ||
| 626 | GCC_ENABLE_OBJC_EXCEPTIONS = YES; | ||
| 627 | MACOSX_DEPLOYMENT_TARGET = 10.7; | ||
| 628 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 629 | }; | ||
| 630 | name = Release; | ||
| 631 | }; | ||
| 632 | 3124CADC156BE64A00753214 /* Debug */ = { | ||
| 633 | isa = XCBuildConfiguration; | ||
| 634 | buildSettings = { | ||
| 635 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 636 | COPY_PHASE_STRIP = NO; | ||
| 637 | GCC_C_LANGUAGE_STANDARD = gnu99; | ||
| 638 | GCC_DYNAMIC_NO_PIC = NO; | ||
| 639 | GCC_ENABLE_OBJC_EXCEPTIONS = YES; | ||
| 640 | GCC_OPTIMIZATION_LEVEL = 0; | ||
| 641 | GCC_PREPROCESSOR_DEFINITIONS = ( | ||
| 642 | "DEBUG=1", | ||
| 643 | "$(inherited)", | ||
| 644 | ); | ||
| 645 | GCC_SYMBOLS_PRIVATE_EXTERN = NO; | ||
| 646 | MACOSX_DEPLOYMENT_TARGET = 10.7; | ||
| 647 | ONLY_ACTIVE_ARCH = YES; | ||
| 648 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 649 | }; | ||
| 650 | name = Debug; | ||
| 651 | }; | ||
| 652 | 3124CADD156BE64A00753214 /* Release */ = { | ||
| 653 | isa = XCBuildConfiguration; | ||
| 654 | buildSettings = { | ||
| 655 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 656 | COPY_PHASE_STRIP = YES; | ||
| 657 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||
| 658 | GCC_C_LANGUAGE_STANDARD = gnu99; | ||
| 659 | GCC_ENABLE_OBJC_EXCEPTIONS = YES; | ||
| 660 | MACOSX_DEPLOYMENT_TARGET = 10.7; | ||
| 661 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 662 | }; | ||
| 663 | name = Release; | ||
| 664 | }; | ||
| 665 | 3124CAF3156BE7F300753214 /* Debug */ = { | ||
| 666 | isa = XCBuildConfiguration; | ||
| 667 | buildSettings = { | ||
| 668 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 669 | COPY_PHASE_STRIP = NO; | ||
| 670 | GCC_C_LANGUAGE_STANDARD = gnu99; | ||
| 671 | GCC_DYNAMIC_NO_PIC = NO; | ||
| 672 | GCC_ENABLE_OBJC_EXCEPTIONS = YES; | ||
| 673 | GCC_OPTIMIZATION_LEVEL = 0; | ||
| 674 | GCC_PREPROCESSOR_DEFINITIONS = ( | ||
| 675 | "DEBUG=1", | ||
| 676 | "$(inherited)", | ||
| 677 | ); | ||
| 678 | GCC_SYMBOLS_PRIVATE_EXTERN = NO; | ||
| 679 | MACOSX_DEPLOYMENT_TARGET = 10.7; | ||
| 680 | ONLY_ACTIVE_ARCH = YES; | ||
| 681 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 682 | }; | ||
| 683 | name = Debug; | ||
| 684 | }; | ||
| 685 | 3124CAF4156BE7F300753214 /* Release */ = { | ||
| 686 | isa = XCBuildConfiguration; | ||
| 687 | buildSettings = { | ||
| 688 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 689 | COPY_PHASE_STRIP = YES; | ||
| 690 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||
| 691 | GCC_C_LANGUAGE_STANDARD = gnu99; | ||
| 692 | GCC_ENABLE_OBJC_EXCEPTIONS = YES; | ||
| 693 | MACOSX_DEPLOYMENT_TARGET = 10.7; | ||
| 694 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 695 | }; | ||
| 696 | name = Release; | ||
| 697 | }; | ||
| 416 | 31EEABDF156AAE9E00714D05 /* Debug */ = { | 698 | 31EEABDF156AAE9E00714D05 /* Debug */ = { |
| 417 | isa = XCBuildConfiguration; | 699 | isa = XCBuildConfiguration; |
| 418 | buildSettings = { | 700 | buildSettings = { |
| 419 | ARCHS = "$(ARCHS_STANDARD_64_BIT)"; | 701 | ARCHS = "$(ARCHS_STANDARD_64_BIT)"; |
| 702 | CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; | ||
| 703 | CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; | ||
| 420 | GCC_C_LANGUAGE_STANDARD = ansi; | 704 | GCC_C_LANGUAGE_STANDARD = ansi; |
| 421 | GCC_PREPROCESSOR_DEFINITIONS = ( | 705 | GCC_PREPROCESSOR_DEFINITIONS = ( |
| 422 | CONFIG_PF_XCI6LL, | 706 | CONFIG_PF_XCI6LL, |
| 423 | CONFIG_PROD_MPS, | 707 | CONFIG_PROD_MPS, |
| 424 | CONFIG_VAR_CI, | 708 | CONFIG_VAR_CI, |
| 425 | ); | 709 | ); |
| 710 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; | ||
| 711 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; | ||
| 712 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | ||
| 426 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | 713 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; |
| 714 | GCC_WARN_64_TO_32_BIT_CONVERSION = YES; | ||
| 715 | GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; | ||
| 716 | GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; | ||
| 717 | GCC_WARN_ABOUT_MISSING_NEWLINE = YES; | ||
| 718 | GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; | ||
| 719 | GCC_WARN_ABOUT_RETURN_TYPE = YES; | ||
| 720 | GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; | ||
| 721 | GCC_WARN_PEDANTIC = YES; | ||
| 722 | GCC_WARN_SHADOW = YES; | ||
| 723 | GCC_WARN_SIGN_COMPARE = YES; | ||
| 724 | GCC_WARN_UNINITIALIZED_AUTOS = YES; | ||
| 725 | GCC_WARN_UNKNOWN_PRAGMAS = YES; | ||
| 726 | GCC_WARN_UNUSED_FUNCTION = YES; | ||
| 727 | GCC_WARN_UNUSED_LABEL = YES; | ||
| 728 | GCC_WARN_UNUSED_PARAMETER = YES; | ||
| 729 | GCC_WARN_UNUSED_VARIABLE = YES; | ||
| 730 | OTHER_CFLAGS = ( | ||
| 731 | "-pedantic", | ||
| 732 | "-Wall", | ||
| 733 | "-Wno-extended-offsetof", | ||
| 734 | ); | ||
| 427 | SDKROOT = macosx; | 735 | SDKROOT = macosx; |
| 736 | WARNING_CFLAGS = ( | ||
| 737 | "-pedantic", | ||
| 738 | "-Wpointer-arith", | ||
| 739 | "-Wstrict-prototypes", | ||
| 740 | "-Wmissing-prototypes", | ||
| 741 | "-Winline", | ||
| 742 | "-Waggregate-return", | ||
| 743 | "-Wnested-externs", | ||
| 744 | "-Wcast-qual", | ||
| 745 | "-Wshadow", | ||
| 746 | "-Wall", | ||
| 747 | "-Wno-extended-offsetof", | ||
| 748 | ); | ||
| 428 | }; | 749 | }; |
| 429 | name = Debug; | 750 | name = Debug; |
| 430 | }; | 751 | }; |
| @@ -432,6 +753,8 @@ | |||
| 432 | isa = XCBuildConfiguration; | 753 | isa = XCBuildConfiguration; |
| 433 | buildSettings = { | 754 | buildSettings = { |
| 434 | ARCHS = "$(ARCHS_STANDARD_64_BIT)"; | 755 | ARCHS = "$(ARCHS_STANDARD_64_BIT)"; |
| 756 | CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; | ||
| 757 | CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; | ||
| 435 | GCC_C_LANGUAGE_STANDARD = ansi; | 758 | GCC_C_LANGUAGE_STANDARD = ansi; |
| 436 | GCC_PREPROCESSOR_DEFINITIONS = ( | 759 | GCC_PREPROCESSOR_DEFINITIONS = ( |
| 437 | CONFIG_PF_XCI6LL, | 760 | CONFIG_PF_XCI6LL, |
| @@ -439,8 +762,45 @@ | |||
| 439 | CONFIG_VAR_HE, | 762 | CONFIG_VAR_HE, |
| 440 | NDEBUG, | 763 | NDEBUG, |
| 441 | ); | 764 | ); |
| 765 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; | ||
| 766 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; | ||
| 767 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | ||
| 442 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | 768 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; |
| 769 | GCC_WARN_64_TO_32_BIT_CONVERSION = YES; | ||
| 770 | GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; | ||
| 771 | GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; | ||
| 772 | GCC_WARN_ABOUT_MISSING_NEWLINE = YES; | ||
| 773 | GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; | ||
| 774 | GCC_WARN_ABOUT_RETURN_TYPE = YES; | ||
| 775 | GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; | ||
| 776 | GCC_WARN_PEDANTIC = YES; | ||
| 777 | GCC_WARN_SHADOW = YES; | ||
| 778 | GCC_WARN_SIGN_COMPARE = YES; | ||
| 779 | GCC_WARN_UNINITIALIZED_AUTOS = YES; | ||
| 780 | GCC_WARN_UNKNOWN_PRAGMAS = YES; | ||
| 781 | GCC_WARN_UNUSED_FUNCTION = YES; | ||
| 782 | GCC_WARN_UNUSED_LABEL = YES; | ||
| 783 | GCC_WARN_UNUSED_PARAMETER = YES; | ||
| 784 | GCC_WARN_UNUSED_VARIABLE = YES; | ||
| 785 | OTHER_CFLAGS = ( | ||
| 786 | "-pedantic", | ||
| 787 | "-Wall", | ||
| 788 | "-Wno-extended-offsetof", | ||
| 789 | ); | ||
| 443 | SDKROOT = macosx; | 790 | SDKROOT = macosx; |
| 791 | WARNING_CFLAGS = ( | ||
| 792 | "-pedantic", | ||
| 793 | "-Wpointer-arith", | ||
| 794 | "-Wstrict-prototypes", | ||
| 795 | "-Wmissing-prototypes", | ||
| 796 | "-Winline", | ||
| 797 | "-Waggregate-return", | ||
| 798 | "-Wnested-externs", | ||
| 799 | "-Wcast-qual", | ||
| 800 | "-Wshadow", | ||
| 801 | "-Wall", | ||
| 802 | "-Wno-extended-offsetof", | ||
| 803 | ); | ||
| 444 | }; | 804 | }; |
| 445 | name = Release; | 805 | name = Release; |
| 446 | }; | 806 | }; |
| @@ -521,6 +881,33 @@ | |||
| 521 | /* End XCBuildConfiguration section */ | 881 | /* End XCBuildConfiguration section */ |
| 522 | 882 | ||
| 523 | /* Begin XCConfigurationList section */ | 883 | /* Begin XCConfigurationList section */ |
| 884 | 3124CABF156BE3EC00753214 /* Build configuration list for PBXNativeTarget "awlut" */ = { | ||
| 885 | isa = XCConfigurationList; | ||
| 886 | buildConfigurations = ( | ||
| 887 | 3124CAC0156BE3EC00753214 /* Debug */, | ||
| 888 | 3124CAC1156BE3EC00753214 /* Release */, | ||
| 889 | ); | ||
| 890 | defaultConfigurationIsVisible = 0; | ||
| 891 | defaultConfigurationName = Release; | ||
| 892 | }; | ||
| 893 | 3124CADB156BE64A00753214 /* Build configuration list for PBXNativeTarget "mpsicv" */ = { | ||
| 894 | isa = XCConfigurationList; | ||
| 895 | buildConfigurations = ( | ||
| 896 | 3124CADC156BE64A00753214 /* Debug */, | ||
| 897 | 3124CADD156BE64A00753214 /* Release */, | ||
| 898 | ); | ||
| 899 | defaultConfigurationIsVisible = 0; | ||
| 900 | defaultConfigurationName = Release; | ||
| 901 | }; | ||
| 902 | 3124CAF2156BE7F300753214 /* Build configuration list for PBXNativeTarget "amcss" */ = { | ||
| 903 | isa = XCConfigurationList; | ||
| 904 | buildConfigurations = ( | ||
| 905 | 3124CAF3156BE7F300753214 /* Debug */, | ||
| 906 | 3124CAF4156BE7F300753214 /* Release */, | ||
| 907 | ); | ||
| 908 | defaultConfigurationIsVisible = 0; | ||
| 909 | defaultConfigurationName = Release; | ||
| 910 | }; | ||
| 524 | 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */ = { | 911 | 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */ = { |
| 525 | isa = XCConfigurationList; | 912 | isa = XCConfigurationList; |
| 526 | buildConfigurations = ( | 913 | buildConfigurations = ( |
diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h index 57c564e838e..edf7ec8d933 100644 --- a/mps/code/mpstd.h +++ b/mps/code/mpstd.h | |||
| @@ -440,8 +440,13 @@ | |||
| 440 | #define MPS_WORD_SHIFT 5 | 440 | #define MPS_WORD_SHIFT 5 |
| 441 | #define MPS_PF_ALIGN 4 | 441 | #define MPS_PF_ALIGN 4 |
| 442 | 442 | ||
| 443 | /* @@@@ Determine symbols for XCI6LL */ | 443 | /* Apple clang version 3.1, clang -E -dM */ |
| 444 | #elif defined(CONFIG_PF_XCI6LL) | 444 | |
| 445 | #elif defined(__APPLE__) && defined(__x86_64__) && defined(__MACH__) \ | ||
| 446 | && defined(__clang__) | ||
| 447 | #if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCI6LL) | ||
| 448 | #error "specified CONFIG_PF_... inconsistent with detected xci6ll" | ||
| 449 | #endif | ||
| 445 | #define MPS_PF_XCI6LL | 450 | #define MPS_PF_XCI6LL |
| 446 | #define MPS_PF_STRING "xci6ll" | 451 | #define MPS_PF_STRING "xci6ll" |
| 447 | #define MPS_OS_XC | 452 | #define MPS_OS_XC |
diff --git a/mps/code/testlib.h b/mps/code/testlib.h index 63d462a6658..02917b81e62 100644 --- a/mps/code/testlib.h +++ b/mps/code/testlib.h | |||
| @@ -90,11 +90,13 @@ | |||
| 90 | #define PRIXLONGEST "llX" | 90 | #define PRIXLONGEST "llX" |
| 91 | #define PRIwLONGEST "16" | 91 | #define PRIwLONGEST "16" |
| 92 | typedef unsigned long long ulongest_t; | 92 | typedef unsigned long long ulongest_t; |
| 93 | #define MPS_WORD_CONST(n) (n##ull) | ||
| 93 | #else | 94 | #else |
| 94 | #define PRIuLONGEST "lu" | 95 | #define PRIuLONGEST "lu" |
| 95 | #define PRIXLONGEST "lX" | 96 | #define PRIXLONGEST "lX" |
| 96 | #define PRIwLONGEST "8" | 97 | #define PRIwLONGEST "8" |
| 97 | typedef unsigned long ulongest_t; | 98 | typedef unsigned long ulongest_t; |
| 99 | #define MPS_WORD_CONST(n) (n##ul) | ||
| 98 | #endif | 100 | #endif |
| 99 | #define PRIXPTR "0"PRIwLONGEST PRIXLONGEST | 101 | #define PRIXPTR "0"PRIwLONGEST PRIXLONGEST |
| 100 | 102 | ||
| @@ -157,7 +159,10 @@ extern void verror(const char *format, va_list args); | |||
| 157 | #define Insist(cond) insist1(cond, #cond) | 159 | #define Insist(cond) insist1(cond, #cond) |
| 158 | 160 | ||
| 159 | #define insist1(cond, condstring) \ | 161 | #define insist1(cond, condstring) \ |
| 160 | cdie(cond, condstring "\n" __FILE__ "\n" STR(__LINE__)) | 162 | if(cond) \ |
| 163 | NOOP; \ | ||
| 164 | else \ | ||
| 165 | cdie(cond, condstring "\n" __FILE__ "\n" STR(__LINE__)) | ||
| 161 | 166 | ||
| 162 | 167 | ||
| 163 | /* rnd -- random number generator | 168 | /* rnd -- random number generator |