[project @ 2000-11-14 14:33:02 by simonmar]

[ghc-hetmet.git] / ghc / includes / options.h

diff --git a/ghc/includes/options.h b/ghc/includes/options.h
index 61c01c4..7993101 100644 (file)
--- a/ghc/includes/options.h
+++ b/ghc/includes/options.h
@@ -7,8 +7,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: options.h,v $
- * $Revision: 1.23 $
- * $Date: 2000/03/20 04:26:24 $
+ * $Revision: 1.29 $
+ * $Date: 2000/05/10 09:00:20 $
  * ------------------------------------------------------------------------*/
 
 
@@ -55,11 +55,6 @@
  * User interface options
  * ------------------------------------------------------------------------*/
 
-/* Define if you want to use the "Hugs for Windows" GUI.
- * (Windows 3.1 and compatibles only)
- */
-#define HUGS_FOR_WINDOWS 0
-
 /* Define if you want filenames to be converted to normal form by:
  * o replacing relative pathnames with absolute pathnames and
  *   eliminating .. and . where possible.
@@ -71,12 +66,6 @@
  */
 #define SMALL_BANNER 0
 
-/* Define if you want to be able to redirect stdout/stderr to a buffer.
- * Only necessary for the Hugs server interface (which is used in the
- * Netscape plugin and the standalone evaluator "runhugs"). 
- */
-#define REDIRECT_OUTPUT (!HUGS_FOR_WINDOWS)
-
 
 /* --------------------------------------------------------------------------
  * Language extensions
@@ -97,9 +86,7 @@
  * Various table sizes
  * ------------------------------------------------------------------------*/
 
-#define NUM_SYNTAX         100
 #define NUM_TUPLES         37
-#define NUM_OFFSETS        1024
 #define NUM_CHARS          256
 #if TREX
 #define NUM_EXT            100
@@ -108,19 +95,14 @@
 
 #define MINIMUMHEAP        19000
 #define MAXIMUMHEAP        0
-#define DEFAULTHEAP        350000
-
-#define NUM_SCRIPTS        100
-#define NUM_MODULE         NUM_SCRIPTS
-#define NUM_TYCON          400
-#define NUM_NAME           16000
-#define NUM_CLASSES        80
-#define NUM_INSTS          600
-#define NUM_TEXT           100000
+#define DEFAULTHEAP        320000
+
+#define TEXT_SIZE          100000
 #define NUM_TEXTH          10
 #define NUM_TYVARS         4000
 #define NUM_STACK          16000
 #define NUM_DTUPLES        5
+#define NUM_MSTACK         2000
 
 #define MAXPOSINT          0x7fffffff
 #define MINNEGINT          (-MAXPOSINT-1)
@@ -131,20 +113,6 @@
 #define wordShift          5
 #define wordMask           31
 
-/* Define to force a fixed size (NUM_TYVARS) for the current substitution.
- * Setting this flag places a limit on the maximum complexity of
- * expressions handled by the typechecker.  It is normally turned off
- * but may be required for small machines/configurations.
- */
-#define FIXED_SUBST 0 
-
-/* Define this to allocate tables dynamically.
- * This is currently just a memory saving trick, but this may be
- * extended at a later stage to allow at least some of the tables
- * to be extended dynamically at run-time to avoid exhausted space errors.
- */
-#define DYN_TABLES 0
-
 /* Should quantifiers be displayed in error messages.
  * Warning: not consistently used.
  */
@@ -166,12 +134,6 @@
 #define PROVIDE_PTREQUALITY 1
 #define PROVIDE_CONCURRENT  1
 
-/* Enable a crude profiler which counts BCO entries, bytes allocated
-   and bytecode insns executed on a per-fn basis.  Used for assessing
-   the effect of the simplifier/optimiser.
-*/
-#undef CRUDE_PROFILING
-
 /* Turn bytecode interpreter support on/off.
  */
 #define INTERPRETER 1 
@@ -184,6 +146,7 @@
  * and EAGER_BLACKHOLING has been introduced also.  KSW 1999-01.
  */
 
+
 /* Turn miniinterpreter on/off.
  * 
  * The mininterpreter is portable but slow - if you turn it off, 
@@ -197,7 +160,10 @@
  * If you turn this off, you'll probably need to provide some
  * assembly language support for your architecture.
  */
-#define NO_REGS
+/* Disabled by JRS 09 May 00.  Seems unneccessary and generates a lot of
+   warnings compiling the RTS.
+*/
+/* #define NO_REGS */
 
 
 /* Define if :xplain should be enabled                                    */