XEmacs 21.2.20 "Yoko".

[chise/xemacs-chise.git.1] / src / lisp-union.h

diff --git a/src/lisp-union.h b/src/lisp-union.h
index 1406781..54088cf 100644 (file)
--- a/src/lisp-union.h
+++ b/src/lisp-union.h
@@ -23,20 +23,17 @@ Boston, MA 02111-1307, USA.  */
 
 /* Definition of Lisp_Object type as a union.
    The declaration order of the objects within the struct members
-   of the union is dependent on ENDIAN-ness and USE_MINIMAL_TAGBITS.
+   of the union is dependent on ENDIAN-ness.
    See lisp-disunion.h for more details.  */
 
 typedef
 union Lisp_Object
 {
   /* if non-valbits are at lower addresses */
-#if defined(WORDS_BIGENDIAN) == defined(USE_MINIMAL_TAGBITS)
+#if defined(WORDS_BIGENDIAN)
   struct
   {
     EMACS_UINT val : VALBITS;
-#if GCMARKBITS > 0
-    unsigned int markbit: GCMARKBITS;
-#endif
     enum_field (Lisp_Type) type : GCTYPEBITS;
   } gu;
 
@@ -55,9 +52,6 @@ union Lisp_Object
   struct
   {
     enum_field (Lisp_Type) type : GCTYPEBITS;
-#if GCMARKBITS > 0
-    unsigned int markbit: GCMARKBITS;
-#endif
     EMACS_UINT val : VALBITS;
   } gu;
 
@@ -88,31 +82,23 @@ Lisp_Object;
 
 #define XCHARVAL(x) ((x).gu.val)
 
-#ifdef USE_MINIMAL_TAGBITS
 # define XSETINT(var, value) do {      \
-  Lisp_Object *_xzx = &(var);          \
-  _xzx->s.val = (value);               \
-  _xzx->s.bits = 1;                    \
+  EMACS_INT xset_value = (value);      \
+  Lisp_Object *xset_var = &(var);      \
+  xset_var->s.bits = 1;                        \
+  xset_var->s.val = xset_value;                \
 } while (0)
 # define XSETCHAR(var, value) do {     \
-  Lisp_Object *_xzx = &(var);          \
-  _xzx->gu.val = (EMACS_UINT) (value); \
-  _xzx->gu.type = Lisp_Type_Char;      \
+  Emchar xset_value = (value);         \
+  Lisp_Object *xset_var = &(var);      \
+  xset_var->gu.type = Lisp_Type_Char;  \
+  xset_var->gu.val = xset_value;       \
 } while (0)
-# define XSETOBJ(var, vartype, value)  \
-  ((void) ((var).ui = (EMACS_UINT) (value)))
-# define XPNTRVAL(x) ((x).ui)
-#else /* ! USE_MINIMAL_TAGBITS */
 # define XSETOBJ(var, vartype, value) do {     \
-  Lisp_Object *_xzx = &(var);                  \
-  _xzx->gu.val = (EMACS_UINT) (value);         \
-  _xzx->gu.type = (vartype);                   \
-  _xzx->gu.markbit = 0;                                \
+  EMACS_UINT xset_value = (EMACS_UINT) (value);        \
+  (var).ui = xset_value;                       \
 } while (0)
-# define XSETINT(var, value) XSETOBJ (var, Lisp_Type_Int, value)
-# define XSETCHAR(var, value) XSETOBJ (var, Lisp_Type_Char, value)
-# define XPNTRVAL(x) ((x).gu.val)
-#endif /* ! USE_MINIMAL_TAGBITS */
+# define XPNTRVAL(x) ((x).ui)
 
 INLINE Lisp_Object make_int (EMACS_INT val);
 INLINE Lisp_Object
@@ -137,28 +123,13 @@ extern Lisp_Object Qnull_pointer, Qzero;
 #define XREALINT(x) ((x).s.val)
 #define XUINT(x) ((x).u.val)
 #define XTYPE(x) ((x).gu.type)
-#define XGCTYPE(x) XTYPE (x)
 #define EQ(x,y) ((x).v == (y).v)
 
-#ifdef USE_MINIMAL_TAGBITS
 #define INTP(x) ((x).s.bits)
-#define GC_EQ(x,y) EQ (x, y)
-#else
-#define INTP(x) (XTYPE(x) == Lisp_Type_Int)
-#define GC_EQ(x,y) ((x).gu.val == (y).gu.val && XTYPE (x) == XTYPE (y))
-#endif
-
-#if GCMARKBITS > 0
-/* XMARKBIT accesses the markbit.  Markbits are used only in
-   particular slots of particular structure types.  Other markbits are
-   always zero.  Outside of garbage collection, all mark bits are
-   always zero. */
-# define XMARKBIT(x) ((x).gu.markbit)
-# define XMARK(x) ((void) (XMARKBIT (x) = 1))
-# define XUNMARK(x) ((void) (XMARKBIT (x) = 0))
-#else
-# define XUNMARK(x) DO_NOTHING
-#endif
+#define INT_PLUS(x,y)  make_int (XINT (x) + XINT (y))
+#define INT_MINUS(x,y) make_int (XINT (x) - XINT (y))
+#define INT_PLUS1(x)   make_int (XINT (x) + 1)
+#define INT_MINUS1(x)  make_int (XINT (x) - 1)
 
 /* Convert between a (void *) and a Lisp_Object, as when the
    Lisp_Object is passed to a toolkit callback function */