X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/8656dc507aee9c5dcb3a6ad876565f5fcac425ae..9dc511e46d5acad665175981f824288062e27671:/bits.h?ds=sidebyside

diff --git a/bits.h b/bits.h
index 175e927..0f7ba0b 100644
--- a/bits.h
+++ b/bits.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bits.h,v 1.10 2004/04/08 01:36:11 mdw Exp $
+ * $Id$
  *
  * Portable bit-level manipulation macros
  *
@@ -112,7 +112,7 @@
  */
 
 typedef unsigned short uint16;
-typedef unsigned char octet;
+typedef unsigned char octet, uint8;
 
 /* --- WARNING! --- *
  *
@@ -126,11 +126,76 @@ typedef unsigned char octet;
 
 #define MASK8 0xffu
 #define MASK16 0xffffu
+#define MASK16_L MASK16
+#define MASK16_B MASK16
 #define MASK24 0xffffffu
+#define MASK24_L MASK24
+#define MASK24_B MASK24
 #define MASK32 0xffffffffu
+#define MASK32_L MASK32
+#define MASK32_B MASK32
 
 #ifdef HAVE_UINT64
 #  define MASK64 MLIB_BITS_EXTENSION 0xffffffffffffffffu
+#  define MASK64_L MASK64
+#  define MASK64_B MASK64
+#endif
+
+/* --- Sizes --- */
+
+#define SZ_8 1
+#define SZ_16 2
+#define SZ_16_L 2
+#define SZ_16_B 2
+#define SZ_24 3
+#define SZ_24_L 3
+#define SZ_24_B 3
+#define SZ_32 4
+#define SZ_32_L 4
+#define SZ_32_B 4
+
+#ifdef HAVE_UINT64
+#  define SZ_64 8
+#  define SZ_64_L 8
+#  define SZ_64_B 8
+#endif
+
+/* --- Type aliases --- */
+
+#define TY_U8 octet
+#define TY_U16 uint16
+#define TY_U16_L uint16
+#define TY_U16_B uint16
+#define TY_U24 uint24
+#define TY_U24_L uint24
+#define TY_U24_B uint24
+#define TY_U32 uint32
+#define TY_U32_L uint32
+#define TY_U32_B uint32
+
+#ifdef HAVE_UINT64
+#  define TY_U64 uint64
+#  define TY_U64_L uint64
+#  define TY_U64_B uint64
+#endif
+
+/* --- List macros --- */
+
+#ifdef HAVE_UINT64
+#  define  DOUINTCONV(_)						\
+     _(8, 8, 8)								\
+     _(16, 16, 16) _(16, 16_L, 16l) _(16, 16_B, 16b)			\
+     _(24, 24, 24) _(24, 24_L, 24l) _(24, 24_B, 24b)			\
+     _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)			\
+     _(64, 64, 64) _(64, 64_L, 64l) _(64, 64_B, 64b)
+#  define DOUINTSZ(_) _(8) _(16) _(24) _(32) _(64)
+#else
+#  define  DOUINTCONV(_)						\
+     _(8, 8, 8)								\
+     _(16, 16, 16) _(16, 16_L, 16l) _(16, 16_B, 16b)			\
+     _(24, 24, 24) _(24, 24_L, 24l) _(24, 24_B, 24b)			\
+     _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)
+#  define DOUINTSZ(_) _(8) _(16) _(24) _(32)
 #endif
 
 /* --- Type coercions --- */
@@ -217,12 +282,15 @@ typedef unsigned char octet;
      unsigned _s = (s) & 63u;						\
      uint32 _l = (v).lo, _h = (v).hi;					\
      kludge64 *_d = &(d);						\
-     if (_s >= 32) {							\
+     if (_s > 32) {							\
        _d->hi = LSL32(_l, _s - 32u) | LSR32(_h, 64u - _s);		\
        _d->lo = LSL32(_h, _s - 32u) | LSR32(_l, 64u - _s);		\
      } else if (!_s) {							\
        _d->lo = _l;							\
        _d->hi = _h;							\
+     } else if (_s == 32) {						\
+       _d->lo = _h;							\
+       _d->hi = _l;							\
      } else {								\
        _d->hi = LSL32(_h, _s) | LSR32(_l, 32u - _s);			\
        _d->lo = LSL32(_l, _s) | LSR32(_h, 32u - _s);			\
@@ -232,12 +300,15 @@ typedef unsigned char octet;
      unsigned _s = (s) & 63u;						\
      uint32 _l = (v).lo, _h = (v).hi;					\
      kludge64 *_d = &(d);						\
-     if (_s >= 32) {							\
+     if (_s > 32) {							\
        _d->hi = LSR32(_l, _s - 32u) | LSL32(_h, 64u - _s);		\
        _d->lo = LSR32(_h, _s - 32u) | LSL32(_l, 64u - _s);		\
      } else if (!_s) {							\
        _d->lo = _l;							\
        _d->hi = _h;							\
+     } else if (_s == 32) {						\
+       _d->lo = _h;							\
+       _d->hi = _l;							\
      } else {								\
        _d->hi = LSR32(_h, _s) | LSL32(_l, 32u - _s);			\
        _d->lo = LSR32(_l, _s) | LSL32(_h, 32u - _s);			\