Update FSF's address in the preamble.

[bpt/emacs.git] / src / puresize.h

diff --git a/src/puresize.h b/src/puresize.h
index c194ca7..0b4d602 100644 (file)
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,9 +15,10 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
-/* # bytes of pure Lisp code to leave space for.
+/* Define PURESIZE, the number of bytes of pure Lisp code to leave space for.
 
    At one point, this was defined in config.h, meaning that changing
    PURESIZE would make Make recompile all of Emacs.  But only a few
@@ -27,39 +28,73 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    whether we are running X windows, which tells us how much pure
    storage to allocate.  */
 
-#ifndef PURESIZE
+/* First define a measure of the amount of data we have.  */
+
+/* A system configuration file may set this to request a certain extra
+   amount of storage.  This is a lot more update-robust that defining
+   BASE_PURESIZE or even PURESIZE directly.  */
+#ifndef SYSTEM_PURESIZE_EXTRA
+#define SYSTEM_PURESIZE_EXTRA 0
+#endif
+
+#ifndef SITELOAD_PURESIZE_EXTRA
+#define SITELOAD_PURESIZE_EXTRA 0
+#endif
+
+#ifndef BASE_PURESIZE
 #ifdef MULTI_FRAME
-#define PURESIZE 230000
+#define BASE_PURESIZE (325000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #else
-#define PURESIZE 200000
+#define BASE_PURESIZE (240000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 #endif
 
-#ifdef VIRT_ADDR_VARIES
+/* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
+#ifndef PURESIZE_RATIO
+#if VALBITS + GCTYPEBITS + 1 > 32
+#define PURESIZE_RATIO 8/5     /* Don't surround with `()'. */
+#else
+#define PURESIZE_RATIO 1
+#endif
+#endif
 
-/* For machines like APOLLO where text and data can go anywhere
-   in virtual memory.  */
+/* This is the actual size in bytes to allocate.  */
+#ifndef PURESIZE
+#define PURESIZE  (BASE_PURESIZE * PURESIZE_RATIO)
+#endif
+
+/* Signal an error if OBJ is pure.  */
 #define CHECK_IMPURE(obj) \
-  { extern int pure[]; \
-    if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
-       && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) \
+  { if (PURE_P (obj))    \
       pure_write_error (); }
+\f
+/* Define PURE_P.  */
+
+#ifdef VIRT_ADDR_VARIES
+/* For machines like APOLLO where text and data can go anywhere
+   in virtual memory.  */
+
+extern EMACS_INT pure[];
+
+#define PURE_P(obj) \
+ ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
+  && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
 
 #else /* not VIRT_ADDR_VARIES */
 #ifdef PNTR_COMPARISON_TYPE
+/* When PNTR_COMPARISON_TYPE is not the default (unsigned int).  */
 
-/* when PNTR_COMPARISON_TYPE is not the default (unsigned int) */
-#define CHECK_IMPURE(obj) \
-  { extern int my_edata; \
-    if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) &my_edata) \
-      pure_write_error (); }
+extern char my_edata[];
+
+#define PURE_P(obj) \
+  ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata)
 
 #else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */
 
-#define CHECK_IMPURE(obj) \
-  { extern int my_edata; \
-    if (XPNTR (obj) < (unsigned int) &my_edata) \
-      pure_write_error (); }
+extern char my_edata[];
+    
+#define PURE_P(obj) \
+  (XPNTR (obj) < (unsigned int) my_edata)
 
 #endif /* PNTR_COMPARISON_TYPE */
 #endif /* VIRT_ADDRESS_VARIES */