From ca028fbe875d9481d22c43eb9972fd854859a227 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 Sep 2019 04:45:18 +0100
Subject: [PATCH] @@@ 64-bit kludging

---
 fake-mLib-bits.h | 38 +++++++++++++++++++++++++++++++++++++-
 u64.h            | 17 +++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/fake-mLib-bits.h b/fake-mLib-bits.h
index b316f22..e2e83ca 100644
--- a/fake-mLib-bits.h
+++ b/fake-mLib-bits.h
@@ -30,6 +30,7 @@
  */
 
 #include <stdint.h>
+#include "u64.h"
 #include "unaligned.h"
 
 typedef uint8_t octet;
@@ -40,8 +41,43 @@ 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)
+
+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 */
diff --git a/u64.h b/u64.h
index 0d35c55..25f4d0a 100644
--- a/u64.h
+++ b/u64.h
@@ -31,10 +31,13 @@ typedef uint64_t u64;
 # define u64hilo(hi, lo) ((u64) (((u64) (hi) << 32) + (lo)))
 # define u64init(hi, lo) u64hilo (hi, lo)
 # define u64lo(x) ((u64) (x))
+# define u64getlo(x) ((x)&0xffffffffu)
+# define u64gethi(x) (((u64) (x) >> 32) & 0xffffffffu)
 # define u64lt(x, y) ((x) < (y))
 # define u64and(x, y) ((x) & (y))
 # define u64or(x, y) ((x) | (y))
 # define u64xor(x, y) ((x) ^ (y))
+# define u64not(x) (~(x))
 # define u64plus(x, y) ((x) + (y))
 # define u64shl(x, n) ((x) << (n))
 # define u64shr(x, n) ((x) >> (n))
@@ -73,6 +76,10 @@ u64lo (uint32_t lo)
   return r;
 }
 
+/* Return the high and low halves of X. */
+# define u64getlo(x) ((x).lo)
+# define u64gethi(x) ((x).hi)
+
 /* Return X < Y.  */
 static inline int
 u64lt (u64 x, u64 y)
@@ -110,6 +117,16 @@ u64xor (u64 x, u64 y)
   return r;
 }
 
+/* Return ~X.  */
+static inline u64
+u64not (u64 x)
+{
+  u64 r;
+  r.hi = ~x.hi;
+  r.lo = ~x.lo;
+  return r;
+}
+
 /* Return X + Y.  */
 static inline u64
 u64plus (u64 x, u64 y)
-- 
2.11.0