XEmacs 21.2.20 "Yoko".

[chise/xemacs-chise.git.1] / src / opaque.h

diff --git a/src/opaque.h b/src/opaque.h
index 5a711e7..4788cf0 100644 (file)
--- a/src/opaque.h
+++ b/src/opaque.h
@@ -26,69 +26,55 @@ Boston, MA 02111-1307, USA.  */
 #ifndef _XEMACS_OPAQUE_H_
 #define _XEMACS_OPAQUE_H_
 
-struct Lisp_Opaque
-{
-  struct lcrecord_header header;
-  Lisp_Object (*markfun) (Lisp_Object obj, void (*markobj) (Lisp_Object));
-  /* An integral size for non-freed objects, an opaque or nil for
-     freed objects. */
-  Lisp_Object size_or_chain;
-  /* It's actually more space-efficient to declare this as an int
-     rather than a char, because the structure will get rounded up
-     in size by the compiler anyway. */
-  int data[1];
-};
-
-struct Lisp_Opaque_List
+typedef union {
+  struct { Lisp_Object obj; } obj;
+  struct { void *p; } p;
+  struct { double d; } d;
+} max_align_t;
+
+typedef struct Lisp_Opaque
 {
   struct lcrecord_header header;
-  Lisp_Object (*markfun) (Lisp_Object obj, void (*markobj) (Lisp_Object));
-  Lisp_Object free;
-  int size;
-};
+  size_t size;
+  max_align_t data[1];
+} Lisp_Opaque;
 
-DECLARE_LRECORD (opaque, struct Lisp_Opaque);
-#define XOPAQUE(x) XRECORD (x, opaque, struct Lisp_Opaque)
+DECLARE_LRECORD (opaque, Lisp_Opaque);
+#define XOPAQUE(x) XRECORD (x, opaque, Lisp_Opaque)
 #define XSETOPAQUE(x, p) XSETRECORD (x, p, opaque)
 #define OPAQUEP(x) RECORDP (x, opaque)
-#define GC_OPAQUEP(x) GC_RECORDP (x, opaque)
 /* #define CHECK_OPAQUE(x) CHECK_RECORD (x, opaque)
    Opaque pointers should never escape to the Lisp level, so
    functions should not be doing this. */
 
-DECLARE_LRECORD (opaque_list, struct Lisp_Opaque_List);
-#define XOPAQUE_LIST(x) XRECORD (x, opaque_list, struct Lisp_Opaque_List)
-#define XSETOPAQUE_LIST(x, p) XSETRECORD (x, p, opaque_list)
-#define OPAQUE_LISTP(x) RECORDP (x, opaque_list)
-#define GC_OPAQUE_LISTP(x) GC_RECORDP (x, opaque_list)
-/* #define CHECK_OPAQUE_LIST(x) CHECK_RECORD (x, opaque_list)
-   Opaque lists should never escape to the Lisp level, so
-   functions should not be doing this. */
+/* Alternative DATA arguments to make_opaque */
+#define OPAQUE_CLEAR  ((CONST void *)  0)
+#define OPAQUE_UNINIT ((CONST void *) -1)
 
-Lisp_Object make_opaque (int size, CONST void *data);
-Lisp_Object make_opaque_ptr (CONST void *val);
-Lisp_Object make_opaque_long (long val);
-void free_opaque_ptr (Lisp_Object ptr);
-
-#define OPAQUE_SIZE(op) XINT ((op)->size_or_chain)
-#define OPAQUE_DATA(op) ((op)->data)
-#define OPAQUE_MARKFUN(op) ((op)->markfun) /* What's the point if this? */
+#define OPAQUE_SIZE(op) ((op)->size)
+#define OPAQUE_DATA(op) ((void *) ((op)->data))
+#define OPAQUE_MARKFUN(op) ((op)->markfun)
 #define XOPAQUE_SIZE(op) OPAQUE_SIZE (XOPAQUE (op))
 #define XOPAQUE_DATA(op) OPAQUE_DATA (XOPAQUE (op))
 #define XOPAQUE_MARKFUN(op) OPAQUE_MARKFUN (XOPAQUE (op))
 
-#define get_opaque_ptr(op) (* (void **) XOPAQUE_DATA (op))
-#define set_opaque_ptr(op, ptr) (get_opaque_ptr (op) = (void *) ptr)
-#define get_opaque_long(op) (* (long *) XOPAQUE_DATA (op))
-#define set_opaque_long(op, ptr) (get_opaque_long (op) = ptr)
-#define set_opaque_markfun(op, fun) (XOPAQUE_MARKFUN (op) = fun)
-
-Lisp_Object make_opaque_list (int size,
-                             Lisp_Object (*markfun)
-                             (Lisp_Object obj,
-                              void (*markobj) (Lisp_Object)));
-Lisp_Object allocate_managed_opaque (Lisp_Object opaque_list,
-                                    CONST void *data);
-void free_managed_opaque (Lisp_Object opaque_list, Lisp_Object opaque);
+Lisp_Object make_opaque (size_t size, CONST void *data);
+
+typedef struct Lisp_Opaque_Ptr
+{
+  struct lcrecord_header header;
+  void *ptr;
+} Lisp_Opaque_Ptr;
+
+DECLARE_LRECORD (opaque_ptr, Lisp_Opaque_Ptr);
+#define XOPAQUE_PTR(x) XRECORD (x, opaque_ptr, Lisp_Opaque_Ptr)
+#define XSETOPAQUE_PTR(x, p) XSETRECORD (x, p, opaque_ptr)
+#define OPAQUE_PTRP(x) RECORDP (x, opaque_ptr)
+
+Lisp_Object make_opaque_ptr (void *val);
+void free_opaque_ptr (Lisp_Object ptr);
+
+#define get_opaque_ptr(op) (XOPAQUE_PTR (op)->ptr)
+#define set_opaque_ptr(op, ptr_) (XOPAQUE_PTR (op)->ptr = (ptr_))
 
 #endif /* _XEMACS_OPAQUE_H_ */