summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-03-08 04:38:13 -0800
committerRonald G. Minnich <rminnich@gmail.com>2013-03-14 04:56:05 +0100
commit1cb414de638d6885ad3a8510594ea1df7d4d96a6 (patch)
tree33e210db74ca088607f75e7d505d26874033ee7c
parent7e568559634199668859b7c662aea7f6b41f3920 (diff)
downloadcoreboot-1cb414de638d6885ad3a8510594ea1df7d4d96a6.tar.xz
libpayload: Turn the endian conversion macros into functions.
In their current macro form, any arguments that are expressions will be evaluated multiple times. That can cause problems if they have side effects, and might not even compile if the overall expression is ambiguous, for instance if you pass in foo++. Built with code that previously wouldn't compile because the macros expanded to ambiguous expressions. Change-Id: I378c04d7aff5b4ad40581930ce90e49ba7df1d3e Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://review.coreboot.org/2719 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--payloads/libpayload/include/endian.h22
1 files changed, 16 insertions, 6 deletions
diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h
index ee9cf136a0..cb5044380b 100644
--- a/payloads/libpayload/include/endian.h
+++ b/payloads/libpayload/include/endian.h
@@ -26,12 +26,22 @@
#include <arch/types.h>
#include <libpayload-config.h>
-#define swap_bytes16(in) ((((in) & 0xFF) << 8) | (((in) & 0xFF00) >> 8))
-#define swap_bytes32(in) ((((in) & 0xFF) << 24) | (((in) & 0xFF00) << 8) | \
- (((in) & 0xFF0000) >> 8) | \
- (((in) & 0xFF000000) >> 24))
-#define swap_bytes64(in) (((uint64_t)swap_bytes32((uint32_t)(in)) << 32) | \
- ((uint64_t)swap_bytes32((uint32_t)((in) >> 32))))
+static inline uint16_t swap_bytes16(uint16_t in)
+{
+ return ((in & 0xFF) << 8) | ((in & 0xFF00) >> 8);
+}
+
+static inline uint32_t swap_bytes32(uint32_t in)
+{
+ return ((in & 0xFF) << 24) | ((in & 0xFF00) << 8) |
+ ((in & 0xFF0000) >> 8) | ((in & 0xFF000000) >> 24);
+}
+
+static inline uint64_t swap_bytes64(uint64_t in)
+{
+ return ((uint64_t)swap_bytes32((uint32_t)in) << 32) |
+ ((uint64_t)swap_bytes32((uint32_t)(in >> 32)));
+}
/* Endian functions from glibc 2.9 / BSD "endian.h" */