diff options
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/src/lisp.h b/src/lisp.h index 0370c52fad6..1c98925fa8d 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -397,8 +397,16 @@ typedef EMACS_INT Lisp_Word; (eassert (CONSP (a)), XUNTAG (a, Lisp_Cons, struct Lisp_Cons)) #define lisp_h_XHASH(a) XUFIXNUM_RAW (a) #if USE_LSB_TAG -# define lisp_h_make_fixnum(n) \ +# define lisp_h_make_fixnum_wrap(n) \ XIL ((EMACS_INT) (((EMACS_UINT) (n) << INTTYPEBITS) + Lisp_Int0)) +# if defined HAVE_STATEMENT_EXPRESSIONS && defined HAVE_TYPEOF +# define lisp_h_make_fixnum(n) \ + ({ typeof (n) lisp_h_make_fixnum_n = n; \ + eassert (!FIXNUM_OVERFLOW_P (lisp_h_make_fixnum_n)); \ + lisp_h_make_fixnum_wrap (lisp_h_make_fixnum_n); }) +# else +# define lisp_h_make_fixnum(n) lisp_h_make_fixnum_wrap (n) +# endif # define lisp_h_XFIXNUM_RAW(a) (XLI (a) >> INTTYPEBITS) # define lisp_h_XTYPE(a) ((enum Lisp_Type) (XLI (a) & ~VALMASK)) #endif @@ -1125,12 +1133,18 @@ enum More_Lisp_Bits #define MOST_POSITIVE_FIXNUM (EMACS_INT_MAX >> INTTYPEBITS) #define MOST_NEGATIVE_FIXNUM (-1 - MOST_POSITIVE_FIXNUM) +/* True if the possibly-unsigned integer I doesn't fit in a fixnum. */ + +#define FIXNUM_OVERFLOW_P(i) \ + (! ((0 <= (i) || MOST_NEGATIVE_FIXNUM <= (i)) && (i) <= MOST_POSITIVE_FIXNUM)) + #if USE_LSB_TAG INLINE Lisp_Object (make_fixnum) (EMACS_INT n) { - return lisp_h_make_fixnum (n); + eassert (!FIXNUM_OVERFLOW_P (n)); + return lisp_h_make_fixnum_wrap (n); } INLINE EMACS_INT @@ -1139,6 +1153,13 @@ INLINE EMACS_INT return lisp_h_XFIXNUM_RAW (a); } +INLINE Lisp_Object +make_ufixnum (EMACS_INT n) +{ + eassert (0 <= n && n <= INTMASK); + return lisp_h_make_fixnum_wrap (n); +} + #else /* ! USE_LSB_TAG */ /* Although compiled only if ! USE_LSB_TAG, the following functions @@ -1149,6 +1170,7 @@ INLINE EMACS_INT INLINE Lisp_Object make_fixnum (EMACS_INT n) { + eassert (! FIXNUM_OVERFLOW_P (n)); EMACS_INT int0 = Lisp_Int0; if (USE_LSB_TAG) { @@ -1179,6 +1201,22 @@ XFIXNUM_RAW (Lisp_Object a) return i >> INTTYPEBITS; } +INLINE Lisp_Object +make_ufixnum (EMACS_INT n) +{ + eassert (0 <= n && n <= INTMASK); + EMACS_INT int0 = Lisp_Int0; + if (USE_LSB_TAG) + { + EMACS_UINT u = n; + n = u << INTTYPEBITS; + n += int0; + } + else + n += int0 << VALBITS; + return XIL (n); +} + #endif /* ! USE_LSB_TAG */ INLINE bool @@ -1232,11 +1270,6 @@ INLINE bool return lisp_h_EQ (x, y); } -/* True if the possibly-unsigned integer I doesn't fit in a fixnum. */ - -#define FIXNUM_OVERFLOW_P(i) \ - (! ((0 <= (i) || MOST_NEGATIVE_FIXNUM <= (i)) && (i) <= MOST_POSITIVE_FIXNUM)) - INLINE intmax_t clip_to_bounds (intmax_t lower, intmax_t num, intmax_t upper) { |