This commit was generated by cvs2svn to compensate for changes in r5182,

[chise/xemacs-chise.git.1] / src / m / iris6d.h

diff --git a/src/m/iris6d.h b/src/m/iris6d.h
index 913868b..caae6dc 100644 (file)
--- a/src/m/iris6d.h
+++ b/src/m/iris6d.h
@@ -20,6 +20,11 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.31. */
 
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts.  */
+
+#undef WORD_MACHINE
+
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -33,6 +38,14 @@ Boston, MA 02111-1307, USA.  */
 #define IRIS_4D
 #endif
 
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the bit field into an int.  In other words, if bit fields
+   are always unsigned.
+
+   If you use NO_UNION_TYPE, this flag does not matter.  */
+
+#define EXPLICIT_SIGN_EXTEND
+
 /* jg@genmagic.genmagic.com (John Giannandrea) says this is unnecessary.  */
 #if 0
 /* Data type of load average, as read out of kmem.  */
@@ -55,6 +68,15 @@ Boston, MA 02111-1307, USA.  */
 
 #undef CANNOT_DUMP
 
+/* Define VIRT_ADDR_VARIES if the virtual addresses of
+   pure and impure space as loaded can vary, and even their
+   relative order cannot be relied on.
+
+   Otherwise Emacs assumes that text space precedes data space,
+   numerically.  */
+
+/* #define VIRT_ADDR_VARIES */
+
 /* Define C_ALLOCA if this machine does not support a true alloca
    and the one written in C should be used instead.
    Define HAVE_ALLOCA to say that the system provides a properly
@@ -83,7 +105,15 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #define TEXT_START 0x400000
+
+/*
+ * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
+ * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
+ * the value field of a LISP_OBJECT).
+ */
+
 #define DATA_START 0x10000000
+#define DATA_SEG_BITS  0x10000000
 
 #undef LIBS_MACHINE
 /* -lsun in case using Yellow Pages for passwords.  */