From bd09ac3c18ea25dc77ac3cdae47cf0c1fb1ad1a5 Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Fri, 27 Apr 2007 16:46:51 +0100
Subject: [PATCH] Mps br/diag: new variety.di: hot+diagnostics

Copied from Perforce
 Change: 162222
 ServerID: perforce.ravenbrook.com
---
 mps/code/comm.gmk    |  5 +++++
 mps/code/commpre.nmk |  3 +++
 mps/code/config.h    |  6 ++++++
 mps/code/w3almv.nmk  | 29 +++++++++++++++++++++++++++++
 mps/code/w3i3mv.nmk  | 29 +++++++++++++++++++++++++++++
 mps/code/w3ppmv.nmk  | 29 +++++++++++++++++++++++++++++
 6 files changed, 101 insertions(+)

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index fc3d2db1168..93c77b2a9e4 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -126,6 +126,7 @@ CFWE = -DCONFIG_VAR_WE -DNDEBUG $(CFLAGSOPTNODEBUG)
 CFWI = -DCONFIG_VAR_WI -DNDEBUG $(CFLAGSOPT)
 CFHE = -DCONFIG_VAR_HE -DNDEBUG $(CFLAGSOPTNODEBUG)
 CFHI = -DCONFIG_VAR_HI -DNDEBUG $(CFLAGSOPT)
+CFDI = -DCONFIG_VAR_DI -DNDEBUG $(CFLAGSOPT)
 CFII = -DCONFIG_VAR_II -DNDEBUG $(CFLAGSOPT)
 CFCE = -DCONFIG_VAR_CE          $(CFLAGSOPTNODEBUG)
 CFCI = -DCONFIG_VAR_CI          $(CFLAGSDEBUG)
@@ -145,6 +146,9 @@ else
 ifeq ($(VARIETY),hi)
 CFLAGS=$(CFLAGSCOMMON) $(CFHI)
 else
+ifeq ($(VARIETY),di)
+CFLAGS=$(CFLAGSCOMMON) $(CFDI)
+else
 ifeq ($(VARIETY),ii)
 CFLAGS=$(CFLAGSCOMMON) $(CFII)
 else
@@ -165,6 +169,7 @@ endif
 endif
 endif
 endif
+endif
 
 
 ARFLAGS=rc$(ARFLAGSPFM)
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk
index c10da3de76d..66a3cf2965c 100644
--- a/mps/code/commpre.nmk
+++ b/mps/code/commpre.nmk
@@ -146,6 +146,7 @@ CFWE = /DCONFIG_VAR_WE $(CRTFLAGSW)  $(CFLAGSHOT)  $(CFLAGSEXTERNAL)
 CFWI = /DCONFIG_VAR_WI $(CRTFLAGSW)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
 CFHE = /DCONFIG_VAR_HE $(CRTFLAGSH)  $(CFLAGSHOT)  $(CFLAGSEXTERNAL)
 CFHI = /DCONFIG_VAR_HI $(CRTFLAGSH)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
+CFDI = /DCONFIG_VAR_DI $(CRTFLAGSH)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
 CFCE = /DCONFIG_VAR_CE $(CRTFLAGSC)  $(CFLAGSCOOL) $(CFLAGSEXTERNAL)
 CFCI = /DCONFIG_VAR_CI $(CRTFLAGSC)  $(CFLAGSCOOL) $(CFLAGSINTERNAL)
 CFTI = /DCONFIG_VAR_TI $(CRTFLAGSC)  $(CFLAGSCOOL) $(CFLAGSINTERNAL)
@@ -164,6 +165,7 @@ LFWE = $(LINKFLAGSWHITE)  $(LINKFLAGSEXTERNAL)
 LFWI = $(LINKFLAGSWHITE)  $(LINKFLAGSINTERNAL)
 LFHE = $(LINKFLAGSHOT)    $(LINKFLAGSEXTERNAL)
 LFHI = $(LINKFLAGSHOT)    $(LINKFLAGSINTERNAL)
+LFDI = $(LINKFLAGSHOT)    $(LINKFLAGSINTERNAL)
 LFCE = $(LINKFLAGSCOOL)   $(LINKFLAGSEXTERNAL)
 LFCI = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
 LFTI = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
@@ -178,6 +180,7 @@ LIBFLAGSWE =
 LIBFLAGSWI =
 LIBFLAGSHE =
 LIBFLAGSHI =
+LIBFLAGSDI =
 LIBFLAGSCE =
 LIBFLAGSCI =
 LIBFLAGSTI =
diff --git a/mps/code/config.h b/mps/code/config.h
index edf27000969..7fa0b89c8a4 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -41,6 +41,12 @@
 /* no debug diagnostic statistic meters */
 /* no telemetry log events */
 
