X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/0bcb8184cfce875a4dde57621139dd44c433f3a5..refs/heads/mdw/xdh:/fake-mLib-bits.h

diff --git a/fake-mLib-bits.h b/fake-mLib-bits.h
index 3fa7ecb..e2e83ca 100644
--- a/fake-mLib-bits.h
+++ b/fake-mLib-bits.h
@@ -30,18 +30,54 @@
  */
 
 #include <stdint.h>
+#include "u64.h"
 #include "unaligned.h"
 
 typedef uint8_t octet;
-typedef uint_fast32_t uint32;
-typedef uint_fast64_t uint64;
-#define HAVE_UINT64 1
+typedef uint32_t uint32;
+typedef uint64_t uint64;
+
+typedef int32_t int32;
+typedef int64_t int64;
 
 #define LOAD32_L(p) (get_uint32_le(p))
+#define LOAD32_B(p) (get_uint32(p))
 #define STORE32_L(p, x) put_uint32_le((p), (x))
+#define STORE32_B(p, x) put_uint32((p), (x))
+#define ROL32(x, n) ((n) ? ((x) << (n) | (x) >> (32 - (n))) : (x))
 
-#define U32(x) ((uint32)(x) & 0xffffffffu)
+#define MASK32 0xffffffffu
+#define U32(x) ((uint32)(x) & MASK32)
 
-#define NEG_TWOC 1			/* assume two's complement */
+typedef u64 kludge64;
+#define X64(hi, lo) u64init(0x##hi, 0x##lo)
+#define HI64(x) u64gethi(x)
+#define LO64(x) u64getlo(x)
+#define LOAD64_L_(x, p) do {						\
+    const uint8_t *p_ = (const uint8_t *)(p);				\
+    uint32_t lo_ = LOAD32_L(p_ + 0), hi_ = LOAD32_L(p_ + 4);		\
+    (x) = u64hilo(hi_, lo_);						\
+} while (0)
+#define LOAD64_B_(x, p) do {						\
+    const uint8_t *p_ = (const uint8_t *)(p);				\
+    uint32_t hi_ = LOAD32_B(p_ + 0), lo_ = LOAD32_B(p_ + 4);		\
+    (x) = u64hilo(hi_, lo_);						\
+} while (0)
+#define STORE64_L_(p, x) do {						\
+    uint8_t *p_ = (uint8_t *)(p);					\
+    uint32_t lo_ = LO64(x), hi_ = HI64(x);				\
+    STORE32_L(p_ + 0, lo_); STORE32_L(p_ + 4, hi_);			\
+} while (0)
+#define STORE64_B_(p, x) do {						\
+    uint8_t *p_ = (uint8_t *)(p);					\
+    uint32_t lo_ = LO64(x), hi_ = HI64(x);				\
+    STORE32_B(p_ + 0, hi_); STORE32_B(p_ + 4, lo_);			\
+} while (0)
+#define SET64(z, hi, lo) ((z) = u64hilo((hi), (lo)))
+#define AND64(z, x, y) ((z) = u64and((x), (y)))
+#define OR64(z, x, y) ((z) = u64or((x), (y)))
+#define XOR64(z, x, y) ((z) = u64xor((x), (y)))
+#define CPL64(z, x) ((z) = u64not((x)))
+#define ROL64_(z, x, n) ((n) ? (z) = u64rol((x), (n)) : (x))
 
 #endif /* fake_mLib_bits_h */