diff options
| author | Richard Brooksby | 2012-09-02 10:39:42 +0100 |
|---|---|---|
| committer | Richard Brooksby | 2012-09-02 10:39:42 +0100 |
| commit | fa0bfed44e43eab3cead0b0e10082038438b0a01 (patch) | |
| tree | 6ba4dcefab7a8b2616f1ca509905a7b2f147b892 /mps/code | |
| parent | 24edbc4ab4d4a25208ab38405841b646b51b21f1 (diff) | |
| download | emacs-fa0bfed44e43eab3cead0b0e10082038438b0a01.tar.gz emacs-fa0bfed44e43eab3cead0b0e10082038438b0a01.zip | |
Removing product-specific configuration, including dylan- and scriptworks-specific targets and config_prod configurations. we should support any necessary requirements generically.
It's now possible to write "cc -c mps.c" and get a sensible result.
Copied from Perforce
Change: 179169
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
| -rw-r--r-- | mps/code/comm.gmk | 61 | ||||
| -rw-r--r-- | mps/code/commpost.nmk | 18 | ||||
| -rw-r--r-- | mps/code/commpre.nmk | 31 | ||||
| -rw-r--r-- | mps/code/config.h | 44 | ||||
| -rw-r--r-- | mps/code/global.c | 3 | ||||
| -rw-r--r-- | mps/code/mps.h | 4 | ||||
| -rw-r--r-- | mps/code/mps.xcodeproj/project.pbxproj | 332 | ||||
| -rw-r--r-- | mps/code/mpsi.c | 13 |
8 files changed, 331 insertions, 175 deletions
diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk index 0cb317c1042..6ee91523612 100644 --- a/mps/code/comm.gmk +++ b/mps/code/comm.gmk | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | # MPMPF platform-dependent C sources for the "mpm" part | 30 | # MPMPF platform-dependent C sources for the "mpm" part |
| 31 | # MPMS assembler sources for the "mpm" part (.s files) | 31 | # MPMS assembler sources for the "mpm" part (.s files) |
| 32 | # MPMPS pre-processor assembler sources for the "mpm" part (.S files) | 32 | # MPMPS pre-processor assembler sources for the "mpm" part (.S files) |
| 33 | # SWPF platform-dependent C sources for the "sw" part | ||
| 34 | # | 33 | # |
| 35 | # %%PART: Add a new parameter above for the files included in the part. | 34 | # %%PART: Add a new parameter above for the files included in the part. |
| 36 | # | 35 | # |
| @@ -89,29 +88,8 @@ endif | |||
| 89 | 88 | ||
| 90 | # C FLAGS | 89 | # C FLAGS |
| 91 | 90 | ||
| 92 | # Some flags depend on the target. Alas. | ||
| 93 | ifdef TARGET | ||
| 94 | ifeq ($(TARGET),mmsw.a) | ||
| 95 | CFLAGSTARGET = -DCONFIG_PROD_EPCORE | ||
| 96 | else | ||
| 97 | ifeq ($(TARGET),replaysw) | ||
| 98 | CFLAGSTARGET = -DCONFIG_PROD_EPCORE | ||
| 99 | else | ||
| 100 | ifeq ($(TARGET),mmdw.a) | ||
| 101 | CFLAGSTARGET = -DCONFIG_PROD_DYLAN | ||
| 102 | else | ||
| 103 | ifeq ($(TARGET),replay) | ||
| 104 | CFLAGSTARGET = -DCONFIG_PROD_DYLAN | ||
| 105 | else | ||
| 106 | CFLAGSTARGET = -DCONFIG_PROD_MPS | ||
| 107 | endif | ||
| 108 | endif | ||
| 109 | endif | ||
| 110 | endif | ||
| 111 | endif | ||
| 112 | |||
| 113 | # These flags are included in all compilations. | 91 | # These flags are included in all compilations. |
| 114 | CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSTARGET) $(CFLAGSCOMPILER) | 92 | CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSCOMPILER) |
| 115 | 93 | ||
| 116 | # %%VARIETY: Define a macro containing the set of flags for the new | 94 | # %%VARIETY: Define a macro containing the set of flags for the new |
| 117 | # variety. | 95 | # variety. |
| @@ -175,14 +153,6 @@ MPMCOMMON = mpsi.c mpm.c arenavm.c arenacl.c arena.c global.c locus.c \ | |||
| 175 | poolmrg.c poolmfs.c poolmv.c dbgpool.c dbgpooli.c \ | 153 | poolmrg.c poolmfs.c poolmv.c dbgpool.c dbgpooli.c \ |
| 176 | boot.c meter.c splay.c cbs.c diag.c | 154 | boot.c meter.c splay.c cbs.c diag.c |
| 177 | MPM = $(MPMCOMMON) $(MPMPF) | 155 | MPM = $(MPMCOMMON) $(MPMPF) |
| 178 | SWCOMMON = mpsi.c mpm.c arenavm.c arenacl.c arena.c global.c locus.c \ | ||
| 179 | tract.c walk.c reserv.c protocol.c pool.c poolabs.c \ | ||
| 180 | trace.c traceanc.c root.c seg.c format.c buffer.c ref.c \ | ||
| 181 | bt.c ring.c shield.c ld.c event.c sac.c message.c \ | ||
| 182 | poolmrg.c poolmfs.c poolmv.c dbgpool.c dbgpooli \ | ||
| 183 | poolams.c poolamsi.c poolmvff.c \ | ||
| 184 | boot.c meter.c splay.c cbs.c mpsioan.c | ||
| 185 | SW = $(SWCOMMON) $(SWPF) | ||
| 186 | 156 | ||
| 187 | 157 | ||
| 188 | # These map the source file lists onto object files and dependency files | 158 | # These map the source file lists onto object files and dependency files |
| @@ -209,21 +179,6 @@ POOLNOBJ = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.o) | |||
| 209 | POOLNDEP = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.d) | 179 | POOLNDEP = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.d) |
| 210 | MVFFOBJ = $(MVFF:%.c=$(PFM)/$(VARIETY)/%.o) | 180 | MVFFOBJ = $(MVFF:%.c=$(PFM)/$(VARIETY)/%.o) |
| 211 | MVFFDEP = $(MVFF:%.c=$(PFM)/$(VARIETY)/%.d) | 181 | MVFFDEP = $(MVFF:%.c=$(PFM)/$(VARIETY)/%.d) |
| 212 | SWOBJ = $(SW:%.c=$(PFM)/$(VARIETY)/%.o) | ||
| 213 | |||
| 214 | # The following hack for SWDEP only creates those dependencies when | ||
| 215 | # a SW target is being built. | ||
| 216 | ifdef TARGET | ||
| 217 | ifeq ($(TARGET),mmsw.a) | ||
| 218 | SWDEP = $(SW:%.c=$(PFM)/$(VARIETY)/%.d) | ||
| 219 | else | ||
| 220 | ifeq ($(TARGET),depend) | ||
| 221 | SWDEP = $(SW:%.c=$(PFM)/$(VARIETY)/%.d) | ||
| 222 | else | ||
| 223 | SWDEP = | ||
| 224 | endif | ||
| 225 | endif | ||
| 226 | endif | ||
| 227 | 182 | ||
| 228 | TESTLIBOBJ = $(TESTLIB:%.c=$(PFM)/$(VARIETY)/%.o) | 183 | TESTLIBOBJ = $(TESTLIB:%.c=$(PFM)/$(VARIETY)/%.o) |
| 229 | TESTLIBDEP = $(TESTLIB:%.c=$(PFM)/$(VARIETY)/%.d) | 184 | TESTLIBDEP = $(TESTLIB:%.c=$(PFM)/$(VARIETY)/%.d) |
| @@ -241,8 +196,7 @@ endif | |||
| 241 | 196 | ||
| 242 | # == Pseudo-targets == | 197 | # == Pseudo-targets == |
| 243 | 198 | ||
| 244 | # %%TARGET: Add the target to the all dependencies, if it uses the | 199 | # %%TARGET: Add the target to the all dependencies |
| 245 | # CONFIG_PROD_MPS configuration, to swall if CONFIG_PROD_EPCORE | ||
| 246 | 200 | ||
| 247 | all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \ | 201 | all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \ |
| 248 | mpsicv lockcov poolncv locv qs apss \ | 202 | mpsicv lockcov poolncv locv qs apss \ |
| @@ -252,7 +206,6 @@ all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \ | |||
| 252 | eventcnv \ | 206 | eventcnv \ |
| 253 | mps.a mpsplan.a | 207 | mps.a mpsplan.a |
| 254 | 208 | ||
| 255 | swall: mmsw.a replaysw | ||
| 256 | 209 | ||
| 257 | # Runs the automatic tests that are built with CONFIG_PROD_MPS. | 210 | # Runs the automatic tests that are built with CONFIG_PROD_MPS. |
| 258 | # These tests are run overnight (see design.buildsys.overnight). | 211 | # These tests are run overnight (see design.buildsys.overnight). |
| @@ -281,7 +234,7 @@ mpmss sacss amcss amcssth amcsshe amsss amssshe segsmss awlut awlutth \ | |||
| 281 | exposet0 \ | 234 | exposet0 \ |
| 282 | zcoll zmess \ | 235 | zcoll zmess \ |
| 283 | eventcnv replay replaysw \ | 236 | eventcnv replay replaysw \ |
| 284 | mps.a mmsw.a mpsplan.a mmdw.a: phony | 237 | mps.a mpsplan.a: phony |
| 285 | ifdef VARIETY | 238 | ifdef VARIETY |
| 286 | $(MAKE) -f $(PFM).gmk TARGET=$@ variety | 239 | $(MAKE) -f $(PFM).gmk TARGET=$@ variety |
| 287 | else | 240 | else |
| @@ -445,14 +398,8 @@ $(PFM)/$(VARIETY)/replay: $(PFM)/$(VARIETY)/replay.o \ | |||
| 445 | 398 | ||
| 446 | $(PFM)/$(VARIETY)/mps.a: $(MPMOBJ) $(AMCOBJ) $(SNCOBJ) $(MVFFOBJ) | 399 | $(PFM)/$(VARIETY)/mps.a: $(MPMOBJ) $(AMCOBJ) $(SNCOBJ) $(MVFFOBJ) |
| 447 | 400 | ||
| 448 | $(PFM)/$(VARIETY)/mmdw.a: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ | ||
| 449 | $(FMTDYOBJ) $(AWLOBJ) | ||
| 450 | |||
| 451 | $(PFM)/$(VARIETY)/mpsplan.a: $(PLINTHOBJ) | 401 | $(PFM)/$(VARIETY)/mpsplan.a: $(PLINTHOBJ) |
| 452 | 402 | ||
| 453 | $(PFM)/$(VARIETY)/mmsw.a: \ | ||
| 454 | $(SWOBJ) | ||
| 455 | |||
| 456 | endif | 403 | endif |
| 457 | 404 | ||
| 458 | 405 | ||
| @@ -498,7 +445,7 @@ $(PFM)/$(VARIETY)/%.d: %.c | |||
| 498 | ifdef VARIETY | 445 | ifdef VARIETY |
| 499 | ifdef TARGET | 446 | ifdef TARGET |
| 500 | # %%PART: Add the dependency file macro for the new part here. | 447 | # %%PART: Add the dependency file macro for the new part here. |
| 501 | include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) $(SWDEP) \ | 448 | include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) \ |
| 502 | $(AWLDEP) $(POOLNDEP) $(TESTLIBDEP) $(FMTDYDEP) $(FMTHETSTDEP) \ | 449 | $(AWLDEP) $(POOLNDEP) $(TESTLIBDEP) $(FMTDYDEP) $(FMTHETSTDEP) \ |
| 503 | $(PLINTHDEP) $(EVENTPROCDEP) | 450 | $(PLINTHDEP) $(EVENTPROCDEP) |
| 504 | endif | 451 | endif |
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk index 283869eb6aa..fc197e48353 100644 --- a/mps/code/commpost.nmk +++ b/mps/code/commpost.nmk | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | # PSEUDO-TARGETS | 11 | # PSEUDO-TARGETS |
| 12 | 12 | ||
| 13 | # "all" builds all the varieties of all targets | 13 | # "all" builds all the varieties of all targets |
| 14 | # %%TARGET: Add the target to the all dependencies, if it uses the | 14 | # %%TARGET: Add the target to the all dependencies. |
| 15 | # CONFIG_PROD_MPS configuration, to swall if CONFIG_PROD_EPCORE | ||
| 16 | 15 | ||
| 17 | all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe\ | 16 | all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe\ |
| 18 | mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \ | 17 | mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \ |
| @@ -23,8 +22,6 @@ all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe | |||
| 23 | eventcnv.exe \ | 22 | eventcnv.exe \ |
| 24 | mps.lib mpsplan.lib | 23 | mps.lib mpsplan.lib |
| 25 | 24 | ||
| 26 | swall: mmsw.lib replaysw.exe | ||
| 27 | |||
| 28 | 25 | ||
| 29 | # Convenience targets | 26 | # Convenience targets |
| 30 | 27 | ||
| @@ -40,7 +37,7 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu | |||
| 40 | walkt0.exe locbwcss.exe locusss.exe \ | 37 | walkt0.exe locbwcss.exe locusss.exe \ |
| 41 | exposet0.exe zcoll.exe zmess.exe \ | 38 | exposet0.exe zcoll.exe zmess.exe \ |
| 42 | replay.exe replaysw.exe eventcnv.exe \ | 39 | replay.exe replaysw.exe eventcnv.exe \ |
| 43 | mmdw.lib mmsw.lib mps.lib mpsplan.lib mpsplcb.lib \ | 40 | mps.lib mpsplan.lib mpsplcb.lib \ |
| 44 | mpsdy.dll: | 41 | mpsdy.dll: |
| 45 | !IFDEF VARIETY | 42 | !IFDEF VARIETY |
| 46 | $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety | 43 | $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety |
| @@ -242,17 +239,6 @@ $(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \ | |||
| 242 | $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ | 239 | $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ |
| 243 | $(TESTLIBOBJ) | 240 | $(TESTLIBOBJ) |
| 244 | 241 | ||
| 245 | $(PFM)\$(VARIETY)\mmsw.lib: $(SWOBJ) | ||
| 246 | $(ECHO) $@ | ||
| 247 | cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c | ||
| 248 | $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o | ||
| 249 | |||
| 250 | $(PFM)\$(VARIETY)\mmdw.lib: $(MPMOBJ) $(AMCOBJ) $(DWOBJ) \ | ||
| 251 | $(AWLOBJ) $(LOOBJ) $(SNCOBJ) | ||
| 252 | $(ECHO) $@ | ||
| 253 | cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c | ||
| 254 | $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o | ||
| 255 | |||
| 256 | $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ | 242 | $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ |
| 257 | $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) | 243 | $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) |
| 258 | $(ECHO) $@ | 244 | $(ECHO) $@ |
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk index 385431e138e..04ea7ff3d52 100644 --- a/mps/code/commpre.nmk +++ b/mps/code/commpre.nmk | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | # AMS as above for the "ams" part | 24 | # AMS as above for the "ams" part |
| 25 | # LO as above for the "lo" part | 25 | # LO as above for the "lo" part |
| 26 | # MRG as above for the "mrg" part | 26 | # MRG as above for the "mrg" part |
| 27 | # SW as above for the "sw" part | ||
| 28 | # TESTLIB as above for the "testlib" part | 27 | # TESTLIB as above for the "testlib" part |
| 29 | # NOISY if defined, causes command to be emitted | 28 | # NOISY if defined, causes command to be emitted |
| 30 | # | 29 | # |
| @@ -64,9 +63,6 @@ | |||
| 64 | !IFNDEF AMS | 63 | !IFNDEF AMS |
| 65 | !ERROR commpre.nmk: AMS not defined | 64 | !ERROR commpre.nmk: AMS not defined |
| 66 | !ENDIF | 65 | !ENDIF |
| 67 | !IFNDEF SW | ||
| 68 | !ERROR commpre.nmk: SW not defined | ||
| 69 | !ENDIF | ||
| 70 | !IFNDEF TESTLIB | 66 | !IFNDEF TESTLIB |
| 71 | !ERROR commpre.nmk: TESTLIB not defined | 67 | !ERROR commpre.nmk: TESTLIB not defined |
| 72 | !ENDIF | 68 | !ENDIF |
| @@ -90,30 +86,7 @@ ECHO = echo | |||
| 90 | # /ML means compile for single-threaded environment. | 86 | # /ML means compile for single-threaded environment. |
| 91 | # A 'd' at the end means compile for debugging. | 87 | # A 'd' at the end means compile for debugging. |
| 92 | 88 | ||
| 93 | !ifdef TARGET | 89 | CFLAGSTARGETPRE = |
| 94 | !if "$(TARGET)" == "mmsw.lib" || "$(TARGET)" == "epvmss.exe" || "$(TARGET)" == "replaysw.exe" | ||
| 95 | CFLAGSTARGETPRE = /DCONFIG_PROD_EPCORE | ||
| 96 | CFLAGSTARGETPOST = | ||
| 97 | CRTFLAGSW = /MD | ||
| 98 | CRTFLAGSH = /MDd | ||
| 99 | CRTFLAGSC = /MDd | ||
| 100 | LINKFLAGSWHITE = msvcrt.lib | ||
| 101 | LINKFLAGSHOT = msvcrtd.lib | ||
| 102 | LINKFLAGSCOOL = msvcrtd.lib | ||
| 103 | |||
| 104 | !elseif "$(TARGET)" == "mmdw.lib" | ||
| 105 | # /Oy- is actually 86-specific, but Dylan is only built for that platform | ||
| 106 | CFLAGSTARGETPRE = /DCONFIG_PROD_DYLAN | ||
| 107 | CFLAGSTARGETPOST = /Oy- | ||
| 108 | CRTFLAGSW = /MT | ||
| 109 | CRTFLAGSH = /MT | ||
| 110 | CRTFLAGSC = /MT | ||
| 111 | LINKFLAGSWHITE = libcmt.lib | ||
| 112 | LINKFLAGSHOT = libcmt.lib | ||
| 113 | LINKFLAGSCOOL = libcmt.lib | ||
| 114 | |||
| 115 | !else | ||
| 116 | CFLAGSTARGETPRE = /DCONFIG_PROD_MPS | ||
| 117 | CFLAGSTARGETPOST = | 90 | CFLAGSTARGETPOST = |
| 118 | CRTFLAGSW = /MT | 91 | CRTFLAGSW = /MT |
| 119 | CRTFLAGSH = /MT | 92 | CRTFLAGSH = /MT |
| @@ -121,8 +94,6 @@ CRTFLAGSC = /MTd | |||
| 121 | LINKFLAGSWHITE = libcmt.lib | 94 | LINKFLAGSWHITE = libcmt.lib |
| 122 | LINKFLAGSHOT = libcmt.lib | 95 | LINKFLAGSHOT = libcmt.lib |
| 123 | LINKFLAGSCOOL = libcmtd.lib | 96 | LINKFLAGSCOOL = libcmtd.lib |
| 124 | !endif | ||
| 125 | !endif | ||
| 126 | 97 | ||
| 127 | CFLAGSCOMMONPRE = /nologo /W4 /WX $(PFMDEFS) $(CFLAGSTARGETPRE) | 98 | CFLAGSCOMMONPRE = /nologo /W4 /WX $(PFMDEFS) $(CFLAGSTARGETPRE) |
| 128 | CFLAGSCOMMONPOST = $(CFLAGSTARGETPOST) | 99 | CFLAGSCOMMONPOST = $(CFLAGSTARGETPOST) |
diff --git a/mps/code/config.h b/mps/code/config.h index 15c30b6e5e0..faaed43a2d9 100644 --- a/mps/code/config.h +++ b/mps/code/config.h | |||
| @@ -365,28 +365,9 @@ | |||
| 365 | * | 365 | * |
| 366 | * Convert CONFIG_PROD_* defined on compiler command line into | 366 | * Convert CONFIG_PROD_* defined on compiler command line into |
| 367 | * internal configuration parameters. See <design/config/#prod>. | 367 | * internal configuration parameters. See <design/config/#prod>. |
| 368 | * FIXME: Rework <design/config>. | ||
| 368 | */ | 369 | */ |
| 369 | 370 | ||
| 370 | #if defined(CONFIG_PROD_EPCORE) | ||
| 371 | #define MPS_PROD_STRING "epcore" | ||
| 372 | #define MPS_PROD_EPCORE | ||
| 373 | #define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)0) | ||
| 374 | /* .nosync.why: ScriptWorks is single-threaded when using the MM. */ | ||
| 375 | #define THREAD_SINGLE | ||
| 376 | #define PROTECTION_NONE | ||
| 377 | #define DONGLE_NONE | ||
| 378 | #define PROD_CHECKLEVEL_INITIAL CheckLevelMINIMAL /* CheckLevelSHALLOW is too slow for SW */ | ||
| 379 | |||
| 380 | #elif defined(CONFIG_PROD_DYLAN) | ||
| 381 | #define MPS_PROD_STRING "dylan" | ||
| 382 | #define MPS_PROD_DYLAN | ||
| 383 | #define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)10uL*1024uL*1024uL) | ||
| 384 | #define THREAD_MULTI | ||
| 385 | #define PROTECTION | ||
| 386 | #define DONGLE_NONE | ||
| 387 | #define PROD_CHECKLEVEL_INITIAL CheckLevelSHALLOW | ||
| 388 | |||
| 389 | #elif defined(CONFIG_PROD_MPS) | ||
| 390 | #define MPS_PROD_STRING "mps" | 371 | #define MPS_PROD_STRING "mps" |
| 391 | #define MPS_PROD_MPS | 372 | #define MPS_PROD_MPS |
| 392 | #define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)10uL*1024uL*1024uL) | 373 | #define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)10uL*1024uL*1024uL) |
| @@ -395,29 +376,6 @@ | |||
| 395 | #define DONGLE_NONE | 376 | #define DONGLE_NONE |
| 396 | #define PROD_CHECKLEVEL_INITIAL CheckLevelSHALLOW | 377 | #define PROD_CHECKLEVEL_INITIAL CheckLevelSHALLOW |
| 397 | 378 | ||
| 398 | #else | ||
| 399 | #error "No target product configured." | ||
| 400 | #endif | ||
| 401 | |||
| 402 | /* .prod.arena-size: ARENA_SIZE is currently set larger for the | ||
| 403 | * MM/Dylan product as an interim solution. | ||
| 404 | * See request.dylan.170170.sol.patch and change.dylan.buffalo.170170. | ||
| 405 | * Note that this define is only used by the implementation of the | ||
| 406 | * deprecated mps_space_create interface. | ||
| 407 | */ | ||
| 408 | #define ARENA_SIZE ((Size)1<<30) | ||
| 409 | |||
| 410 | |||
| 411 | /* Dongle configuration */ | ||
| 412 | |||
| 413 | #if defined(DONGLE) | ||
| 414 | #define DONGLE_TEST_FREQUENCY ((unsigned int)4000) | ||
| 415 | #elif defined(DONGLE_NONE) | ||
| 416 | /* nothing to do */ | ||
| 417 | #else | ||
| 418 | #error "No dongle configured." | ||
| 419 | #endif | ||
| 420 | |||
| 421 | 379 | ||
| 422 | /* Pool Class AMC configuration */ | 380 | /* Pool Class AMC configuration */ |
| 423 | 381 | ||
diff --git a/mps/code/global.c b/mps/code/global.c index 806da8dfbaa..4d647a3754c 100644 --- a/mps/code/global.c +++ b/mps/code/global.c | |||
| @@ -462,6 +462,9 @@ Ring GlobalsRememberedSummaryRing(Globals global) | |||
| 462 | 462 | ||
| 463 | /* ArenaEnter -- enter the state where you can look at the arena */ | 463 | /* ArenaEnter -- enter the state where you can look at the arena */ |
| 464 | 464 | ||
| 465 | /* FIXME: Do we want to support the THREAD_SINGLE and PROTECTION_NONE build | ||
| 466 | configs? If so, how will we test them? RB 2012-09-02 */ | ||
| 467 | |||
| 465 | #if defined(THREAD_SINGLE) && defined(PROTECTION_NONE) | 468 | #if defined(THREAD_SINGLE) && defined(PROTECTION_NONE) |
| 466 | void (ArenaEnter)(Arena arena) | 469 | void (ArenaEnter)(Arena arena) |
| 467 | { | 470 | { |
diff --git a/mps/code/mps.h b/mps/code/mps.h index 427d9ccba94..633dbb5ddac 100644 --- a/mps/code/mps.h +++ b/mps/code/mps.h | |||
| @@ -274,10 +274,6 @@ extern mps_res_t mps_arena_create(mps_arena_t *, mps_arena_class_t, ...); | |||
| 274 | extern mps_res_t mps_arena_create_v(mps_arena_t *, mps_arena_class_t, va_list); | 274 | extern mps_res_t mps_arena_create_v(mps_arena_t *, mps_arena_class_t, va_list); |
| 275 | extern void mps_arena_destroy(mps_arena_t); | 275 | extern void mps_arena_destroy(mps_arena_t); |
| 276 | 276 | ||
| 277 | /* these two for backward compatibility */ | ||
| 278 | extern mps_res_t mps_space_create(mps_space_t *); | ||
| 279 | extern void mps_space_destroy(mps_space_t); | ||
| 280 | |||
| 281 | extern size_t mps_arena_reserved(mps_arena_t); | 277 | extern size_t mps_arena_reserved(mps_arena_t); |
| 282 | extern size_t mps_arena_committed(mps_arena_t); | 278 | extern size_t mps_arena_committed(mps_arena_t); |
| 283 | extern size_t mps_arena_spare_committed(mps_arena_t); | 279 | extern size_t mps_arena_spare_committed(mps_arena_t); |
diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj index cbee78a359f..2f8844affe0 100644 --- a/mps/code/mps.xcodeproj/project.pbxproj +++ b/mps/code/mps.xcodeproj/project.pbxproj | |||
| @@ -2081,7 +2081,7 @@ | |||
| 2081 | 31EEABDA156AAE9E00714D05 /* Project object */ = { | 2081 | 31EEABDA156AAE9E00714D05 /* Project object */ = { |
| 2082 | isa = PBXProject; | 2082 | isa = PBXProject; |
| 2083 | attributes = { | 2083 | attributes = { |
| 2084 | LastUpgradeCheck = 0430; | 2084 | LastUpgradeCheck = 0440; |
| 2085 | }; | 2085 | }; |
| 2086 | buildConfigurationList = 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */; | 2086 | buildConfigurationList = 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */; |
| 2087 | compatibilityVersion = "Xcode 3.2"; | 2087 | compatibilityVersion = "Xcode 3.2"; |
| @@ -2818,6 +2818,7 @@ | |||
| 2818 | 3104AFF3156D37A0000A585A /* Debug */ = { | 2818 | 3104AFF3156D37A0000A585A /* Debug */ = { |
| 2819 | isa = XCBuildConfiguration; | 2819 | isa = XCBuildConfiguration; |
| 2820 | buildSettings = { | 2820 | buildSettings = { |
| 2821 | COMBINE_HIDPI_IMAGES = YES; | ||
| 2821 | PRODUCT_NAME = "$(TARGET_NAME)"; | 2822 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 2822 | }; | 2823 | }; |
| 2823 | name = Debug; | 2824 | name = Debug; |
| @@ -2825,6 +2826,7 @@ | |||
| 2825 | 3104AFF4156D37A0000A585A /* Release */ = { | 2826 | 3104AFF4156D37A0000A585A /* Release */ = { |
| 2826 | isa = XCBuildConfiguration; | 2827 | isa = XCBuildConfiguration; |
| 2827 | buildSettings = { | 2828 | buildSettings = { |
| 2829 | COMBINE_HIDPI_IMAGES = YES; | ||
| 2828 | PRODUCT_NAME = "$(TARGET_NAME)"; | 2830 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 2829 | }; | 2831 | }; |
| 2830 | name = Release; | 2832 | name = Release; |
| @@ -3109,6 +3111,285 @@ | |||
| 3109 | }; | 3111 | }; |
| 3110 | name = Release; | 3112 | name = Release; |
| 3111 | }; | 3113 | }; |
| 3114 | 318387EB15DC30CC008E4EA0 /* WE */ = { | ||
| 3115 | isa = XCBuildConfiguration; | ||
| 3116 | buildSettings = { | ||
| 3117 | ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; | ||
| 3118 | CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; | ||
| 3119 | CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; | ||
| 3120 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||
| 3121 | GCC_C_LANGUAGE_STANDARD = ansi; | ||
| 3122 | GCC_OPTIMIZATION_LEVEL = 3; | ||
| 3123 | GCC_PREPROCESSOR_DEFINITIONS = CONFIG_VAR_WE; | ||
| 3124 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; | ||
| 3125 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; | ||
| 3126 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | ||
| 3127 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | ||
| 3128 | GCC_WARN_64_TO_32_BIT_CONVERSION = YES; | ||
| 3129 | GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; | ||
| 3130 | GCC_WARN_ABOUT_MISSING_NEWLINE = YES; | ||
| 3131 | GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; | ||
| 3132 | GCC_WARN_ABOUT_RETURN_TYPE = YES; | ||
| 3133 | GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; | ||
| 3134 | GCC_WARN_PEDANTIC = YES; | ||
| 3135 | GCC_WARN_SHADOW = YES; | ||
| 3136 | GCC_WARN_SIGN_COMPARE = YES; | ||
| 3137 | GCC_WARN_UNINITIALIZED_AUTOS = YES; | ||
| 3138 | GCC_WARN_UNKNOWN_PRAGMAS = YES; | ||
| 3139 | GCC_WARN_UNUSED_FUNCTION = YES; | ||
| 3140 | GCC_WARN_UNUSED_LABEL = YES; | ||
| 3141 | GCC_WARN_UNUSED_PARAMETER = YES; | ||
| 3142 | GCC_WARN_UNUSED_VARIABLE = YES; | ||
| 3143 | OTHER_CFLAGS = ( | ||
| 3144 | "-pedantic", | ||
| 3145 | "-Wall", | ||
| 3146 | "-Wno-extended-offsetof", | ||
| 3147 | ); | ||
| 3148 | SDKROOT = macosx; | ||
| 3149 | WARNING_CFLAGS = ( | ||
| 3150 | "-pedantic", | ||
| 3151 | "-Wpointer-arith", | ||
| 3152 | "-Wstrict-prototypes", | ||
| 3153 | "-Wmissing-prototypes", | ||
| 3154 | "-Winline", | ||
| 3155 | "-Waggregate-return", | ||
| 3156 | "-Wnested-externs", | ||
| 3157 | "-Wcast-qual", | ||
| 3158 | "-Wshadow", | ||
| 3159 | "-Wall", | ||
| 3160 | "-Wno-extended-offsetof", | ||
| 3161 | ); | ||
| 3162 | }; | ||
| 3163 | name = WE; | ||
| 3164 | }; | ||
| 3165 | 318387EC15DC30CC008E4EA0 /* WE */ = { | ||
| 3166 | isa = XCBuildConfiguration; | ||
| 3167 | buildSettings = { | ||
| 3168 | COMBINE_HIDPI_IMAGES = YES; | ||
| 3169 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3170 | }; | ||
| 3171 | name = WE; | ||
| 3172 | }; | ||
| 3173 | 318387ED15DC30CC008E4EA0 /* WE */ = { | ||
| 3174 | isa = XCBuildConfiguration; | ||
| 3175 | buildSettings = { | ||
| 3176 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
| 3177 | COMBINE_HIDPI_IMAGES = YES; | ||
| 3178 | EXECUTABLE_PREFIX = lib; | ||
| 3179 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3180 | }; | ||
| 3181 | name = WE; | ||
| 3182 | }; | ||
| 3183 | 318387EE15DC30CC008E4EA0 /* WE */ = { | ||
| 3184 | isa = XCBuildConfiguration; | ||
| 3185 | buildSettings = { | ||
| 3186 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3187 | }; | ||
| 3188 | name = WE; | ||
| 3189 | }; | ||
| 3190 | 318387EF15DC30CC008E4EA0 /* WE */ = { | ||
| 3191 | isa = XCBuildConfiguration; | ||
| 3192 | buildSettings = { | ||
| 3193 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3194 | }; | ||
| 3195 | name = WE; | ||
| 3196 | }; | ||
| 3197 | 318387F015DC30CC008E4EA0 /* WE */ = { | ||
| 3198 | isa = XCBuildConfiguration; | ||
| 3199 | buildSettings = { | ||
| 3200 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3201 | }; | ||
| 3202 | name = WE; | ||
| 3203 | }; | ||
| 3204 | 318387F115DC30CC008E4EA0 /* WE */ = { | ||
| 3205 | isa = XCBuildConfiguration; | ||
| 3206 | buildSettings = { | ||
| 3207 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3208 | }; | ||
| 3209 | name = WE; | ||
| 3210 | }; | ||
| 3211 | 318387F215DC30CC008E4EA0 /* WE */ = { | ||
| 3212 | isa = XCBuildConfiguration; | ||
| 3213 | buildSettings = { | ||
| 3214 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3215 | }; | ||
| 3216 | name = WE; | ||
| 3217 | }; | ||
| 3218 | 318387F315DC30CC008E4EA0 /* WE */ = { | ||
| 3219 | isa = XCBuildConfiguration; | ||
| 3220 | buildSettings = { | ||
| 3221 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3222 | }; | ||
| 3223 | name = WE; | ||
| 3224 | }; | ||
| 3225 | 318387F415DC30CC008E4EA0 /* WE */ = { | ||
| 3226 | isa = XCBuildConfiguration; | ||
| 3227 | buildSettings = { | ||
| 3228 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3229 | }; | ||
| 3230 | name = WE; | ||
| 3231 | }; | ||
| 3232 | 318387F515DC30CC008E4EA0 /* WE */ = { | ||
| 3233 | isa = XCBuildConfiguration; | ||
| 3234 | buildSettings = { | ||
| 3235 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3236 | }; | ||
| 3237 | name = WE; | ||
| 3238 | }; | ||
| 3239 | 318387F615DC30CC008E4EA0 /* WE */ = { | ||
| 3240 | isa = XCBuildConfiguration; | ||
| 3241 | buildSettings = { | ||
| 3242 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3243 | }; | ||
| 3244 | name = WE; | ||
| 3245 | }; | ||
| 3246 | 318387F715DC30CC008E4EA0 /* WE */ = { | ||
| 3247 | isa = XCBuildConfiguration; | ||
| 3248 | buildSettings = { | ||
| 3249 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3250 | }; | ||
| 3251 | name = WE; | ||
| 3252 | }; | ||
| 3253 | 318387F815DC30CC008E4EA0 /* WE */ = { | ||
| 3254 | isa = XCBuildConfiguration; | ||
| 3255 | buildSettings = { | ||
| 3256 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3257 | }; | ||
| 3258 | name = WE; | ||
| 3259 | }; | ||
| 3260 | 318387F915DC30CC008E4EA0 /* WE */ = { | ||
| 3261 | isa = XCBuildConfiguration; | ||
| 3262 | buildSettings = { | ||
| 3263 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3264 | }; | ||
| 3265 | name = WE; | ||
| 3266 | }; | ||
| 3267 | 318387FA15DC30CC008E4EA0 /* WE */ = { | ||
| 3268 | isa = XCBuildConfiguration; | ||
| 3269 | buildSettings = { | ||
| 3270 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3271 | }; | ||
| 3272 | name = WE; | ||
| 3273 | }; | ||
| 3274 | 318387FB15DC30CC008E4EA0 /* WE */ = { | ||
| 3275 | isa = XCBuildConfiguration; | ||
| 3276 | buildSettings = { | ||
| 3277 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3278 | }; | ||
| 3279 | name = WE; | ||
| 3280 | }; | ||
| 3281 | 318387FC15DC30CC008E4EA0 /* WE */ = { | ||
| 3282 | isa = XCBuildConfiguration; | ||
| 3283 | buildSettings = { | ||
| 3284 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3285 | }; | ||
| 3286 | name = WE; | ||
| 3287 | }; | ||
| 3288 | 318387FD15DC30CC008E4EA0 /* WE */ = { | ||
| 3289 | isa = XCBuildConfiguration; | ||
| 3290 | buildSettings = { | ||
| 3291 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3292 | }; | ||
| 3293 | name = WE; | ||
| 3294 | }; | ||
| 3295 | 318387FE15DC30CC008E4EA0 /* WE */ = { | ||
| 3296 | isa = XCBuildConfiguration; | ||
| 3297 | buildSettings = { | ||
| 3298 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3299 | }; | ||
| 3300 | name = WE; | ||
| 3301 | }; | ||
| 3302 | 318387FF15DC30CC008E4EA0 /* WE */ = { | ||
| 3303 | isa = XCBuildConfiguration; | ||
| 3304 | buildSettings = { | ||
| 3305 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3306 | }; | ||
| 3307 | name = WE; | ||
| 3308 | }; | ||
| 3309 | 3183880015DC30CC008E4EA0 /* WE */ = { | ||
| 3310 | isa = XCBuildConfiguration; | ||
| 3311 | buildSettings = { | ||
| 3312 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3313 | }; | ||
| 3314 | name = WE; | ||
| 3315 | }; | ||
| 3316 | 3183880115DC30CC008E4EA0 /* WE */ = { | ||
| 3317 | isa = XCBuildConfiguration; | ||
| 3318 | buildSettings = { | ||
| 3319 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3320 | }; | ||
| 3321 | name = WE; | ||
| 3322 | }; | ||
| 3323 | 3183880215DC30CC008E4EA0 /* WE */ = { | ||
| 3324 | isa = XCBuildConfiguration; | ||
| 3325 | buildSettings = { | ||
| 3326 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3327 | }; | ||
| 3328 | name = WE; | ||
| 3329 | }; | ||
| 3330 | 3183880315DC30CC008E4EA0 /* WE */ = { | ||
| 3331 | isa = XCBuildConfiguration; | ||
| 3332 | buildSettings = { | ||
| 3333 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3334 | }; | ||
| 3335 | name = WE; | ||
| 3336 | }; | ||
| 3337 | 3183880415DC30CC008E4EA0 /* WE */ = { | ||
| 3338 | isa = XCBuildConfiguration; | ||
| 3339 | buildSettings = { | ||
| 3340 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3341 | }; | ||
| 3342 | name = WE; | ||
| 3343 | }; | ||
| 3344 | 3183880515DC30CC008E4EA0 /* WE */ = { | ||
| 3345 | isa = XCBuildConfiguration; | ||
| 3346 | buildSettings = { | ||
| 3347 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3348 | }; | ||
| 3349 | name = WE; | ||
| 3350 | }; | ||
| 3351 | 3183880615DC30CC008E4EA0 /* WE */ = { | ||
| 3352 | isa = XCBuildConfiguration; | ||
| 3353 | buildSettings = { | ||
| 3354 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3355 | }; | ||
| 3356 | name = WE; | ||
| 3357 | }; | ||
| 3358 | 3183880715DC30CC008E4EA0 /* WE */ = { | ||
| 3359 | isa = XCBuildConfiguration; | ||
| 3360 | buildSettings = { | ||
| 3361 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3362 | }; | ||
| 3363 | name = WE; | ||
| 3364 | }; | ||
| 3365 | 3183880815DC30CC008E4EA0 /* WE */ = { | ||
| 3366 | isa = XCBuildConfiguration; | ||
| 3367 | buildSettings = { | ||
| 3368 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3369 | }; | ||
| 3370 | name = WE; | ||
| 3371 | }; | ||
| 3372 | 3183880915DC30CC008E4EA0 /* WE */ = { | ||
| 3373 | isa = XCBuildConfiguration; | ||
| 3374 | buildSettings = { | ||
| 3375 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3376 | }; | ||
| 3377 | name = WE; | ||
| 3378 | }; | ||
| 3379 | 3183880A15DC30CC008E4EA0 /* WE */ = { | ||
| 3380 | isa = XCBuildConfiguration; | ||
| 3381 | buildSettings = { | ||
| 3382 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3383 | }; | ||
| 3384 | name = WE; | ||
| 3385 | }; | ||
| 3386 | 3183880B15DC30CC008E4EA0 /* WE */ = { | ||
| 3387 | isa = XCBuildConfiguration; | ||
| 3388 | buildSettings = { | ||
| 3389 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| 3390 | }; | ||
| 3391 | name = WE; | ||
| 3392 | }; | ||
| 3112 | 31D60015156D3CB200337B26 /* Debug */ = { | 3393 | 31D60015156D3CB200337B26 /* Debug */ = { |
| 3113 | isa = XCBuildConfiguration; | 3394 | isa = XCBuildConfiguration; |
| 3114 | buildSettings = { | 3395 | buildSettings = { |
| @@ -3202,11 +3483,7 @@ | |||
| 3202 | COPY_PHASE_STRIP = NO; | 3483 | COPY_PHASE_STRIP = NO; |
| 3203 | GCC_C_LANGUAGE_STANDARD = ansi; | 3484 | GCC_C_LANGUAGE_STANDARD = ansi; |
| 3204 | GCC_OPTIMIZATION_LEVEL = 0; | 3485 | GCC_OPTIMIZATION_LEVEL = 0; |
| 3205 | GCC_PREPROCESSOR_DEFINITIONS = ( | 3486 | GCC_PREPROCESSOR_DEFINITIONS = CONFIG_VAR_CI; |
| 3206 | CONFIG_PF_XCI6LL, | ||
| 3207 | CONFIG_PROD_MPS, | ||
| 3208 | CONFIG_VAR_CI, | ||
| 3209 | ); | ||
| 3210 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; | 3487 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; |
| 3211 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; | 3488 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; |
| 3212 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | 3489 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; |
| @@ -3257,12 +3534,8 @@ | |||
| 3257 | CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; | 3534 | CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; |
| 3258 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | 3535 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; |
| 3259 | GCC_C_LANGUAGE_STANDARD = ansi; | 3536 | GCC_C_LANGUAGE_STANDARD = ansi; |
| 3260 | GCC_PREPROCESSOR_DEFINITIONS = ( | 3537 | GCC_OPTIMIZATION_LEVEL = 3; |
| 3261 | CONFIG_PF_XCI6LL, | 3538 | GCC_PREPROCESSOR_DEFINITIONS = CONFIG_VAR_HE; |
| 3262 | CONFIG_PROD_MPS, | ||
| 3263 | CONFIG_VAR_HE, | ||
| 3264 | NDEBUG, | ||
| 3265 | ); | ||
| 3266 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; | 3539 | GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; |
| 3267 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; | 3540 | GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; |
| 3268 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | 3541 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; |
| @@ -3308,6 +3581,7 @@ | |||
| 3308 | isa = XCBuildConfiguration; | 3581 | isa = XCBuildConfiguration; |
| 3309 | buildSettings = { | 3582 | buildSettings = { |
| 3310 | ALWAYS_SEARCH_USER_PATHS = NO; | 3583 | ALWAYS_SEARCH_USER_PATHS = NO; |
| 3584 | COMBINE_HIDPI_IMAGES = YES; | ||
| 3311 | EXECUTABLE_PREFIX = lib; | 3585 | EXECUTABLE_PREFIX = lib; |
| 3312 | PRODUCT_NAME = "$(TARGET_NAME)"; | 3586 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 3313 | }; | 3587 | }; |
| @@ -3317,6 +3591,7 @@ | |||
| 3317 | isa = XCBuildConfiguration; | 3591 | isa = XCBuildConfiguration; |
| 3318 | buildSettings = { | 3592 | buildSettings = { |
| 3319 | ALWAYS_SEARCH_USER_PATHS = NO; | 3593 | ALWAYS_SEARCH_USER_PATHS = NO; |
| 3594 | COMBINE_HIDPI_IMAGES = YES; | ||
| 3320 | EXECUTABLE_PREFIX = lib; | 3595 | EXECUTABLE_PREFIX = lib; |
| 3321 | PRODUCT_NAME = "$(TARGET_NAME)"; | 3596 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 3322 | }; | 3597 | }; |
| @@ -3344,6 +3619,7 @@ | |||
| 3344 | buildConfigurations = ( | 3619 | buildConfigurations = ( |
| 3345 | 3104AFBA156D357B000A585A /* Debug */, | 3620 | 3104AFBA156D357B000A585A /* Debug */, |
| 3346 | 3104AFBB156D357B000A585A /* Release */, | 3621 | 3104AFBB156D357B000A585A /* Release */, |
| 3622 | 318387EF15DC30CC008E4EA0 /* WE */, | ||
| 3347 | ); | 3623 | ); |
| 3348 | defaultConfigurationIsVisible = 0; | 3624 | defaultConfigurationIsVisible = 0; |
| 3349 | defaultConfigurationName = Release; | 3625 | defaultConfigurationName = Release; |
| @@ -3353,6 +3629,7 @@ | |||
| 3353 | buildConfigurations = ( | 3629 | buildConfigurations = ( |
| 3354 | 3104AFD0156D35E2000A585A /* Debug */, | 3630 | 3104AFD0156D35E2000A585A /* Debug */, |
| 3355 | 3104AFD1156D35E2000A585A /* Release */, | 3631 | 3104AFD1156D35E2000A585A /* Release */, |
| 3632 | 318387F315DC30CC008E4EA0 /* WE */, | ||
| 3356 | ); | 3633 | ); |
| 3357 | defaultConfigurationIsVisible = 0; | 3634 | defaultConfigurationIsVisible = 0; |
| 3358 | defaultConfigurationName = Release; | 3635 | defaultConfigurationName = Release; |
| @@ -3362,6 +3639,7 @@ | |||
| 3362 | buildConfigurations = ( | 3639 | buildConfigurations = ( |
| 3363 | 3104AFE5156D3682000A585A /* Debug */, | 3640 | 3104AFE5156D3682000A585A /* Debug */, |
| 3364 | 3104AFE6156D3682000A585A /* Release */, | 3641 | 3104AFE6156D3682000A585A /* Release */, |
| 3642 | 318387F415DC30CC008E4EA0 /* WE */, | ||
| 3365 | ); | 3643 | ); |
| 3366 | defaultConfigurationIsVisible = 0; | 3644 | defaultConfigurationIsVisible = 0; |
| 3367 | defaultConfigurationName = Release; | 3645 | defaultConfigurationName = Release; |
| @@ -3371,6 +3649,7 @@ | |||
| 3371 | buildConfigurations = ( | 3649 | buildConfigurations = ( |
| 3372 | 3104AFF3156D37A0000A585A /* Debug */, | 3650 | 3104AFF3156D37A0000A585A /* Debug */, |
| 3373 | 3104AFF4156D37A0000A585A /* Release */, | 3651 | 3104AFF4156D37A0000A585A /* Release */, |
| 3652 | 318387EC15DC30CC008E4EA0 /* WE */, | ||
| 3374 | ); | 3653 | ); |
| 3375 | defaultConfigurationIsVisible = 0; | 3654 | defaultConfigurationIsVisible = 0; |
| 3376 | defaultConfigurationName = Release; | 3655 | defaultConfigurationName = Release; |
| @@ -3380,6 +3659,7 @@ | |||
| 3380 | buildConfigurations = ( | 3659 | buildConfigurations = ( |
| 3381 | 3104B011156D38F3000A585A /* Debug */, | 3660 | 3104B011156D38F3000A585A /* Debug */, |
| 3382 | 3104B012156D38F3000A585A /* Release */, | 3661 | 3104B012156D38F3000A585A /* Release */, |
| 3662 | 318387F515DC30CC008E4EA0 /* WE */, | ||
| 3383 | ); | 3663 | ); |
| 3384 | defaultConfigurationIsVisible = 0; | 3664 | defaultConfigurationIsVisible = 0; |
| 3385 | defaultConfigurationName = Release; | 3665 | defaultConfigurationName = Release; |
| @@ -3389,6 +3669,7 @@ | |||
| 3389 | buildConfigurations = ( | 3669 | buildConfigurations = ( |
| 3390 | 3104B02A156D39D4000A585A /* Debug */, | 3670 | 3104B02A156D39D4000A585A /* Debug */, |
| 3391 | 3104B02B156D39D4000A585A /* Release */, | 3671 | 3104B02B156D39D4000A585A /* Release */, |
| 3672 | 318387F615DC30CC008E4EA0 /* WE */, | ||
| 3392 | ); | 3673 | ); |
| 3393 | defaultConfigurationIsVisible = 0; | 3674 | defaultConfigurationIsVisible = 0; |
| 3394 | defaultConfigurationName = Release; | 3675 | defaultConfigurationName = Release; |
| @@ -3398,6 +3679,7 @@ | |||
| 3398 | buildConfigurations = ( | 3679 | buildConfigurations = ( |
| 3399 | 3104B045156D3AD8000A585A /* Debug */, | 3680 | 3104B045156D3AD8000A585A /* Debug */, |
| 3400 | 3104B046156D3AD8000A585A /* Release */, | 3681 | 3104B046156D3AD8000A585A /* Release */, |
| 3682 | 318387F715DC30CC008E4EA0 /* WE */, | ||
| 3401 | ); | 3683 | ); |
| 3402 | defaultConfigurationIsVisible = 0; | 3684 | defaultConfigurationIsVisible = 0; |
| 3403 | defaultConfigurationName = Release; | 3685 | defaultConfigurationName = Release; |
| @@ -3407,6 +3689,7 @@ | |||
| 3407 | buildConfigurations = ( | 3689 | buildConfigurations = ( |
| 3408 | 3114A597156E913C001E0AA3 /* Debug */, | 3690 | 3114A597156E913C001E0AA3 /* Debug */, |
| 3409 | 3114A598156E913C001E0AA3 /* Release */, | 3691 | 3114A598156E913C001E0AA3 /* Release */, |
| 3692 | 318387FE15DC30CC008E4EA0 /* WE */, | ||
| 3410 | ); | 3693 | ); |
| 3411 | defaultConfigurationIsVisible = 0; | 3694 | defaultConfigurationIsVisible = 0; |
| 3412 | defaultConfigurationName = Release; | 3695 | defaultConfigurationName = Release; |
| @@ -3416,6 +3699,7 @@ | |||
| 3416 | buildConfigurations = ( | 3699 | buildConfigurations = ( |
| 3417 | 3114A5AF156E92C0001E0AA3 /* Debug */, | 3700 | 3114A5AF156E92C0001E0AA3 /* Debug */, |
| 3418 | 3114A5B0156E92C0001E0AA3 /* Release */, | 3701 | 3114A5B0156E92C0001E0AA3 /* Release */, |
| 3702 | 318387FF15DC30CC008E4EA0 /* WE */, | ||
| 3419 | ); | 3703 | ); |
| 3420 | defaultConfigurationIsVisible = 0; | 3704 | defaultConfigurationIsVisible = 0; |
| 3421 | defaultConfigurationName = Release; | 3705 | defaultConfigurationName = Release; |
| @@ -3425,6 +3709,7 @@ | |||
| 3425 | buildConfigurations = ( | 3709 | buildConfigurations = ( |
| 3426 | 3114A5C5156E9315001E0AA3 /* Debug */, | 3710 | 3114A5C5156E9315001E0AA3 /* Debug */, |
| 3427 | 3114A5C6156E9315001E0AA3 /* Release */, | 3711 | 3114A5C6156E9315001E0AA3 /* Release */, |
| 3712 | 3183880015DC30CC008E4EA0 /* WE */, | ||
| 3428 | ); | 3713 | ); |
| 3429 | defaultConfigurationIsVisible = 0; | 3714 | defaultConfigurationIsVisible = 0; |
| 3430 | defaultConfigurationName = Release; | 3715 | defaultConfigurationName = Release; |
| @@ -3434,6 +3719,7 @@ | |||
| 3434 | buildConfigurations = ( | 3719 | buildConfigurations = ( |
| 3435 | 3114A5DE156E93A0001E0AA3 /* Debug */, | 3720 | 3114A5DE156E93A0001E0AA3 /* Debug */, |
| 3436 | 3114A5DF156E93A0001E0AA3 /* Release */, | 3721 | 3114A5DF156E93A0001E0AA3 /* Release */, |
| 3722 | 3183880115DC30CC008E4EA0 /* WE */, | ||
| 3437 | ); | 3723 | ); |
| 3438 | defaultConfigurationIsVisible = 0; | 3724 | defaultConfigurationIsVisible = 0; |
| 3439 | defaultConfigurationName = Release; | 3725 | defaultConfigurationName = Release; |
| @@ -3443,6 +3729,7 @@ | |||
| 3443 | buildConfigurations = ( | 3729 | buildConfigurations = ( |
| 3444 | 3114A5F7156E93E7001E0AA3 /* Debug */, | 3730 | 3114A5F7156E93E7001E0AA3 /* Debug */, |
| 3445 | 3114A5F8156E93E7001E0AA3 /* Release */, | 3731 | 3114A5F8156E93E7001E0AA3 /* Release */, |
| 3732 | 3183880215DC30CC008E4EA0 /* WE */, | ||
| 3446 | ); | 3733 | ); |
| 3447 | defaultConfigurationIsVisible = 0; | 3734 | defaultConfigurationIsVisible = 0; |
| 3448 | defaultConfigurationName = Release; | 3735 | defaultConfigurationName = Release; |
| @@ -3452,6 +3739,7 @@ | |||
| 3452 | buildConfigurations = ( | 3739 | buildConfigurations = ( |
| 3453 | 3114A60D156E9430001E0AA3 /* Debug */, | 3740 | 3114A60D156E9430001E0AA3 /* Debug */, |
| 3454 | 3114A60E156E9430001E0AA3 /* Release */, | 3741 | 3114A60E156E9430001E0AA3 /* Release */, |
| 3742 | 3183880315DC30CC008E4EA0 /* WE */, | ||
| 3455 | ); | 3743 | ); |
| 3456 | defaultConfigurationIsVisible = 0; | 3744 | defaultConfigurationIsVisible = 0; |
| 3457 | defaultConfigurationName = Release; | 3745 | defaultConfigurationName = Release; |
| @@ -3461,6 +3749,7 @@ | |||
| 3461 | buildConfigurations = ( | 3749 | buildConfigurations = ( |
| 3462 | 3114A624156E9485001E0AA3 /* Debug */, | 3750 | 3114A624156E9485001E0AA3 /* Debug */, |
| 3463 | 3114A625156E9485001E0AA3 /* Release */, | 3751 | 3114A625156E9485001E0AA3 /* Release */, |
| 3752 | 3183880415DC30CC008E4EA0 /* WE */, | ||
| 3464 | ); | 3753 | ); |
| 3465 | defaultConfigurationIsVisible = 0; | 3754 | defaultConfigurationIsVisible = 0; |
| 3466 | defaultConfigurationName = Release; | 3755 | defaultConfigurationName = Release; |
| @@ -3470,6 +3759,7 @@ | |||
| 3470 | buildConfigurations = ( | 3759 | buildConfigurations = ( |
| 3471 | 3114A63B156E94DB001E0AA3 /* Debug */, | 3760 | 3114A63B156E94DB001E0AA3 /* Debug */, |
| 3472 | 3114A63C156E94DB001E0AA3 /* Release */, | 3761 | 3114A63C156E94DB001E0AA3 /* Release */, |
| 3762 | 3183880515DC30CC008E4EA0 /* WE */, | ||
| 3473 | ); | 3763 | ); |
| 3474 | defaultConfigurationIsVisible = 0; | 3764 | defaultConfigurationIsVisible = 0; |
| 3475 | defaultConfigurationName = Release; | 3765 | defaultConfigurationName = Release; |
| @@ -3479,6 +3769,7 @@ | |||
| 3479 | buildConfigurations = ( | 3769 | buildConfigurations = ( |
| 3480 | 3114A654156E9596001E0AA3 /* Debug */, | 3770 | 3114A654156E9596001E0AA3 /* Debug */, |
| 3481 | 3114A655156E9596001E0AA3 /* Release */, | 3771 | 3114A655156E9596001E0AA3 /* Release */, |
| 3772 | 3183880615DC30CC008E4EA0 /* WE */, | ||
| 3482 | ); | 3773 | ); |
| 3483 | defaultConfigurationIsVisible = 0; | 3774 | defaultConfigurationIsVisible = 0; |
| 3484 | defaultConfigurationName = Release; | 3775 | defaultConfigurationName = Release; |
| @@ -3488,6 +3779,7 @@ | |||
| 3488 | buildConfigurations = ( | 3779 | buildConfigurations = ( |
| 3489 | 3114A66A156E95D9001E0AA3 /* Debug */, | 3780 | 3114A66A156E95D9001E0AA3 /* Debug */, |
| 3490 | 3114A66B156E95D9001E0AA3 /* Release */, | 3781 | 3114A66B156E95D9001E0AA3 /* Release */, |
| 3782 | 3183880715DC30CC008E4EA0 /* WE */, | ||
| 3491 | ); | 3783 | ); |
| 3492 | defaultConfigurationIsVisible = 0; | 3784 | defaultConfigurationIsVisible = 0; |
| 3493 | defaultConfigurationName = Release; | 3785 | defaultConfigurationName = Release; |
| @@ -3497,6 +3789,7 @@ | |||
| 3497 | buildConfigurations = ( | 3789 | buildConfigurations = ( |
| 3498 | 3114A684156E9669001E0AA3 /* Debug */, | 3790 | 3114A684156E9669001E0AA3 /* Debug */, |
| 3499 | 3114A685156E9669001E0AA3 /* Release */, | 3791 | 3114A685156E9669001E0AA3 /* Release */, |
| 3792 | 3183880815DC30CC008E4EA0 /* WE */, | ||
| 3500 | ); | 3793 | ); |
| 3501 | defaultConfigurationIsVisible = 0; | 3794 | defaultConfigurationIsVisible = 0; |
| 3502 | defaultConfigurationName = Release; | 3795 | defaultConfigurationName = Release; |
| @@ -3506,6 +3799,7 @@ | |||
| 3506 | buildConfigurations = ( | 3799 | buildConfigurations = ( |
| 3507 | 3114A69D156E971B001E0AA3 /* Debug */, | 3800 | 3114A69D156E971B001E0AA3 /* Debug */, |
| 3508 | 3114A69E156E971B001E0AA3 /* Release */, | 3801 | 3114A69E156E971B001E0AA3 /* Release */, |
| 3802 | 3183880915DC30CC008E4EA0 /* WE */, | ||
| 3509 | ); | 3803 | ); |
| 3510 | defaultConfigurationIsVisible = 0; | 3804 | defaultConfigurationIsVisible = 0; |
| 3511 | defaultConfigurationName = Release; | 3805 | defaultConfigurationName = Release; |
| @@ -3515,6 +3809,7 @@ | |||
| 3515 | buildConfigurations = ( | 3809 | buildConfigurations = ( |
| 3516 | 3114A6B4156E9759001E0AA3 /* Debug */, | 3810 | 3114A6B4156E9759001E0AA3 /* Debug */, |
| 3517 | 3114A6B5156E9759001E0AA3 /* Release */, | 3811 | 3114A6B5156E9759001E0AA3 /* Release */, |
| 3812 | 3183880A15DC30CC008E4EA0 /* WE */, | ||
| 3518 | ); | 3813 | ); |
| 3519 | defaultConfigurationIsVisible = 0; | 3814 | defaultConfigurationIsVisible = 0; |
| 3520 | defaultConfigurationName = Release; | 3815 | defaultConfigurationName = Release; |
| @@ -3524,6 +3819,7 @@ | |||
| 3524 | buildConfigurations = ( | 3819 | buildConfigurations = ( |
| 3525 | 3114A6CE156E9815001E0AA3 /* Debug */, | 3820 | 3114A6CE156E9815001E0AA3 /* Debug */, |
| 3526 | 3114A6CF156E9815001E0AA3 /* Release */, | 3821 | 3114A6CF156E9815001E0AA3 /* Release */, |
| 3822 | 3183880B15DC30CC008E4EA0 /* WE */, | ||
| 3527 | ); | 3823 | ); |
| 3528 | defaultConfigurationIsVisible = 0; | 3824 | defaultConfigurationIsVisible = 0; |
| 3529 | defaultConfigurationName = Release; | 3825 | defaultConfigurationName = Release; |
| @@ -3533,6 +3829,7 @@ | |||
| 3533 | buildConfigurations = ( | 3829 | buildConfigurations = ( |
| 3534 | 3124CAC0156BE3EC00753214 /* Debug */, | 3830 | 3124CAC0156BE3EC00753214 /* Debug */, |
| 3535 | 3124CAC1156BE3EC00753214 /* Release */, | 3831 | 3124CAC1156BE3EC00753214 /* Release */, |
| 3832 | 318387F015DC30CC008E4EA0 /* WE */, | ||
| 3536 | ); | 3833 | ); |
| 3537 | defaultConfigurationIsVisible = 0; | 3834 | defaultConfigurationIsVisible = 0; |
| 3538 | defaultConfigurationName = Release; | 3835 | defaultConfigurationName = Release; |
| @@ -3542,6 +3839,7 @@ | |||
| 3542 | buildConfigurations = ( | 3839 | buildConfigurations = ( |
| 3543 | 3124CADC156BE64A00753214 /* Debug */, | 3840 | 3124CADC156BE64A00753214 /* Debug */, |
| 3544 | 3124CADD156BE64A00753214 /* Release */, | 3841 | 3124CADD156BE64A00753214 /* Release */, |
| 3842 | 318387F215DC30CC008E4EA0 /* WE */, | ||
| 3545 | ); | 3843 | ); |
| 3546 | defaultConfigurationIsVisible = 0; | 3844 | defaultConfigurationIsVisible = 0; |
| 3547 | defaultConfigurationName = Release; | 3845 | defaultConfigurationName = Release; |
| @@ -3551,6 +3849,7 @@ | |||
| 3551 | buildConfigurations = ( | 3849 | buildConfigurations = ( |
| 3552 | 3124CAF3156BE7F300753214 /* Debug */, | 3850 | 3124CAF3156BE7F300753214 /* Debug */, |
| 3553 | 3124CAF4156BE7F300753214 /* Release */, | 3851 | 3124CAF4156BE7F300753214 /* Release */, |
| 3852 | 318387EE15DC30CC008E4EA0 /* WE */, | ||
| 3554 | ); | 3853 | ); |
| 3555 | defaultConfigurationIsVisible = 0; | 3854 | defaultConfigurationIsVisible = 0; |
| 3556 | defaultConfigurationName = Release; | 3855 | defaultConfigurationName = Release; |
| @@ -3560,6 +3859,7 @@ | |||
| 3560 | buildConfigurations = ( | 3859 | buildConfigurations = ( |
| 3561 | 31D60015156D3CB200337B26 /* Debug */, | 3860 | 31D60015156D3CB200337B26 /* Debug */, |
| 3562 | 31D60016156D3CB200337B26 /* Release */, | 3861 | 31D60016156D3CB200337B26 /* Release */, |
| 3862 | 318387F815DC30CC008E4EA0 /* WE */, | ||
| 3563 | ); | 3863 | ); |
| 3564 | defaultConfigurationIsVisible = 0; | 3864 | defaultConfigurationIsVisible = 0; |
| 3565 | defaultConfigurationName = Release; | 3865 | defaultConfigurationName = Release; |
| @@ -3569,6 +3869,7 @@ | |||
| 3569 | buildConfigurations = ( | 3869 | buildConfigurations = ( |
| 3570 | 31D6002F156D3D3F00337B26 /* Debug */, | 3870 | 31D6002F156D3D3F00337B26 /* Debug */, |
| 3571 | 31D60030156D3D3F00337B26 /* Release */, | 3871 | 31D60030156D3D3F00337B26 /* Release */, |
| 3872 | 318387F915DC30CC008E4EA0 /* WE */, | ||
| 3572 | ); | 3873 | ); |
| 3573 | defaultConfigurationIsVisible = 0; | 3874 | defaultConfigurationIsVisible = 0; |
| 3574 | defaultConfigurationName = Release; | 3875 | defaultConfigurationName = Release; |
| @@ -3578,6 +3879,7 @@ | |||
| 3578 | buildConfigurations = ( | 3879 | buildConfigurations = ( |
| 3579 | 31D60046156D3EC700337B26 /* Debug */, | 3880 | 31D60046156D3EC700337B26 /* Debug */, |
| 3580 | 31D60047156D3EC700337B26 /* Release */, | 3881 | 31D60047156D3EC700337B26 /* Release */, |
| 3882 | 318387FA15DC30CC008E4EA0 /* WE */, | ||
| 3581 | ); | 3883 | ); |
| 3582 | defaultConfigurationIsVisible = 0; | 3884 | defaultConfigurationIsVisible = 0; |
| 3583 | defaultConfigurationName = Release; | 3885 | defaultConfigurationName = Release; |
| @@ -3587,6 +3889,7 @@ | |||
| 3587 | buildConfigurations = ( | 3889 | buildConfigurations = ( |
| 3588 | 31D6005C156D3F3500337B26 /* Debug */, | 3890 | 31D6005C156D3F3500337B26 /* Debug */, |
| 3589 | 31D6005D156D3F3500337B26 /* Release */, | 3891 | 31D6005D156D3F3500337B26 /* Release */, |
| 3892 | 318387FB15DC30CC008E4EA0 /* WE */, | ||
| 3590 | ); | 3893 | ); |
| 3591 | defaultConfigurationIsVisible = 0; | 3894 | defaultConfigurationIsVisible = 0; |
| 3592 | defaultConfigurationName = Release; | 3895 | defaultConfigurationName = Release; |
| @@ -3596,6 +3899,7 @@ | |||
| 3596 | buildConfigurations = ( | 3899 | buildConfigurations = ( |
| 3597 | 31D60079156D3FBC00337B26 /* Debug */, | 3900 | 31D60079156D3FBC00337B26 /* Debug */, |
| 3598 | 31D6007A156D3FBC00337B26 /* Release */, | 3901 | 31D6007A156D3FBC00337B26 /* Release */, |
| 3902 | 318387FC15DC30CC008E4EA0 /* WE */, | ||
| 3599 | ); | 3903 | ); |
| 3600 | defaultConfigurationIsVisible = 0; | 3904 | defaultConfigurationIsVisible = 0; |
| 3601 | defaultConfigurationName = Release; | 3905 | defaultConfigurationName = Release; |
| @@ -3605,6 +3909,7 @@ | |||
| 3605 | buildConfigurations = ( | 3909 | buildConfigurations = ( |
| 3606 | 31D60094156D402900337B26 /* Debug */, | 3910 | 31D60094156D402900337B26 /* Debug */, |
| 3607 | 31D60095156D402900337B26 /* Release */, | 3911 | 31D60095156D402900337B26 /* Release */, |
| 3912 | 318387FD15DC30CC008E4EA0 /* WE */, | ||
| 3608 | ); | 3913 | ); |
| 3609 | defaultConfigurationIsVisible = 0; | 3914 | defaultConfigurationIsVisible = 0; |
| 3610 | defaultConfigurationName = Release; | 3915 | defaultConfigurationName = Release; |
| @@ -3614,6 +3919,7 @@ | |||
| 3614 | buildConfigurations = ( | 3919 | buildConfigurations = ( |
| 3615 | 31EEABDF156AAE9E00714D05 /* Debug */, | 3920 | 31EEABDF156AAE9E00714D05 /* Debug */, |
| 3616 | 31EEABE0156AAE9E00714D05 /* Release */, | 3921 | 31EEABE0156AAE9E00714D05 /* Release */, |
| 3922 | 318387EB15DC30CC008E4EA0 /* WE */, | ||
| 3617 | ); | 3923 | ); |
| 3618 | defaultConfigurationIsVisible = 0; | 3924 | defaultConfigurationIsVisible = 0; |
| 3619 | defaultConfigurationName = Release; | 3925 | defaultConfigurationName = Release; |
| @@ -3623,6 +3929,7 @@ | |||
| 3623 | buildConfigurations = ( | 3929 | buildConfigurations = ( |
| 3624 | 31EEABFD156AAF9D00714D05 /* Debug */, | 3930 | 31EEABFD156AAF9D00714D05 /* Debug */, |
| 3625 | 31EEABFE156AAF9D00714D05 /* Release */, | 3931 | 31EEABFE156AAF9D00714D05 /* Release */, |
| 3932 | 318387ED15DC30CC008E4EA0 /* WE */, | ||
| 3626 | ); | 3933 | ); |
| 3627 | defaultConfigurationIsVisible = 0; | 3934 | defaultConfigurationIsVisible = 0; |
| 3628 | defaultConfigurationName = Release; | 3935 | defaultConfigurationName = Release; |
| @@ -3632,6 +3939,7 @@ | |||
| 3632 | buildConfigurations = ( | 3939 | buildConfigurations = ( |
| 3633 | 31EEAC6D156AB52600714D05 /* Debug */, | 3940 | 31EEAC6D156AB52600714D05 /* Debug */, |
| 3634 | 31EEAC6E156AB52600714D05 /* Release */, | 3941 | 31EEAC6E156AB52600714D05 /* Release */, |
| 3942 | 318387F115DC30CC008E4EA0 /* WE */, | ||
| 3635 | ); | 3943 | ); |
| 3636 | defaultConfigurationIsVisible = 0; | 3944 | defaultConfigurationIsVisible = 0; |
| 3637 | defaultConfigurationName = Release; | 3945 | defaultConfigurationName = Release; |
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c index 06b2e50cc15..a4ea84f5574 100644 --- a/mps/code/mpsi.c +++ b/mps/code/mpsi.c | |||
| @@ -459,13 +459,6 @@ mps_res_t mps_arena_create_v(mps_arena_t *mps_arena_o, | |||
| 459 | return MPS_RES_OK; | 459 | return MPS_RES_OK; |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | /* DEPRECATED */ | ||
| 463 | mps_res_t mps_space_create(mps_space_t *mps_space_o) | ||
| 464 | { | ||
| 465 | return mps_arena_create(mps_space_o, mps_arena_class_vm(), ARENA_SIZE); | ||
| 466 | } | ||
| 467 | |||
| 468 | |||
| 469 | /* mps_arena_destroy -- destroy an arena object */ | 462 | /* mps_arena_destroy -- destroy an arena object */ |
| 470 | 463 | ||
| 471 | void mps_arena_destroy(mps_arena_t mps_arena) | 464 | void mps_arena_destroy(mps_arena_t mps_arena) |
| @@ -476,12 +469,6 @@ void mps_arena_destroy(mps_arena_t mps_arena) | |||
| 476 | ArenaDestroy(arena); | 469 | ArenaDestroy(arena); |
| 477 | } | 470 | } |
| 478 | 471 | ||
| 479 | /* DEPRECATED */ | ||
| 480 | void mps_space_destroy(mps_space_t mps_space) | ||
| 481 | { | ||
| 482 | mps_arena_destroy(mps_space); | ||
| 483 | } | ||
| 484 | |||
| 485 | 472 | ||
| 486 | /* mps_arena_has_addr -- is this address managed by this arena? */ | 473 | /* mps_arena_has_addr -- is this address managed by this arena? */ |
| 487 | 474 | ||