From fa0bfed44e43eab3cead0b0e10082038438b0a01 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Sun, 2 Sep 2012 10:39:42 +0100 Subject: 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 --- mps/code/comm.gmk | 61 +----- mps/code/commpost.nmk | 18 +- mps/code/commpre.nmk | 31 +-- mps/code/config.h | 44 +---- mps/code/global.c | 3 + mps/code/mps.h | 4 - mps/code/mps.xcodeproj/project.pbxproj | 332 +++++++++++++++++++++++++++++++-- mps/code/mpsi.c | 13 -- 8 files changed, 331 insertions(+), 175 deletions(-) (limited to 'mps/code') 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 @@ # MPMPF platform-dependent C sources for the "mpm" part # MPMS assembler sources for the "mpm" part (.s files) # MPMPS pre-processor assembler sources for the "mpm" part (.S files) -# SWPF platform-dependent C sources for the "sw" part # # %%PART: Add a new parameter above for the files included in the part. # @@ -89,29 +88,8 @@ endif # C FLAGS -# Some flags depend on the target. Alas. -ifdef TARGET -ifeq ($(TARGET),mmsw.a) -CFLAGSTARGET = -DCONFIG_PROD_EPCORE -else -ifeq ($(TARGET),replaysw) -CFLAGSTARGET = -DCONFIG_PROD_EPCORE -else -ifeq ($(TARGET),mmdw.a) -CFLAGSTARGET = -DCONFIG_PROD_DYLAN -else -ifeq ($(TARGET),replay) -CFLAGSTARGET = -DCONFIG_PROD_DYLAN -else -CFLAGSTARGET = -DCONFIG_PROD_MPS -endif -endif -endif -endif -endif - # These flags are included in all compilations. -CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSTARGET) $(CFLAGSCOMPILER) +CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSCOMPILER) # %%VARIETY: Define a macro containing the set of flags for the new # variety. @@ -175,14 +153,6 @@ MPMCOMMON = mpsi.c mpm.c arenavm.c arenacl.c arena.c global.c locus.c \ poolmrg.c poolmfs.c poolmv.c dbgpool.c dbgpooli.c \ boot.c meter.c splay.c cbs.c diag.c MPM = $(MPMCOMMON) $(MPMPF) -SWCOMMON = mpsi.c mpm.c arenavm.c arenacl.c arena.c global.c locus.c \ - tract.c walk.c reserv.c protocol.c pool.c poolabs.c \ - trace.c traceanc.c root.c seg.c format.c buffer.c ref.c \ - bt.c ring.c shield.c ld.c event.c sac.c message.c \ - poolmrg.c poolmfs.c poolmv.c dbgpool.c dbgpooli \ - poolams.c poolamsi.c poolmvff.c \ - boot.c meter.c splay.c cbs.c mpsioan.c -SW = $(SWCOMMON) $(SWPF) # These map the source file lists onto object files and dependency files @@ -209,21 +179,6 @@ POOLNOBJ = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.o) POOLNDEP = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.d) MVFFOBJ = $(MVFF:%.c=$(PFM)/$(VARIETY)/%.o) MVFFDEP = $(MVFF:%.c=$(PFM)/$(VARIETY)/%.d) -SWOBJ = $(SW:%.c=$(PFM)/$(VARIETY)/%.o) - -# The following hack for SWDEP only creates those dependencies when -# a SW target is being built. -ifdef TARGET -ifeq ($(TARGET),mmsw.a) -SWDEP = $(SW:%.c=$(PFM)/$(VARIETY)/%.d) -else -ifeq ($(TARGET),depend) -SWDEP = $(SW:%.c=$(PFM)/$(VARIETY)/%.d) -else -SWDEP = -endif -endif -endif TESTLIBOBJ = $(TESTLIB:%.c=$(PFM)/$(VARIETY)/%.o) TESTLIBDEP = $(TESTLIB:%.c=$(PFM)/$(VARIETY)/%.d) @@ -241,8 +196,7 @@ endif # == Pseudo-targets == -# %%TARGET: Add the target to the all dependencies, if it uses the -# CONFIG_PROD_MPS configuration, to swall if CONFIG_PROD_EPCORE +# %%TARGET: Add the target to the all dependencies all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \ mpsicv lockcov poolncv locv qs apss \ @@ -252,7 +206,6 @@ all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \ eventcnv \ mps.a mpsplan.a -swall: mmsw.a replaysw # Runs the automatic tests that are built with CONFIG_PROD_MPS. # These tests are run overnight (see design.buildsys.overnight). @@ -281,7 +234,7 @@ mpmss sacss amcss amcssth amcsshe amsss amssshe segsmss awlut awlutth \ exposet0 \ zcoll zmess \ eventcnv replay replaysw \ - mps.a mmsw.a mpsplan.a mmdw.a: phony + mps.a mpsplan.a: phony ifdef VARIETY $(MAKE) -f $(PFM).gmk TARGET=$@ variety else @@ -445,14 +398,8 @@ $(PFM)/$(VARIETY)/replay: $(PFM)/$(VARIETY)/replay.o \ $(PFM)/$(VARIETY)/mps.a: $(MPMOBJ) $(AMCOBJ) $(SNCOBJ) $(MVFFOBJ) -$(PFM)/$(VARIETY)/mmdw.a: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ - $(FMTDYOBJ) $(AWLOBJ) - $(PFM)/$(VARIETY)/mpsplan.a: $(PLINTHOBJ) -$(PFM)/$(VARIETY)/mmsw.a: \ - $(SWOBJ) - endif @@ -498,7 +445,7 @@ $(PFM)/$(VARIETY)/%.d: %.c ifdef VARIETY ifdef TARGET # %%PART: Add the dependency file macro for the new part here. -include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) $(SWDEP) \ +include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) \ $(AWLDEP) $(POOLNDEP) $(TESTLIBDEP) $(FMTDYDEP) $(FMTHETSTDEP) \ $(PLINTHDEP) $(EVENTPROCDEP) 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 @@ # PSEUDO-TARGETS # "all" builds all the varieties of all targets -# %%TARGET: Add the target to the all dependencies, if it uses the -# CONFIG_PROD_MPS configuration, to swall if CONFIG_PROD_EPCORE +# %%TARGET: Add the target to the all dependencies. all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe\ 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 eventcnv.exe \ mps.lib mpsplan.lib -swall: mmsw.lib replaysw.exe - # Convenience targets @@ -40,7 +37,7 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu walkt0.exe locbwcss.exe locusss.exe \ exposet0.exe zcoll.exe zmess.exe \ replay.exe replaysw.exe eventcnv.exe \ - mmdw.lib mmsw.lib mps.lib mpsplan.lib mpsplcb.lib \ + mps.lib mpsplan.lib mpsplcb.lib \ mpsdy.dll: !IFDEF VARIETY $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety @@ -242,17 +239,6 @@ $(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \ $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ $(TESTLIBOBJ) -$(PFM)\$(VARIETY)\mmsw.lib: $(SWOBJ) - $(ECHO) $@ - cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c - $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o - -$(PFM)\$(VARIETY)\mmdw.lib: $(MPMOBJ) $(AMCOBJ) $(DWOBJ) \ - $(AWLOBJ) $(LOOBJ) $(SNCOBJ) - $(ECHO) $@ - cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c - $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o - $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) $(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 @@ # AMS as above for the "ams" part # LO as above for the "lo" part # MRG as above for the "mrg" part -# SW as above for the "sw" part # TESTLIB as above for the "testlib" part # NOISY if defined, causes command to be emitted # @@ -64,9 +63,6 @@ !IFNDEF AMS !ERROR commpre.nmk: AMS not defined !ENDIF -!IFNDEF SW -!ERROR commpre.nmk: SW not defined -!ENDIF !IFNDEF TESTLIB !ERROR commpre.nmk: TESTLIB not defined !ENDIF @@ -90,30 +86,7 @@ ECHO = echo # /ML means compile for single-threaded environment. # A 'd' at the end means compile for debugging. -!ifdef TARGET -!if "$(TARGET)" == "mmsw.lib" || "$(TARGET)" == "epvmss.exe" || "$(TARGET)" == "replaysw.exe" -CFLAGSTARGETPRE = /DCONFIG_PROD_EPCORE -CFLAGSTARGETPOST = -CRTFLAGSW = /MD -CRTFLAGSH = /MDd -CRTFLAGSC = /MDd -LINKFLAGSWHITE = msvcrt.lib -LINKFLAGSHOT = msvcrtd.lib -LINKFLAGSCOOL = msvcrtd.lib - -!elseif "$(TARGET)" == "mmdw.lib" -# /Oy- is actually 86-specific, but Dylan is only built for that platform -CFLAGSTARGETPRE = /DCONFIG_PROD_DYLAN -CFLAGSTARGETPOST = /Oy- -CRTFLAGSW = /MT -CRTFLAGSH = /MT -CRTFLAGSC = /MT -LINKFLAGSWHITE = libcmt.lib -LINKFLAGSHOT = libcmt.lib -LINKFLAGSCOOL = libcmt.lib - -!else -CFLAGSTARGETPRE = /DCONFIG_PROD_MPS +CFLAGSTARGETPRE = CFLAGSTARGETPOST = CRTFLAGSW = /MT CRTFLAGSH = /MT @@ -121,8 +94,6 @@ CRTFLAGSC = /MTd LINKFLAGSWHITE = libcmt.lib LINKFLAGSHOT = libcmt.lib LINKFLAGSCOOL = libcmtd.lib -!endif -!endif CFLAGSCOMMONPRE = /nologo /W4 /WX $(PFMDEFS) $(CFLAGSTARGETPRE) 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 @@ * * Convert CONFIG_PROD_* defined on compiler command line into * internal configuration parameters. See . + * FIXME: Rework . */ -#if defined(CONFIG_PROD_EPCORE) -#define MPS_PROD_STRING "epcore" -#define MPS_PROD_EPCORE -#define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)0) -/* .nosync.why: ScriptWorks is single-threaded when using the MM. */ -#define THREAD_SINGLE -#define PROTECTION_NONE -#define DONGLE_NONE -#define PROD_CHECKLEVEL_INITIAL CheckLevelMINIMAL /* CheckLevelSHALLOW is too slow for SW */ - -#elif defined(CONFIG_PROD_DYLAN) -#define MPS_PROD_STRING "dylan" -#define MPS_PROD_DYLAN -#define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)10uL*1024uL*1024uL) -#define THREAD_MULTI -#define PROTECTION -#define DONGLE_NONE -#define PROD_CHECKLEVEL_INITIAL CheckLevelSHALLOW - -#elif defined(CONFIG_PROD_MPS) #define MPS_PROD_STRING "mps" #define MPS_PROD_MPS #define ARENA_INIT_SPARE_COMMIT_LIMIT ((Size)10uL*1024uL*1024uL) @@ -395,29 +376,6 @@ #define DONGLE_NONE #define PROD_CHECKLEVEL_INITIAL CheckLevelSHALLOW -#else -#error "No target product configured." -#endif - -/* .prod.arena-size: ARENA_SIZE is currently set larger for the - * MM/Dylan product as an interim solution. - * See request.dylan.170170.sol.patch and change.dylan.buffalo.170170. - * Note that this define is only used by the implementation of the - * deprecated mps_space_create interface. - */ -#define ARENA_SIZE ((Size)1<<30) - - -/* Dongle configuration */ - -#if defined(DONGLE) -#define DONGLE_TEST_FREQUENCY ((unsigned int)4000) -#elif defined(DONGLE_NONE) -/* nothing to do */ -#else -#error "No dongle configured." -#endif - /* Pool Class AMC configuration */ 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) /* ArenaEnter -- enter the state where you can look at the arena */ +/* FIXME: Do we want to support the THREAD_SINGLE and PROTECTION_NONE build + configs? If so, how will we test them? RB 2012-09-02 */ + #if defined(THREAD_SINGLE) && defined(PROTECTION_NONE) void (ArenaEnter)(Arena arena) { 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, ...); extern mps_res_t mps_arena_create_v(mps_arena_t *, mps_arena_class_t, va_list); extern void mps_arena_destroy(mps_arena_t); -/* these two for backward compatibility */ -extern mps_res_t mps_space_create(mps_space_t *); -extern void mps_space_destroy(mps_space_t); - extern size_t mps_arena_reserved(mps_arena_t); extern size_t mps_arena_committed(mps_arena_t); 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 @@ 31EEABDA156AAE9E00714D05 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0440; }; buildConfigurationList = 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */; compatibilityVersion = "Xcode 3.2"; @@ -2818,6 +2818,7 @@ 3104AFF3156D37A0000A585A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -2825,6 +2826,7 @@ 3104AFF4156D37A0000A585A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3109,6 +3111,285 @@ }; name = Release; }; + 318387EB15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_C_LANGUAGE_STANDARD = ansi; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = CONFIG_VAR_WE; + GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; + GCC_WARN_PEDANTIC = YES; + GCC_WARN_SHADOW = YES; + GCC_WARN_SIGN_COMPARE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNKNOWN_PRAGMAS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = ( + "-pedantic", + "-Wall", + "-Wno-extended-offsetof", + ); + SDKROOT = macosx; + WARNING_CFLAGS = ( + "-pedantic", + "-Wpointer-arith", + "-Wstrict-prototypes", + "-Wmissing-prototypes", + "-Winline", + "-Waggregate-return", + "-Wnested-externs", + "-Wcast-qual", + "-Wshadow", + "-Wall", + "-Wno-extended-offsetof", + ); + }; + name = WE; + }; + 318387EC15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387ED15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387EE15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387EF15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F015DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F115DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F215DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F315DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F415DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F515DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F615DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F715DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F815DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387F915DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387FA15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387FB15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387FC15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387FD15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387FE15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 318387FF15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880015DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880115DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880215DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880315DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880415DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880515DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880615DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880715DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880815DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880915DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880A15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; + 3183880B15DC30CC008E4EA0 /* WE */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = WE; + }; 31D60015156D3CB200337B26 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3202,11 +3483,7 @@ COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = ansi; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - CONFIG_PF_XCI6LL, - CONFIG_PROD_MPS, - CONFIG_VAR_CI, - ); + GCC_PREPROCESSOR_DEFINITIONS = CONFIG_VAR_CI; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -3257,12 +3534,8 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = ansi; - GCC_PREPROCESSOR_DEFINITIONS = ( - CONFIG_PF_XCI6LL, - CONFIG_PROD_MPS, - CONFIG_VAR_HE, - NDEBUG, - ); + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = CONFIG_VAR_HE; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -3308,6 +3581,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -3317,6 +3591,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -3344,6 +3619,7 @@ buildConfigurations = ( 3104AFBA156D357B000A585A /* Debug */, 3104AFBB156D357B000A585A /* Release */, + 318387EF15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3353,6 +3629,7 @@ buildConfigurations = ( 3104AFD0156D35E2000A585A /* Debug */, 3104AFD1156D35E2000A585A /* Release */, + 318387F315DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3362,6 +3639,7 @@ buildConfigurations = ( 3104AFE5156D3682000A585A /* Debug */, 3104AFE6156D3682000A585A /* Release */, + 318387F415DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3371,6 +3649,7 @@ buildConfigurations = ( 3104AFF3156D37A0000A585A /* Debug */, 3104AFF4156D37A0000A585A /* Release */, + 318387EC15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3380,6 +3659,7 @@ buildConfigurations = ( 3104B011156D38F3000A585A /* Debug */, 3104B012156D38F3000A585A /* Release */, + 318387F515DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3389,6 +3669,7 @@ buildConfigurations = ( 3104B02A156D39D4000A585A /* Debug */, 3104B02B156D39D4000A585A /* Release */, + 318387F615DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3398,6 +3679,7 @@ buildConfigurations = ( 3104B045156D3AD8000A585A /* Debug */, 3104B046156D3AD8000A585A /* Release */, + 318387F715DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3407,6 +3689,7 @@ buildConfigurations = ( 3114A597156E913C001E0AA3 /* Debug */, 3114A598156E913C001E0AA3 /* Release */, + 318387FE15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3416,6 +3699,7 @@ buildConfigurations = ( 3114A5AF156E92C0001E0AA3 /* Debug */, 3114A5B0156E92C0001E0AA3 /* Release */, + 318387FF15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3425,6 +3709,7 @@ buildConfigurations = ( 3114A5C5156E9315001E0AA3 /* Debug */, 3114A5C6156E9315001E0AA3 /* Release */, + 3183880015DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3434,6 +3719,7 @@ buildConfigurations = ( 3114A5DE156E93A0001E0AA3 /* Debug */, 3114A5DF156E93A0001E0AA3 /* Release */, + 3183880115DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3443,6 +3729,7 @@ buildConfigurations = ( 3114A5F7156E93E7001E0AA3 /* Debug */, 3114A5F8156E93E7001E0AA3 /* Release */, + 3183880215DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3452,6 +3739,7 @@ buildConfigurations = ( 3114A60D156E9430001E0AA3 /* Debug */, 3114A60E156E9430001E0AA3 /* Release */, + 3183880315DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3461,6 +3749,7 @@ buildConfigurations = ( 3114A624156E9485001E0AA3 /* Debug */, 3114A625156E9485001E0AA3 /* Release */, + 3183880415DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3470,6 +3759,7 @@ buildConfigurations = ( 3114A63B156E94DB001E0AA3 /* Debug */, 3114A63C156E94DB001E0AA3 /* Release */, + 3183880515DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3479,6 +3769,7 @@ buildConfigurations = ( 3114A654156E9596001E0AA3 /* Debug */, 3114A655156E9596001E0AA3 /* Release */, + 3183880615DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3488,6 +3779,7 @@ buildConfigurations = ( 3114A66A156E95D9001E0AA3 /* Debug */, 3114A66B156E95D9001E0AA3 /* Release */, + 3183880715DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3497,6 +3789,7 @@ buildConfigurations = ( 3114A684156E9669001E0AA3 /* Debug */, 3114A685156E9669001E0AA3 /* Release */, + 3183880815DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3506,6 +3799,7 @@ buildConfigurations = ( 3114A69D156E971B001E0AA3 /* Debug */, 3114A69E156E971B001E0AA3 /* Release */, + 3183880915DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3515,6 +3809,7 @@ buildConfigurations = ( 3114A6B4156E9759001E0AA3 /* Debug */, 3114A6B5156E9759001E0AA3 /* Release */, + 3183880A15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3524,6 +3819,7 @@ buildConfigurations = ( 3114A6CE156E9815001E0AA3 /* Debug */, 3114A6CF156E9815001E0AA3 /* Release */, + 3183880B15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3533,6 +3829,7 @@ buildConfigurations = ( 3124CAC0156BE3EC00753214 /* Debug */, 3124CAC1156BE3EC00753214 /* Release */, + 318387F015DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3542,6 +3839,7 @@ buildConfigurations = ( 3124CADC156BE64A00753214 /* Debug */, 3124CADD156BE64A00753214 /* Release */, + 318387F215DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3551,6 +3849,7 @@ buildConfigurations = ( 3124CAF3156BE7F300753214 /* Debug */, 3124CAF4156BE7F300753214 /* Release */, + 318387EE15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3560,6 +3859,7 @@ buildConfigurations = ( 31D60015156D3CB200337B26 /* Debug */, 31D60016156D3CB200337B26 /* Release */, + 318387F815DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3569,6 +3869,7 @@ buildConfigurations = ( 31D6002F156D3D3F00337B26 /* Debug */, 31D60030156D3D3F00337B26 /* Release */, + 318387F915DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3578,6 +3879,7 @@ buildConfigurations = ( 31D60046156D3EC700337B26 /* Debug */, 31D60047156D3EC700337B26 /* Release */, + 318387FA15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3587,6 +3889,7 @@ buildConfigurations = ( 31D6005C156D3F3500337B26 /* Debug */, 31D6005D156D3F3500337B26 /* Release */, + 318387FB15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3596,6 +3899,7 @@ buildConfigurations = ( 31D60079156D3FBC00337B26 /* Debug */, 31D6007A156D3FBC00337B26 /* Release */, + 318387FC15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3605,6 +3909,7 @@ buildConfigurations = ( 31D60094156D402900337B26 /* Debug */, 31D60095156D402900337B26 /* Release */, + 318387FD15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3614,6 +3919,7 @@ buildConfigurations = ( 31EEABDF156AAE9E00714D05 /* Debug */, 31EEABE0156AAE9E00714D05 /* Release */, + 318387EB15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3623,6 +3929,7 @@ buildConfigurations = ( 31EEABFD156AAF9D00714D05 /* Debug */, 31EEABFE156AAF9D00714D05 /* Release */, + 318387ED15DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3632,6 +3939,7 @@ buildConfigurations = ( 31EEAC6D156AB52600714D05 /* Debug */, 31EEAC6E156AB52600714D05 /* Release */, + 318387F115DC30CC008E4EA0 /* WE */, ); defaultConfigurationIsVisible = 0; 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, return MPS_RES_OK; } -/* DEPRECATED */ -mps_res_t mps_space_create(mps_space_t *mps_space_o) -{ - return mps_arena_create(mps_space_o, mps_arena_class_vm(), ARENA_SIZE); -} - - /* mps_arena_destroy -- destroy an arena object */ void mps_arena_destroy(mps_arena_t mps_arena) @@ -476,12 +469,6 @@ void mps_arena_destroy(mps_arena_t mps_arena) ArenaDestroy(arena); } -/* DEPRECATED */ -void mps_space_destroy(mps_space_t mps_space) -{ - mps_arena_destroy(mps_space); -} - /* mps_arena_has_addr -- is this address managed by this arena? */ -- cgit v1.2.1