X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/6b033bc41952dc323b57aa6a5b66069f8bc37d02..aab9ab9fdd05119855383b33b67b27dcec5f3902:/bits.h

diff --git a/bits.h b/bits.h
index 9d7c6d0..cc4d516 100644
--- a/bits.h
+++ b/bits.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bits.h,v 1.1 1999/06/01 09:46:19 mdw Exp $
+ * $Id: bits.h,v 1.3 1999/06/20 23:31:52 mdw Exp $
  *
  * Portable bit-level manipulation macros
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bits.h,v $
+ * 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.
  *
@@ -93,21 +99,21 @@ typedef unsigned char octet;
 
 /* --- 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 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 ROL32(v, s) (LSL32((v), (s)) | (LSR32((v), 32u - (s))))
+#define ROR32(v, s) (LSR32((v), (s)) | (LSL32((v), 32u - (s))))
 
 /* --- Storage and retrieval --- */
 
@@ -117,28 +123,44 @@ typedef unsigned char octet;
 #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 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 -------------------------------------------------*/