Added e2k arch support.

[cln.git] / include / cln / object.h

diff --git a/include/cln/object.h b/include/cln/object.h
index 1f660551b7b89cbe3befe62a64a0b3ad9ade774c..15c13593f4aa98b2b4d29d597444590238eab400 100644 (file)
--- a/include/cln/object.h
+++ b/include/cln/object.h
@@ -17,15 +17,15 @@ namespace cln {
 //              or immediate data.
 
 // It is possible to distinguish these because pointers are aligned.
-// cl_uint_alignment is the guaranteed alignment of a `void*' or `long'
+// cl_word_alignment is the guaranteed alignment of a `void*' or `long'
 // in memory. Must be > 1.
 #if defined(__m68k__)
   #define cl_word_alignment  2
 #endif
-#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || defined(__sparc__) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || defined(__s390__)
+#if defined(__i386__) || (defined(__mips__) && !defined(__LP64__)) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__))
   #define cl_word_alignment  4
 #endif
-#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__)
   #define cl_word_alignment  8
 #endif
 #if !defined(cl_word_alignment)
@@ -71,13 +71,13 @@ typedef uintP  cl_uint;  // This ought to be called `cl_word'.
 #endif
 
 // Distinguish immediate data from pointers.
-inline cl_boolean cl_pointer_p (cl_uint word)
+inline bool cl_pointer_p (cl_uint word)
 {
-       return (cl_boolean)((word & (cl_word_alignment-1)) == 0);
+       return (word & (cl_word_alignment-1)) == 0;
 }
-inline cl_boolean cl_immediate_p (cl_uint word)
+inline bool cl_immediate_p (cl_uint word)
 {
-       return (cl_boolean)((word & (cl_word_alignment-1)) != 0);
+       return (word & (cl_word_alignment-1)) != 0;
 }
 
 // Immediate data: Fixnum, Short Float, maybe Single Float.
@@ -310,7 +310,7 @@ public:
 // Assignment operator.
        cl_gcobject& operator= (const cl_gcobject&);
 // Distinguish immediate data from pointer.
-       cl_boolean pointer_p() const
+       bool pointer_p() const
                { return cl_pointer_p(word); }
 // Reference counting.
        void inc_pointer_refcount () const
@@ -327,11 +327,7 @@ public:
        cl_private_thing _as_cl_private_thing () const;
 // Private constructor.
        cl_gcobject (cl_private_thing p)
-               #if !(defined(__alpha__) && !defined(__GNUC__))
                : pointer (p) {}
-               #else
-               { pointer = p; }
-               #endif
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
@@ -360,8 +356,8 @@ public:
 // Assignment operator.
        cl_gcpointer& operator= (const cl_gcpointer&);
 // Distinguish immediate data from pointer.
-       cl_boolean pointer_p() const
-               { return cl_true; }
+       bool pointer_p() const
+               { return true; }
 // Reference counting.
        void inc_pointer_refcount () const
                { cl_inc_pointer_refcount(heappointer); }
@@ -377,11 +373,7 @@ public:
        cl_private_thing _as_cl_private_thing () const;
 // Private constructor.
        cl_gcpointer (cl_private_thing p)
-               #if !(defined(__alpha__) && !defined(__GNUC__))
                : pointer (p) {}
-               #else
-               { pointer = p; }
-               #endif
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
@@ -410,7 +402,7 @@ public:
 // Assignment operator.
        cl_rcobject& operator= (const cl_rcobject&);
 // Distinguish immediate data from pointer.
-       cl_boolean pointer_p() const
+       bool pointer_p() const
                { return cl_pointer_p(word); }
 // Reference counting.
        void inc_pointer_refcount () const
@@ -427,11 +419,7 @@ public:
        cl_private_thing _as_cl_private_thing () const;
 // Private constructor.
        cl_rcobject (cl_private_thing p)
-               #if !(defined(__alpha__) && !defined(__GNUC__))
                : pointer (p) {}
-               #else
-               { pointer = p; }
-               #endif
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
@@ -460,8 +448,8 @@ public:
 // Assignment operator.
        cl_rcpointer& operator= (const cl_rcpointer&);
 // Distinguish immediate data from pointer.
-       cl_boolean pointer_p() const
-               { return cl_true; }
+       bool pointer_p() const
+               { return true; }
 // Reference counting.
        void inc_pointer_refcount () const
                { cl_inc_pointer_refcount(heappointer); }
@@ -477,11 +465,7 @@ public:
        cl_private_thing _as_cl_private_thing () const;
 // Private constructor.
        cl_rcpointer (cl_private_thing p)
-               #if !(defined(__alpha__) && !defined(__GNUC__))
                : pointer (p) {}
-               #else
-               { pointer = p; }
-               #endif
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
@@ -554,7 +538,7 @@ inline cl_private_thing as_cl_private_thing (const cl_rcpointer& x)
   #define CL_DEFINE_CONVERTER(target_class)  \
     operator const target_class & () const                             \
     {                                                                  \
-      if (sizeof(*this) != sizeof(target_class)) cl_abort();           \
+      typedef int assert1 [2*(sizeof(target_class)==sizeof(*this))-1]; \
       return * (const target_class *) (void*) this;                    \
     }