mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-07 16:10:46 -08:00
Code Issues Projects Releases Wiki Activity

Renaming varieties we to rash and di to diag. leaving ti alone as it will be deleted shortly in merge with diagnostic-telemetry branch.

Browse source 
Copied from Perforce
 Change: 179193
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2012-09-03 13:32:11 +01:00
parent d3aacdebfc
commit 3ec3f57262
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mps/code/check.h
View file

@ -23,7 +23,7 @@
* without realising it. This has happened before. Eyeball the preprocessor
* output for each variety. For example:
*
* cc -E -DCONFIG_VAR_WE trace.c
* cc -E -DCONFIG_VAR_RASH trace.c
* cc -E -DCONFIG_VAR_HOT trace.c
* cc -E -DCONFIG_VAR_COOL trace.c
*

22
mps/code/comm.gmk
View file

@ -97,22 +97,22 @@ CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSCOMPILER)
# variety.
# These flags are added to compilations for the indicated variety.
CFWE = -DCONFIG_VAR_WE -DNDEBUG $(CFLAGSOPT)
CFHOT = -DCONFIG_VAR_HOT -DNDEBUG $(CFLAGSOPT)
CFDI = -DCONFIG_VAR_DI -DNDEBUG $(CFLAGSOPT)
CFCOOL = -DCONFIG_VAR_COOL $(CFLAGSDEBUG)
CFTI = -DCONFIG_VAR_TI $(CFLAGSDEBUG)
CFRASH = -DCONFIG_VAR_RASH -DNDEBUG $(CFLAGSOPT)
CFHOT = -DCONFIG_VAR_HOT -DNDEBUG $(CFLAGSOPT)
CFDIAG = -DCONFIG_VAR_DIAG -DNDEBUG $(CFLAGSOPT)
CFCOOL = -DCONFIG_VAR_COOL $(CFLAGSDEBUG)
CFTI = -DCONFIG_VAR_TI $(CFLAGSDEBUG)
# Bind CFLAGS to the appropriate set of flags for the variety.
# %%VARIETY: Add a test for the variety and set CFLAGS here.
ifeq ($(VARIETY),we)
CFLAGS=$(CFLAGSCOMMON) $(CFWE)
ifeq ($(VARIETY),rash)
CFLAGS=$(CFLAGSCOMMON) $(CFRASH)
else
ifeq ($(VARIETY),hot)
CFLAGS=$(CFLAGSCOMMON) $(CFHOT)
else
ifeq ($(VARIETY),di)
CFLAGS=$(CFLAGSCOMMON) $(CFDI)
ifeq ($(VARIETY),diag)
CFLAGS=$(CFLAGSCOMMON) $(CFDIAG)
else
ifeq ($(VARIETY),cool)
CFLAGS=$(CFLAGSCOMMON) $(CFCOOL)
@ -291,10 +291,10 @@ endif
#
# %%VARIETY: Add a rule for how to build the MPS library for the variety
$(PFM)/we/mps.a: $(PFM)/we/mps.o
$(PFM)/rash/mps.a: $(PFM)/rash/mps.o
$(PFM)/hot/mps.a: $(PFM)/hot/mps.o
$(PFM)/di/mps.a: \
$(PFM)/diag/mps.a: \
$(MPMOBJ) $(AMCOBJ) $(AMSOBJ) $(AWLOBJ) $(LOOBJ) $(SNCOBJ) \
$(MVFFOBJ) $(PLINTHOBJ) $(POOLNOBJ)
$(PFM)/cool/mps.a: \

2
mps/code/commpost.nmk
View file

@ -96,7 +96,7 @@ mpsicv.cov:
#
# %%VARIETY: Add a rule for how to build the MPS library for the variety
$(PFM)\we\mps.lib: $(PFM)\we\mps.obj
$(PFM)\rash\mps.lib: $(PFM)\rash\mps.obj
$(ECHO) $@
$(LIBMAN) $(LIBFLAGS) /OUT:$@ $**

12
mps/code/commpre.nmk
View file

