/* -*-c-*-
*
- * $Id: bits.h,v 1.1 1999/06/01 09:46:19 mdw Exp $
+ * $Id: bits.h,v 1.5 2000/06/17 10:36:06 mdw Exp $
*
* Portable bit-level manipulation macros
*
/*----- Revision history --------------------------------------------------*
*
* $Log: bits.h,v $
+ * Revision 1.5 2000/06/17 10:36:06 mdw
+ * Support for 24-bit types.
+ *
+ * Revision 1.4 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
+ * Revision 1.3 1999/06/20 23:31:52 mdw
+ * More portability enhancements.
+ *
+ * Revision 1.2 1999/06/17 00:12:46 mdw
+ * Improve portability for shift and rotate macros.
+ *
* Revision 1.1 1999/06/01 09:46:19 mdw
* New addition: bit manipulation macros.
*
*/
-#ifndef BITS_H
-#define BITS_H
+#ifndef MLIB_BITS_H
+#define MLIB_BITS_H
#ifdef __cplusplus
extern "C" {
typedef unsigned long uint32;
#endif
+/* --- Decide on a 24-bit type --- */
+
+#if UINT_MAX >= 0x00ffffffu
+ typedef unsigned int uint24;
+#else
+ typedef unsigned long uint24;
+#endif
+
/* --- Decide on 16-bit and 8-bit types --- *
*
* This is more for brevity than anything else.
#define MASK8 0xffu
#define MASK16 0xffffu
+#define MASK24 0xffffffu
#define MASK32 0xffffffffu
/* --- Type coercions --- */
#define U8(x) ((octet)((x) & MASK8))
#define U16(x) ((uint16)((x) & MASK16))
+#define U24(x) ((uint24)((x) & MASK24))
#define U32(x) ((uint32)((x) & MASK32))
/* --- Safe shifting macros --- */
-#define LSL8(v, s) (U8(v) << ((s) & 7u))
-#define LSR8(v, s) (U8(v) >> ((s) & 7u))
-#define LSL16(v, s) (U16(v) << ((s) & 15u))
-#define LSR16(v, s) (U16(v) >> ((s) & 15u))
-#define LSL32(v, s) (U32(v) << ((s) & 31u))
-#define LSR32(v, s) (U32(v) >> ((s) & 31u))
+#define LSL8(v, s) U8(U8(v) << ((s) & 7u))
+#define LSR8(v, s) U8(U8(v) >> ((s) & 7u))
+#define LSL16(v, s) U16(U16(v) << ((s) & 15u))
+#define LSR16(v, s) U16(U16(v) >> ((s) & 15u))
+#define LSL24(v, s) U24(U24(v) << ((s) % 24u))
+#define LSR24(v, s) U24(U24(v) >> ((s) % 24u))
+#define LSL32(v, s) U32(U32(v) << ((s) & 31u))
+#define LSR32(v, s) U32(U32(v) >> ((s) & 31u))
/* --- Rotation macros --- */
-#define ROL8(v, s) (LSL8((v), (s)) | (LSR8((v), 8 - (s))))
-#define ROR8(v, s) (LSR8((v), (s)) | (LSL8((v), 8 - (s))))
-#define ROL16(v, s) (LSL16((v), (s)) | (LSR16((v), 16 - (s))))
-#define ROR16(v, s) (LSR16((v), (s)) | (LSL16((v), 16 - (s))))
-#define ROL32(v, s) (LSL32((v), (s)) | (LSR32((v), 32 - (s))))
-#define ROR32(v, s) (LSR32((v), (s)) | (LSL32((v), 32 - (s))))
+#define ROL8(v, s) (LSL8((v), (s)) | (LSR8((v), 8u - (s))))
+#define ROR8(v, s) (LSR8((v), (s)) | (LSL8((v), 8u - (s))))
+#define ROL16(v, s) (LSL16((v), (s)) | (LSR16((v), 16u - (s))))
+#define ROR16(v, s) (LSR16((v), (s)) | (LSL16((v), 16u - (s))))
+#define ROL24(v, s) (LSL24((v), (s)) | (LSR24((v), 24u - (s))))
+#define ROR24(v, s) (LSR24((v), (s)) | (LSL24((v), 24u - (s))))
+#define ROL32(v, s) (LSL32((v), (s)) | (LSR32((v), 32u - (s))))
+#define ROR32(v, s) (LSR32((v), (s)) | (LSL32((v), 32u - (s))))
/* --- Storage and retrieval --- */
#define LOAD8(p) (GETBYTE((p), 0))
#define STORE8(p, v) (PUTBYTE((p), 0, (v)))
-#define LOAD16_B(p) ((GETBYTE((p), 0) << 8) | GETBYTE((p), 1))
-#define LOAD16_L(p) (GETBYTE((p), 0) | (GETBYTE((p), 1) << 8))
+#define LOAD16_B(p) \
+ (((uint16)GETBYTE((p), 0) << 8) | \
+ ((uint16)GETBYTE((p), 1) << 0))
+#define LOAD16_L(p) \
+ (((uint16)GETBYTE((p), 0) << 0) | \
+ ((uint16)GETBYTE((p), 1) << 8))
#define LOAD16(p) LOAD16_B((p))
-#define STORE16_B(p, v) (PUTBYTE((p), 0, (v) >> 8), PUTBYTE((p), 1, (v)))
-#define STORE16_L(p, v) (PUTBYTE((p), 0, (v)), PUTBYTE((p), 1, (v) >> 8))
+#define STORE16_B(p, v) \
+ (PUTBYTE((p), 0, (uint16)(v) >> 8), \
+ PUTBYTE((p), 1, (uint16)(v) >> 0))
+#define STORE16_L(p, v) \
+ (PUTBYTE((p), 0, (uint16)(v) >> 0), \
+ PUTBYTE((p), 1, (uint16)(v) >> 8))
#define STORE16(p, v) STORE16_B((p), (v))
+#define LOAD24_B(p) \
+ (((uint24)GETBYTE((p), 0) << 16) | \
+ ((uint24)GETBYTE((p), 1) << 8) | \
+ ((uint24)GETBYTE((p), 2) << 0))
+#define LOAD24_L(p) \
+ (((uint24)GETBYTE((p), 0) << 0) | \
+ ((uint24)GETBYTE((p), 1) << 8) | \
+ ((uint24)GETBYTE((p), 2) << 16))
+#define LOAD24(p) LOAD24_B((p))
+
+#define STORE24_B(p, v) \
+ (PUTBYTE((p), 0, (uint24)(v) >> 16), \
+ PUTBYTE((p), 1, (uint24)(v) >> 8), \
+ PUTBYTE((p), 2, (uint24)(v) >> 0))
+#define STORE24_L(p, v) \
+ (PUTBYTE((p), 0, (uint24)(v) >> 0), \
+ PUTBYTE((p), 1, (uint24)(v) >> 8), \
+ PUTBYTE((p), 2, (uint24)(v) >> 16))
+#define STORE24(p, v) STORE24_B((p), (v))
+
#define LOAD32_B(p) \
- ((GETBYTE((p), 0) << 24) | (GETBYTE((p), 1) << 16) | \
- (GETBYTE((p), 2) << 8) | (GETBYTE((p), 3) << 0))
+ (((uint32)GETBYTE((p), 0) << 24) | \
+ ((uint32)GETBYTE((p), 1) << 16) | \
+ ((uint32)GETBYTE((p), 2) << 8) | \
+ ((uint32)GETBYTE((p), 3) << 0))
#define LOAD32_L(p) \
- ((GETBYTE((p), 0) << 0) | (GETBYTE((p), 1) << 8) | \
- (GETBYTE((p), 2) << 16) | (GETBYTE((p), 3) << 24))
+ (((uint32)GETBYTE((p), 0) << 0) | \
+ ((uint32)GETBYTE((p), 1) << 8) | \
+ ((uint32)GETBYTE((p), 2) << 16) | \
+ ((uint32)GETBYTE((p), 3) << 24))
#define LOAD32(p) LOAD32_B((p))
#define STORE32_B(p, v) \
- (PUTBYTE((p), 0, (v) >> 24), PUTBYTE((p), 1, (v) >> 16), \
- PUTBYTE((p), 2, (v) >> 8), PUTBYTE((p), 3, (v) >> 0))
+ (PUTBYTE((p), 0, (uint32)(v) >> 24), \
+ PUTBYTE((p), 1, (uint32)(v) >> 16), \
+ PUTBYTE((p), 2, (uint32)(v) >> 8), \
+ PUTBYTE((p), 3, (uint32)(v) >> 0))
#define STORE32_L(p, v) \
- (PUTBYTE((p), 0, (v) >> 0), PUTBYTE((p), 1, (v) >> 8), \
- PUTBYTE((p), 2, (v) >> 16), PUTBYTE((p), 3, (v) >> 24))
+ (PUTBYTE((p), 0, (uint32)(v) >> 0), \
+ PUTBYTE((p), 1, (uint32)(v) >> 8), \
+ PUTBYTE((p), 2, (uint32)(v) >> 16), \
+ PUTBYTE((p), 3, (uint32)(v) >> 24))
#define STORE32(p, v) STORE32_B((p), (v))
/*----- That's all, folks -------------------------------------------------*/
~mdw / mLib / blobdiff