X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbyte-order.h;h=544f46fbcb68bc4ff9e9ec868d3fdac3d7c4eb50;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=e05a71fb1806c6748e46710117c6868e1bc38f4c;hpb=10a24935c9d382e4d85b05d9616843f3d3bb4983;p=sliver-openvswitch.git

diff --git a/lib/byte-order.h b/lib/byte-order.h
index e05a71fb1..544f46fbc 100644
--- a/lib/byte-order.h
+++ b/lib/byte-order.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2010, 2011, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,44 +19,75 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <inttypes.h>
+#include "openvswitch/types.h"
 
-static inline uint64_t
+#ifndef __CHECKER__
+#ifndef _WIN32
+static inline ovs_be64
 htonll(uint64_t n)
 {
     return htonl(1) == 1 ? n : ((uint64_t) htonl(n) << 32) | htonl(n >> 32);
 }
 
 static inline uint64_t
-ntohll(uint64_t n)
+ntohll(ovs_be64 n)
 {
     return htonl(1) == 1 ? n : ((uint64_t) ntohl(n) << 32) | ntohl(n >> 32);
 }
+#endif /* _WIN32 */
+#else
+/* Making sparse happy with these functions also makes them unreadable, so
+ * don't bother to show it their implementations. */
+ovs_be64 htonll(uint64_t);
+uint64_t ntohll(ovs_be64);
+#endif
+
+static inline uint32_t
+uint32_byteswap(uint32_t crc) {
+    return (((crc & 0x000000ff) << 24) |
+            ((crc & 0x0000ff00) <<  8) |
+            ((crc & 0x00ff0000) >>  8) |
+            ((crc & 0xff000000) >> 24));
+}
 
 /* These macros may substitute for htons(), htonl(), and htonll() in contexts
  * where function calls are not allowed, such as case labels.  They should not
  * be used elsewhere because all of them evaluate their argument many times. */
-#ifdef WORDS_BIGENDIAN
-#define CONSTANT_HTONS(VALUE) ((uint16_t) (VALUE))
-#define CONSTANT_HTONL(VALUE) ((uint32_t) (VALUE))
-#define CONSTANT_HTONLL(VALUE) ((uint64_t) (VALUE))
+#if defined(WORDS_BIGENDIAN) || __CHECKER__
+#define CONSTANT_HTONS(VALUE) ((OVS_FORCE ovs_be16) ((VALUE) & 0xffff))
+#define CONSTANT_HTONL(VALUE) ((OVS_FORCE ovs_be32) ((VALUE) & 0xffffffff))
+#define CONSTANT_HTONLL(VALUE) \
+        ((OVS_FORCE ovs_be64) ((VALUE) & UINT64_C(0xffffffffffffffff)))
 #else
 #define CONSTANT_HTONS(VALUE)                       \
-        (((((uint16_t) (VALUE)) & 0xff00) >> 8) |   \
-         ((((uint16_t) (VALUE)) & 0x00ff) << 8))
+        (((((ovs_be16) (VALUE)) & 0xff00) >> 8) |   \
+         ((((ovs_be16) (VALUE)) & 0x00ff) << 8))
 #define CONSTANT_HTONL(VALUE)                           \
-        (((((uint32_t) (VALUE)) & 0x000000ff) << 24) |  \
-         ((((uint32_t) (VALUE)) & 0x0000ff00) <<  8) |  \
-         ((((uint32_t) (VALUE)) & 0x00ff0000) >>  8) |  \
-         ((((uint32_t) (VALUE)) & 0xff000000) >> 24))
+        (((((ovs_be32) (VALUE)) & 0x000000ff) << 24) |  \
+         ((((ovs_be32) (VALUE)) & 0x0000ff00) <<  8) |  \
+         ((((ovs_be32) (VALUE)) & 0x00ff0000) >>  8) |  \
+         ((((ovs_be32) (VALUE)) & 0xff000000) >> 24))
 #define CONSTANT_HTONLL(VALUE)                                           \
-        (((((uint64_t) (VALUE)) & UINT64_C(0x00000000000000ff)) << 56) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0x000000000000ff00)) << 40) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0x0000000000ff0000)) << 24) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0x00000000ff000000)) <<  8) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0x000000ff00000000)) >>  8) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0x0000ff0000000000)) >> 24) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0x00ff000000000000)) >> 40) | \
-         ((((uint64_t) (VALUE)) & UINT64_C(0xff00000000000000)) >> 56))
+        (((((ovs_be64) (VALUE)) & UINT64_C(0x00000000000000ff)) << 56) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0x000000000000ff00)) << 40) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0x0000000000ff0000)) << 24) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0x00000000ff000000)) <<  8) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0x000000ff00000000)) >>  8) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0x0000ff0000000000)) >> 24) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0x00ff000000000000)) >> 40) | \
+         ((((ovs_be64) (VALUE)) & UINT64_C(0xff00000000000000)) >> 56))
+#endif
+
+#if WORDS_BIGENDIAN
+#define BYTES_TO_BE32(B1, B2, B3, B4) \
+    (OVS_FORCE ovs_be32)((uint32_t)(B1) << 24 | (B2) << 16 | (B3) << 8 | (B4))
+#define BE16S_TO_BE32(B1, B2) \
+    (OVS_FORCE ovs_be32)((uint32_t)(B1) << 16 | (B2))
+#else
+#define BYTES_TO_BE32(B1, B2, B3, B4) \
+    (OVS_FORCE ovs_be32)((uint32_t)(B1) | (B2) << 8 | (B3) << 16 | (B4) << 24)
+#define BE16S_TO_BE32(B1, B2) \
+    (OVS_FORCE ovs_be32)((uint32_t)(B1) | (B2) << 16)
 #endif
 
 #endif /* byte-order.h */