riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14642 from maribu/fix-byteorder-big-endian

Browse Source 
core/byteorder: Fix be byte buffer conversion on big endian systems
This commit is contained in:
benpicco 2020-07-29 01:25:03 +02:00 committed by GitHub
commit 2d4d29367e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/include/byteorder.h
View File

@ -20,6 +20,7 @@
#define BYTEORDER_H #define BYTEORDER_H
#include <stdint.h> #include <stdint.h>
#include "unaligned.h"
#if defined(__MACH__) #if defined(__MACH__)
# include "clang_compat.h" # include "clang_compat.h"
@ -485,7 +486,9 @@ static inline uint16_t byteorder_bebuftohs(const uint8_t *buf)
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
return (uint16_t)((buf[0] << 8) | (buf[1] << 0)); return (uint16_t)((buf[0] << 8) | (buf[1] << 0));
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
return (uint16_t)((buf[1] << 8) | (buf[0] << 0)); /* big endian to big endian conversion is easy, but buffer might be
* unaligned */
return unaligned_get_u16(buf);
#endif #endif
} }
@ -497,10 +500,9 @@ static inline uint32_t byteorder_bebuftohl(const uint8_t *buf)
| ((uint32_t) buf[2] << 8) | ((uint32_t) buf[2] << 8)
| ((uint32_t) buf[3] << 0)); | ((uint32_t) buf[3] << 0));
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
return (((uint32_t) buf[3] << 24) /* big endian to big endian conversion is easy, but buffer might be
| ((uint32_t) buf[2] << 16) * unaligned */
| ((uint32_t) buf[1] << 8) return unaligned_get_u32(buf);
| ((uint32_t) buf[0] << 0));
#endif #endif
} }
@ -510,8 +512,9 @@ static inline void byteorder_htobebufs(uint8_t *buf, uint16_t val)
buf[0] = (uint8_t)(val >> 8); buf[0] = (uint8_t)(val >> 8);
buf[1] = (uint8_t)(val >> 0); buf[1] = (uint8_t)(val >> 0);
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
buf[1] = (uint8_t)(val >> 8); /* big endian to big endian conversion is easy, but buffer might be
buf[0] = (uint8_t)(val >> 0); * unaligned */
memcpy(buf, &val, sizeof(val));
#endif #endif
} }
@ -523,10 +526,9 @@ static inline void byteorder_htobebufl(uint8_t *buf, uint32_t val)
buf[2] = (uint8_t)(val >> 8); buf[2] = (uint8_t)(val >> 8);
buf[3] = (uint8_t)(val >> 0); buf[3] = (uint8_t)(val >> 0);
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
buf[3] = (uint8_t)(val >> 24); /* big endian to big endian conversion is easy, but buffer might be
buf[2] = (uint8_t)(val >> 16); * unaligned */
buf[1] = (uint8_t)(val >> 8); memcpy(buf, &val, sizeof(val));
buf[0] = (uint8_t)(val >> 0);
#endif #endif
} }

20
sys/include/unaligned.h
View File

@ -48,6 +48,11 @@ typedef struct __attribute__((packed)) {
uint16_t val; /**< value */ uint16_t val; /**< value */
} uint16_una_t; } uint16_una_t;
/** @brief Unaligned access helper struct (uint32_t version) */
typedef struct __attribute__((packed)) {
uint32_t val; /**< value */
} uint32_una_t;
/** /**
* @brief Get uint16_t from possibly unaligned pointer * @brief Get uint16_t from possibly unaligned pointer
* *
@ -57,7 +62,20 @@ typedef struct __attribute__((packed)) {
*/ */
static inline uint16_t unaligned_get_u16(const void *ptr) static inline uint16_t unaligned_get_u16(const void *ptr)
{ {
const uint16_una_t *tmp = ptr; const uint16_una_t *tmp = (const uint16_una_t *)ptr;
return tmp->val;
}
/**
* @brief Get uint32_t from possibly unaligned pointer
*
* @param[in] ptr pointer to read from
*
* @returns value read from @p ptr
*/
static inline uint32_t unaligned_get_u32(const void *ptr)
{
const uint32_una_t *tmp = (const uint32_una_t *)ptr;
return tmp->val; return tmp->val;
} }