@ -113,9 +113,9 @@ CFLAGSEXTERNAL =
# The combinations of variety
# %%VARIETY: Define a macro containing the set of flags for the new variety.
CFWE = /DCONFIG_VAR_WE $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSEXTERNAL)
CFRASH = /DCONFIG_VAR_RASH $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSEXTERNAL)
CFHOT = /DCONFIG_VAR_HOT $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSEXTERNAL)
CFDI = /DCONFIG_VAR_DI $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSINTERNAL)
CFDIAG = /DCONFIG_VAR_DIAG $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSINTERNAL)
CFCOOL = /DCONFIG_VAR_COOL $(CRTFLAGSCOOL) $(CFLAGSCOOL) $(CFLAGSINTERNAL)
CFTI = /DCONFIG_VAR_TI $(CRTFLAGSCOOL) $(CFLAGSCOOL) $(CFLAGSINTERNAL)
@ -130,9 +130,9 @@ LINKFLAGSINTERNAL = /DEBUG
# ( Internal flags used to be set to /DEBUG:full )
LINKFLAGSEXTERNAL = /RELEASE
LFWE = $(LINKFLAGSHOT) $(LINKFLAGSEXTERNAL)
LFRASH = $(LINKFLAGSHOT) $(LINKFLAGSEXTERNAL)
LFHOT = $(LINKFLAGSHOT) $(LINKFLAGSEXTERNAL)
LFDI = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL)
LFDIAG = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL)
LFCOOL = $(LINKFLAGSCOOL) $(LINKFLAGSINTERNAL)
LFTI = $(LINKFLAGSCOOL) $(LINKFLAGSINTERNAL)
@ -143,9 +143,9 @@ LFTI = $(LINKFLAGSCOOL) $(LINKFLAGSINTERNAL)
LIBMAN = lib # can't call this LIB - it screws the environment
LIBFLAGSCOMMON = /nologo
LIBFLAGSWE =
LIBFLAGSRASH =
LIBFLAGSHOT =
LIBFLAGSDI =
LIBFLAGSDIAG =
LIBFLAGSCOOL =
LIBFLAGSTI =

12
mps/code/config.h
View file

@ -25,7 +25,7 @@
the directives CONFIG_ASSERT, CONFIG_STATS, CONFIG_LOG, etc. which control
actual compilation features. */
/* CONFIG_VAR_WE -- the white-hot variety
/* CONFIG_VAR_RASH -- the rash and reckless variety
*
* This variety switches off as many features as possible for maximum
* performance, but is therefore unsafe and undebuggable. It is not intended
@ -33,7 +33,7 @@
* logging, etc. have negligible overhead.
*/
#if defined(CONFIG_VAR_WE) /* White-hot variety */
#if defined(CONFIG_VAR_RASH)
/* no asserts */
/* no statistic meters */
/* no telemetry log events */
@ -46,7 +46,7 @@
* consistency checking and allowing some debugging and telemetry features.
*/
#elif defined(CONFIG_VAR_HOT) /* Hot variety */
#elif defined(CONFIG_VAR_HOT)
#define CONFIG_ASSERT
#ifndef CHECKLEVEL
#define CHECKLEVEL CheckLevelMINIMAL
@ -55,14 +55,14 @@
/* no telemetry log events */
/* CONFIG_VAR_DI -- diagnostic variety
/* CONFIG_VAR_DIAG -- diagnostic variety
*
* Deprecated. The diagnostic variety prints messages about the internals
* of the MPS to an output stream. This is being replaced by an extended
* telemetry system. RB 2012-08-31
*/
#elif defined(CONFIG_VAR_DI) /* Diagnostic variety */
#elif defined(CONFIG_VAR_DIAG) /* Diagnostic variety */
#define CONFIG_ASSERT
#ifndef CHECKLEVEL
#define CHECKLEVEL CheckLevelMINIMAL
@ -85,7 +85,7 @@
* and data collection and output, and full debugging information.
*/
#elif defined(CONFIG_VAR_COOL) /* Cool variety */
#elif defined(CONFIG_VAR_COOL)
#define CONFIG_ASSERT
#define CONFIG_ASSERT_ALL
#define CONFIG_STATS