X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/09c8f04d1f9281f2f81a077f3ed14125fbb89232..e5a3b7d9690daa0827ca68074c4fa904eb552e63:/src/puresize.h

diff --git a/src/puresize.h b/src/puresize.h
index 79d13cd1e1..fd5bf1829a 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -1,5 +1,5 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,8 @@ 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.  */
 
 /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for.
 
@@ -36,18 +37,18 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define SYSTEM_PURESIZE_EXTRA 0
 #endif
 
-#ifndef BASE_PURESIZE
-#ifdef MULTI_FRAME
-#define BASE_PURESIZE (315000 + SYSTEM_PURESIZE_EXTRA)
-#else
-#define BASE_PURESIZE (240000 + SYSTEM_PURESIZE_EXTRA)
+#ifndef SITELOAD_PURESIZE_EXTRA
+#define SITELOAD_PURESIZE_EXTRA 0
 #endif
+
+#ifndef BASE_PURESIZE
+#define BASE_PURESIZE (910000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* 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 `()'. */
+#define PURESIZE_RATIO 9/5	/* Don't surround with `()'. */
 #else
 #define PURESIZE_RATIO 1
 #endif
@@ -58,32 +59,40 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define PURESIZE  (BASE_PURESIZE * PURESIZE_RATIO)
 #endif
 
-#ifdef VIRT_ADDR_VARIES
+/* Signal an error if OBJ is pure.  */
+#define CHECK_IMPURE(obj) \
+  { if (PURE_P (obj))	  \
+      pure_write_error (); }
+
+extern void pure_write_error P_ ((void));
+
+/* Define PURE_P.  */
 
+#ifdef VIRT_ADDR_VARIES
 /* For machines like APOLLO where text and data can go anywhere
    in virtual memory.  */
-#define CHECK_IMPURE(obj) \
-  { extern EMACS_INT pure[]; \
-    if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
-	&& (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) \
-      pure_write_error (); }
+
+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 char 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 char 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 */
-