aboutsummaryrefslogtreecommitdiff
path: root/ccan/endian
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2014-08-14 18:24:44 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-15 13:03:08 +1000
commit9f64cb2028f8612daa8556cc4831b9b7ce91b171 (patch)
tree676a4710930fa6766c96107027f6a2380283d99f /ccan/endian
parentbf3d9f40ea9bb79053750c0ddca6f06b00472fa2 (diff)
downloadskiboot-9f64cb2028f8612daa8556cc4831b9b7ce91b171.zip
skiboot-9f64cb2028f8612daa8556cc4831b9b7ce91b171.tar.gz
skiboot-9f64cb2028f8612daa8556cc4831b9b7ce91b171.tar.bz2
ccan/endian: Update endian module
This pulls in a fix for warnings in our tests: hdata/test/../spira.c:64:64: warning: suggest parentheses around ‘+’ in operand of ‘&’ [-Wparentheses] .addr = CPU_TO_BE64((unsigned long)&(cpu_ctl_sp_attn_area1) + SKIBOOT_BASE) Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'ccan/endian')
-rw-r--r--ccan/endian/.depends0
-rw-r--r--ccan/endian/_info4
-rw-r--r--ccan/endian/endian.h133
3 files changed, 86 insertions, 51 deletions
diff --git a/ccan/endian/.depends b/ccan/endian/.depends
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ccan/endian/.depends
diff --git a/ccan/endian/_info b/ccan/endian/_info
index 753afa7..efe5a8b 100644
--- a/ccan/endian/_info
+++ b/ccan/endian/_info
@@ -1,6 +1,6 @@
+#include "config.h"
#include <stdio.h>
#include <string.h>
-#include "config.h"
/**
* endian - endian conversion macros for simple types
@@ -15,6 +15,8 @@
* order (almost everyone else).
*
* This module provides conversion routines, inspired by the linux kernel.
+ * It also provides leint32_t, beint32_t etc typedefs, which are annotated for
+ * the sparse checker.
*
* Example:
* #include <stdio.h>
diff --git a/ccan/endian/endian.h b/ccan/endian/endian.h
index 4dc58dd..dc9f62e 100644
--- a/ccan/endian/endian.h
+++ b/ccan/endian/endian.h
@@ -16,8 +16,8 @@
* };
*/
#define BSWAP_16(val) \
- ((((uint16_t)val & 0x00ff) << 8) \
- | (((uint16_t)val & 0xff00) >> 8))
+ ((((uint16_t)(val) & 0x00ff) << 8) \
+ | (((uint16_t)(val) & 0xff00) >> 8))
/**
* BSWAP_32 - reverse bytes in a constant uint32_t value.
@@ -31,10 +31,10 @@
* };
*/
#define BSWAP_32(val) \
- ((((uint32_t)val & 0x000000ff) << 24) \
- | (((uint32_t)val & 0x0000ff00) << 8) \
- | (((uint32_t)val & 0x00ff0000) >> 8) \
- | (((uint32_t)val & 0xff000000) >> 24))
+ ((((uint32_t)(val) & 0x000000ff) << 24) \
+ | (((uint32_t)(val) & 0x0000ff00) << 8) \
+ | (((uint32_t)(val) & 0x00ff0000) >> 8) \
+ | (((uint32_t)(val) & 0xff000000) >> 24))
/**
* BSWAP_64 - reverse bytes in a constant uint64_t value.
@@ -48,14 +48,14 @@
* };
*/
#define BSWAP_64(val) \
- ((((uint64_t)val & 0x00000000000000ffULL) << 56) \
- | (((uint64_t)val & 0x000000000000ff00ULL) << 40) \
- | (((uint64_t)val & 0x0000000000ff0000ULL) << 24) \
- | (((uint64_t)val & 0x00000000ff000000ULL) << 8) \
- | (((uint64_t)val & 0x000000ff00000000ULL) >> 8) \
- | (((uint64_t)val & 0x0000ff0000000000ULL) >> 24) \
- | (((uint64_t)val & 0x00ff000000000000ULL) >> 40) \
- | (((uint64_t)val & 0xff00000000000000ULL) >> 56))
+ ((((uint64_t)(val) & 0x00000000000000ffULL) << 56) \
+ | (((uint64_t)(val) & 0x000000000000ff00ULL) << 40) \
+ | (((uint64_t)(val) & 0x0000000000ff0000ULL) << 24) \
+ | (((uint64_t)(val) & 0x00000000ff000000ULL) << 8) \
+ | (((uint64_t)(val) & 0x000000ff00000000ULL) >> 8) \
+ | (((uint64_t)(val) & 0x0000ff0000000000ULL) >> 24) \
+ | (((uint64_t)(val) & 0x00ff000000000000ULL) >> 40) \
+ | (((uint64_t)(val) & 0xff00000000000000ULL) >> 56))
#if HAVE_BYTESWAP_H
#include <byteswap.h>
@@ -110,50 +110,66 @@ static inline uint64_t bswap_64(uint64_t val)
#error "Can't compile for both big and little endian."
#endif
+#ifdef __CHECKER__
+/* sparse needs forcing to remove bitwise attribute from ccan/short_types */
+#define ENDIAN_CAST __attribute__((force))
+#define ENDIAN_TYPE __attribute__((bitwise))
+#else
+#define ENDIAN_CAST
+#define ENDIAN_TYPE
+#endif
+
+typedef uint64_t ENDIAN_TYPE leint64_t;
+typedef uint64_t ENDIAN_TYPE beint64_t;
+typedef uint32_t ENDIAN_TYPE leint32_t;
+typedef uint32_t ENDIAN_TYPE beint32_t;
+typedef uint16_t ENDIAN_TYPE leint16_t;
+typedef uint16_t ENDIAN_TYPE beint16_t;
+
#if HAVE_LITTLE_ENDIAN
/**
* CPU_TO_LE64 - convert a constant uint64_t value to little-endian
* @native: constant to convert
*/
-#define CPU_TO_LE64(native) (native)
+#define CPU_TO_LE64(native) ((ENDIAN_CAST leint64_t)(native))
/**
* CPU_TO_LE32 - convert a constant uint32_t value to little-endian
* @native: constant to convert
*/
-#define CPU_TO_LE32(native) (native)
+#define CPU_TO_LE32(native) ((ENDIAN_CAST leint32_t)(native))
/**
* CPU_TO_LE16 - convert a constant uint16_t value to little-endian
* @native: constant to convert
*/
-#define CPU_TO_LE16(native) (native)
+#define CPU_TO_LE16(native) ((ENDIAN_CAST leint16_t)(native))
/**
* LE64_TO_CPU - convert a little-endian uint64_t constant
* @le_val: little-endian constant to convert
*/
-#define LE64_TO_CPU(le_val) (le_val)
+#define LE64_TO_CPU(le_val) ((ENDIAN_CAST uint64_t)(le_val))
/**
* LE32_TO_CPU - convert a little-endian uint32_t constant
* @le_val: little-endian constant to convert
*/
-#define LE32_TO_CPU(le_val) (le_val)
+#define LE32_TO_CPU(le_val) ((ENDIAN_CAST uint32_t)(le_val))
/**
* LE16_TO_CPU - convert a little-endian uint16_t constant
* @le_val: little-endian constant to convert
*/
-#define LE16_TO_CPU(le_val) (le_val)
+#define LE16_TO_CPU(le_val) ((ENDIAN_CAST uint16_t)(le_val))
#else /* ... HAVE_BIG_ENDIAN */
-#define CPU_TO_LE64(native) BSWAP_64(native)
-#define CPU_TO_LE32(native) BSWAP_32(native)
-#define CPU_TO_LE16(native) BSWAP_16(native)
-#define LE64_TO_CPU(le_val) BSWAP_64(le_val)
-#define LE32_TO_CPU(le_val) BSWAP_32(le_val)
-#define LE16_TO_CPU(le_val) BSWAP_16(le_val)
+#define CPU_TO_LE64(native) ((ENDIAN_CAST leint64_t)BSWAP_64(native))
+#define CPU_TO_LE32(native) ((ENDIAN_CAST leint32_t)BSWAP_32(native))
+#define CPU_TO_LE16(native) ((ENDIAN_CAST leint16_t)BSWAP_16(native))
+#define LE64_TO_CPU(le_val) BSWAP_64((ENDIAN_CAST uint64_t)le_val)
+#define LE32_TO_CPU(le_val) BSWAP_32((ENDIAN_CAST uint32_t)le_val)
+#define LE16_TO_CPU(le_val) BSWAP_16((ENDIAN_CAST uint16_t)le_val)
#endif /* HAVE_BIG_ENDIAN */
#if HAVE_BIG_ENDIAN
@@ -161,45 +177,45 @@ static inline uint64_t bswap_64(uint64_t val)
* CPU_TO_BE64 - convert a constant uint64_t value to big-endian
* @native: constant to convert
*/
-#define CPU_TO_BE64(native) (native)
+#define CPU_TO_BE64(native) ((ENDIAN_CAST beint64_t)(native))
/**
* CPU_TO_BE32 - convert a constant uint32_t value to big-endian
* @native: constant to convert
*/
-#define CPU_TO_BE32(native) (native)
+#define CPU_TO_BE32(native) ((ENDIAN_CAST beint32_t)(native))
/**
* CPU_TO_BE16 - convert a constant uint16_t value to big-endian
* @native: constant to convert
*/
-#define CPU_TO_BE16(native) (native)
+#define CPU_TO_BE16(native) ((ENDIAN_CAST beint16_t)(native))
/**
* BE64_TO_CPU - convert a big-endian uint64_t constant
* @le_val: big-endian constant to convert
*/
-#define BE64_TO_CPU(le_val) (le_val)
+#define BE64_TO_CPU(le_val) ((ENDIAN_CAST uint64_t)(le_val))
/**
* BE32_TO_CPU - convert a big-endian uint32_t constant
* @le_val: big-endian constant to convert
*/
-#define BE32_TO_CPU(le_val) (le_val)
+#define BE32_TO_CPU(le_val) ((ENDIAN_CAST uint32_t)(le_val))
/**
* BE16_TO_CPU - convert a big-endian uint16_t constant
* @le_val: big-endian constant to convert
*/
-#define BE16_TO_CPU(le_val) (le_val)
+#define BE16_TO_CPU(le_val) ((ENDIAN_CAST uint16_t)(le_val))
#else /* ... HAVE_LITTLE_ENDIAN */
-#define CPU_TO_BE64(native) BSWAP_64(native)
-#define CPU_TO_BE32(native) BSWAP_32(native)
-#define CPU_TO_BE16(native) BSWAP_16(native)
-#define BE64_TO_CPU(le_val) BSWAP_64(le_val)
-#define BE32_TO_CPU(le_val) BSWAP_32(le_val)
-#define BE16_TO_CPU(le_val) BSWAP_16(le_val)
+#define CPU_TO_BE64(native) ((ENDIAN_CAST beint64_t)BSWAP_64(native))
+#define CPU_TO_BE32(native) ((ENDIAN_CAST beint32_t)BSWAP_32(native))
+#define CPU_TO_BE16(native) ((ENDIAN_CAST beint16_t)BSWAP_16(native))
+#define BE64_TO_CPU(le_val) BSWAP_64((ENDIAN_CAST uint64_t)le_val)
+#define BE32_TO_CPU(le_val) BSWAP_32((ENDIAN_CAST uint32_t)le_val)
+#define BE16_TO_CPU(le_val) BSWAP_16((ENDIAN_CAST uint16_t)le_val)
#endif /* HAVE_LITTE_ENDIAN */
@@ -207,7 +223,7 @@ static inline uint64_t bswap_64(uint64_t val)
* cpu_to_le64 - convert a uint64_t value to little-endian
* @native: value to convert
*/
-static inline uint64_t cpu_to_le64(uint64_t native)
+static inline leint64_t cpu_to_le64(uint64_t native)
{
return CPU_TO_LE64(native);
}
@@ -216,7 +232,7 @@ static inline uint64_t cpu_to_le64(uint64_t native)
* cpu_to_le32 - convert a uint32_t value to little-endian
* @native: value to convert
*/
-static inline uint32_t cpu_to_le32(uint32_t native)
+static inline leint32_t cpu_to_le32(uint32_t native)
{
return CPU_TO_LE32(native);
}
@@ -225,7 +241,7 @@ static inline uint32_t cpu_to_le32(uint32_t native)
* cpu_to_le16 - convert a uint16_t value to little-endian
* @native: value to convert
*/
-static inline uint16_t cpu_to_le16(uint16_t native)
+static inline leint16_t cpu_to_le16(uint16_t native)
{
return CPU_TO_LE16(native);
}
@@ -234,7 +250,7 @@ static inline uint16_t cpu_to_le16(uint16_t native)
* le64_to_cpu - convert a little-endian uint64_t value
* @le_val: little-endian value to convert
*/
-static inline uint64_t le64_to_cpu(uint64_t le_val)
+static inline uint64_t le64_to_cpu(leint64_t le_val)
{
return LE64_TO_CPU(le_val);
}
@@ -243,7 +259,7 @@ static inline uint64_t le64_to_cpu(uint64_t le_val)
* le32_to_cpu - convert a little-endian uint32_t value
* @le_val: little-endian value to convert
*/
-static inline uint32_t le32_to_cpu(uint32_t le_val)
+static inline uint32_t le32_to_cpu(leint32_t le_val)
{
return LE32_TO_CPU(le_val);
}
@@ -252,7 +268,7 @@ static inline uint32_t le32_to_cpu(uint32_t le_val)
* le16_to_cpu - convert a little-endian uint16_t value
* @le_val: little-endian value to convert
*/
-static inline uint16_t le16_to_cpu(uint16_t le_val)
+static inline uint16_t le16_to_cpu(leint16_t le_val)
{
return LE16_TO_CPU(le_val);
}
@@ -261,8 +277,9 @@ static inline uint16_t le16_to_cpu(uint16_t le_val)
* cpu_to_be64 - convert a uint64_t value to big endian.
* @native: value to convert
*/
-static inline uint64_t cpu_to_be64(uint64_t native)
+static inline beint64_t cpu_to_be64(uint64_t native)
{
+ return ((ENDIAN_CAST beint64_t)BSWAP_64(native));
return CPU_TO_BE64(native);
}
@@ -270,7 +287,7 @@ static inline uint64_t cpu_to_be64(uint64_t native)
* cpu_to_be32 - convert a uint32_t value to big endian.
* @native: value to convert
*/
-static inline uint32_t cpu_to_be32(uint32_t native)
+static inline beint32_t cpu_to_be32(uint32_t native)
{
return CPU_TO_BE32(native);
}
@@ -279,7 +296,7 @@ static inline uint32_t cpu_to_be32(uint32_t native)
* cpu_to_be16 - convert a uint16_t value to big endian.
* @native: value to convert
*/
-static inline uint16_t cpu_to_be16(uint16_t native)
+static inline beint16_t cpu_to_be16(uint16_t native)
{
return CPU_TO_BE16(native);
}
@@ -288,7 +305,7 @@ static inline uint16_t cpu_to_be16(uint16_t native)
* be64_to_cpu - convert a big-endian uint64_t value
* @be_val: big-endian value to convert
*/
-static inline uint64_t be64_to_cpu(uint64_t be_val)
+static inline uint64_t be64_to_cpu(beint64_t be_val)
{
return BE64_TO_CPU(be_val);
}
@@ -297,7 +314,7 @@ static inline uint64_t be64_to_cpu(uint64_t be_val)
* be32_to_cpu - convert a big-endian uint32_t value
* @be_val: big-endian value to convert
*/
-static inline uint32_t be32_to_cpu(uint32_t be_val)
+static inline uint32_t be32_to_cpu(beint32_t be_val)
{
return BE32_TO_CPU(be_val);
}
@@ -306,9 +323,25 @@ static inline uint32_t be32_to_cpu(uint32_t be_val)
* be16_to_cpu - convert a big-endian uint16_t value
* @be_val: big-endian value to convert
*/
-static inline uint16_t be16_to_cpu(uint16_t be_val)
+static inline uint16_t be16_to_cpu(beint16_t be_val)
{
return BE16_TO_CPU(be_val);
}
+/* Whichever they include first, they get these definitions. */
+#ifdef CCAN_SHORT_TYPES_H
+/**
+ * be64/be32/be16 - 64/32/16 bit big-endian representation.
+ */
+typedef beint64_t be64;
+typedef beint32_t be32;
+typedef beint16_t be16;
+
+/**
+ * le64/le32/le16 - 64/32/16 bit little-endian representation.
+ */
+typedef leint64_t le64;
+typedef leint32_t le32;
+typedef leint16_t le16;
+#endif
#endif /* CCAN_ENDIAN_H */