Re-run the exclude test using lsh.sh pull.

[rsync.git] / byteorder.h

diff --git a/byteorder.h b/byteorder.h
index 579145d13aaea8d00bdb898e65be6dd8e1a1748a..059cc70864953b564f24b7332343ab230fc28bcb 100644 (file)
--- a/byteorder.h
+++ b/byteorder.h
@@ -2,7 +2,7 @@
  * Simple byteorder handling.
  *
  * Copyright (C) 1992-1995 Andrew Tridgell
- * Copyright (C) 2007-2013 Wayne Davison
+ * Copyright (C) 2007-2022 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,11 +19,10 @@
  */
 
 #undef CAREFUL_ALIGNMENT
-#undef AVOID_BYTEORDER_INLINE
 
 /* We know that the x86 can handle misalignment and has the same
  * byte order (LSB-first) as the 32-bit numbers we transmit. */
-#ifdef __i386__
+#if defined __i386__ || defined __i486__ || defined __i586__ || defined __i686__ || __amd64
 #define CAREFUL_ALIGNMENT 0
 #endif
 
@@ -36,14 +35,36 @@
 
 #if CAREFUL_ALIGNMENT
 
-#define PVAL(buf,pos) (UVAL(buf,pos)|UVAL(buf,(pos)+1)<<8)
-#define IVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+2)<<16)
-#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)
-#define SIVALX(buf,pos,val) (SSVALX(buf,pos,val&0xFFFF),SSVALX(buf,pos+2,val>>16))
-#define SIVAL(buf,pos,val) SIVALX((buf),(pos),((uint32)(val)))
+static inline uint32
+IVALu(const uchar *buf, int pos)
+{
+       return UVAL(buf, pos)
+            | UVAL(buf, pos + 1) << 8
+            | UVAL(buf, pos + 2) << 16
+            | UVAL(buf, pos + 3) << 24;
+}
+
+static inline void
+SIVALu(uchar *buf, int pos, uint32 val)
+{
+       CVAL(buf, pos)     = val;
+       CVAL(buf, pos + 1) = val >> 8;
+       CVAL(buf, pos + 2) = val >> 16;
+       CVAL(buf, pos + 3) = val >> 24;
+}
+
+static inline int64
+IVAL64(const char *buf, int pos)
+{
+       return IVALu((uchar*)buf, pos) | (int64)IVALu((uchar*)buf, pos + 4) << 32;
+}
 
-#define IVALu(buf,pos) IVAL(buf,pos)
-#define SIVALu(buf,pos,val) SIVAL(buf,pos,val)
+static inline void
+SIVAL64(char *buf, int pos, int64 val)
+{
+       SIVALu((uchar*)buf, pos, val);
+       SIVALu((uchar*)buf, pos + 4, val >> 32);
+}
 
 #else /* !CAREFUL_ALIGNMENT */
 
@@ -51,16 +72,6 @@
  * WARNING: This section is dependent on the length of an int32 (and thus a uint32)
  * being correct (4 bytes)!  Set CAREFUL_ALIGNMENT if it is not. */
 
-# ifdef AVOID_BYTEORDER_INLINE
-
-#define IVAL(buf,pos) (*(uint32 *)((char *)(buf) + (pos)))
-#define SIVAL(buf,pos,val) IVAL(buf,pos)=((uint32)(val))
-
-#define IVALu(buf,pos) IVAL(buf,pos)
-#define SIVALu(buf,pos,val) SIVAL(buf,pos,val)
-
-# else /* !AVOID_BYTEORDER_INLINE */
-
 static inline uint32
 IVALu(const uchar *buf, int pos)
 {
@@ -83,6 +94,30 @@ SIVALu(uchar *buf, int pos, uint32 val)
        *u.num = val;
 }
 
+static inline int64
+IVAL64(const char *buf, int pos)
+{
+       union {
+               const char *b;
+               const int64 *num;
+       } u;
+       u.b = buf + pos;
+       return *u.num;
+}
+
+static inline void
+SIVAL64(char *buf, int pos, int64 val)
+{
+       union {
+               char *b;
+               int64 *num;
+       } u;
+       u.b = buf + pos;
+       *u.num = val;
+}
+
+#endif /* !CAREFUL_ALIGNMENT */
+
 static inline uint32
 IVAL(const char *buf, int pos)
 {
@@ -94,7 +129,3 @@ SIVAL(char *buf, int pos, uint32 val)
 {
        SIVALu((uchar*)buf, pos, val);
 }
-
-# endif /* !AVOID_BYTEORDER_INLINE */
-
-#endif /* !CAREFUL_ALIGNMENT */