+#elif defined(CONFIG_VAR_DI) /* Diagnostic variety */
+#define CONFIG_ASSERT
+#define CHECKLEVEL_INITIAL CheckLevelMINIMAL
+#define CONFIG_DEBUG
+/* no telemetry log events */
+
 #elif defined(CONFIG_VAR_CI) || defined(CONFIG_VAR_CE) /* Cool varieties */
 #define CONFIG_ASSERT
 /* ... let PRODUCT determine CHECKLEVEL_INITIAL */
diff --git a/mps/code/w3almv.nmk b/mps/code/w3almv.nmk
index 994551899f2..d961739b0b0 100644
--- a/mps/code/w3almv.nmk
+++ b/mps/code/w3almv.nmk
@@ -141,6 +141,35 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\hi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
+!ELSEIF "$(VARIETY)" == "di"
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
+MPMOBJ0 = $(MPM:<=w3almv\di\)
+MPMOBJ = $(MPMOBJ0:>=.obj)
+PLINTHOBJ0 = $(PLINTH:<=w3almv\di\)
+PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
+SWOBJ0 = $(SW:<=w3almv\di\)
+SWOBJ = $(SWOBJ0:>=.obj)
+AMSOBJ0 = $(AMS:<=w3almv\di\)
+AMSOBJ = $(AMSOBJ0:>=.obj)
+AMCOBJ0 = $(AMC:<=w3almv\di\)
+AMCOBJ = $(AMCOBJ0:>=.obj)
+AWLOBJ0 = $(AWL:<=w3almv\di\)
+AWLOBJ = $(AWLOBJ0:>=.obj)
+LOOBJ0 = $(LO:<=w3almv\di\)
+LOOBJ = $(LOOBJ0:>=.obj)
+SNCOBJ0 = $(SNC:<=w3almv\di\)
+SNCOBJ = $(SNCOBJ0:>=.obj)
+DWOBJ0 = $(DW:<=w3almv\di\)
+DWOBJ = $(DWOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\di\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\di\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+TESTLIBOBJ0 = $(TESTLIB:<=w3almv\di\)
+TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
+
 !ELSEIF "$(VARIETY)" == "ci"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI)
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 9d18c7a32a9..fc9509cd87b 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -141,6 +141,35 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
+!ELSEIF "$(VARIETY)" == "di"
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
+MPMOBJ0 = $(MPM:<=w3i3mv\di\)
+MPMOBJ = $(MPMOBJ0:>=.obj)
+PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\)
+PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
+SWOBJ0 = $(SW:<=w3i3mv\di\)
+SWOBJ = $(SWOBJ0:>=.obj)
+AMSOBJ0 = $(AMS:<=w3i3mv\di\)
+AMSOBJ = $(AMSOBJ0:>=.obj)
+AMCOBJ0 = $(AMC:<=w3i3mv\di\)
+AMCOBJ = $(AMCOBJ0:>=.obj)
+AWLOBJ0 = $(AWL:<=w3i3mv\di\)
+AWLOBJ = $(AWLOBJ0:>=.obj)
+LOOBJ0 = $(LO:<=w3i3mv\di\)
+LOOBJ = $(LOOBJ0:>=.obj)
+SNCOBJ0 = $(SNC:<=w3i3mv\di\)
+SNCOBJ = $(SNCOBJ0:>=.obj)
+DWOBJ0 = $(DW:<=w3i3mv\di\)
+DWOBJ = $(DWOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3i3mv\di\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\)
+TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
+
 !ELSEIF "$(VARIETY)" == "ci"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI)
diff --git a/mps/code/w3ppmv.nmk b/mps/code/w3ppmv.nmk
index 4c684d5e610..28b565e6254 100644
--- a/mps/code/w3ppmv.nmk
+++ b/mps/code/w3ppmv.nmk
@@ -138,6 +138,35 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\hi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
+!ELSEIF "$(VARIETY)" == "di"
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
+MPMOBJ0 = $(MPM:<=w3ppmv\di\)
+MPMOBJ = $(MPMOBJ0:>=.obj)
+PLINTHOBJ0 = $(PLINTH:<=w3ppmv\di\)
+PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
+SWOBJ0 = $(SW:<=w3ppmv\di\)
+SWOBJ = $(SWOBJ0:>=.obj)
+AMSOBJ0 = $(AMS:<=w3ppmv\di\)
+AMSOBJ = $(AMSOBJ0:>=.obj)
+AMCOBJ0 = $(AMC:<=w3ppmv\di\)
+AMCOBJ = $(AMCOBJ0:>=.obj)
+AWLOBJ0 = $(AWL:<=w3ppmv\di\)
+AWLOBJ = $(AWLOBJ0:>=.obj)
+LOOBJ0 = $(LO:<=w3ppmv\di\)
+LOOBJ = $(LOOBJ0:>=.obj)
+SNCOBJ0 = $(SNC:<=w3ppmv\di\)
+SNCOBJ = $(SNCOBJ0:>=.obj)
+DWOBJ0 = $(DW:<=w3ppmv\di\)
+DWOBJ = $(DWOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\di\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3ppmv\di\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\di\)
+TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
+
 !ELSEIF "$(VARIETY)" == "ci"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI)