diff options
author | Ron Yorston <rmy@pobox.com> | 2018-11-28 10:28:18 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-11-28 10:28:18 +0000 |
commit | 2a69a2200a141c1504b662eca64b802cdab71b12 (patch) | |
tree | eab0cc01852db237a26052a83c8f582ed92b7cd9 /include/platform.h | |
parent | 97ca1f4b955f486cd26461cb09185335483d2921 (diff) | |
parent | 572dfb8e78323b9837f7c5e3369ee233a440b8f2 (diff) | |
download | busybox-w32-2a69a2200a141c1504b662eca64b802cdab71b12.tar.gz busybox-w32-2a69a2200a141c1504b662eca64b802cdab71b12.tar.bz2 busybox-w32-2a69a2200a141c1504b662eca64b802cdab71b12.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include/platform.h')
-rw-r--r-- | include/platform.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/platform.h b/include/platform.h index 0d17062da..afd8cf292 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -252,6 +252,7 @@ typedef uint64_t bb__aliased_uint64_t FIX_ALIASING; | |||
252 | # define move_from_unaligned32(v, u32p) ((v) = *(bb__aliased_uint32_t*)(u32p)) | 252 | # define move_from_unaligned32(v, u32p) ((v) = *(bb__aliased_uint32_t*)(u32p)) |
253 | # define move_to_unaligned16(u16p, v) (*(bb__aliased_uint16_t*)(u16p) = (v)) | 253 | # define move_to_unaligned16(u16p, v) (*(bb__aliased_uint16_t*)(u16p) = (v)) |
254 | # define move_to_unaligned32(u32p, v) (*(bb__aliased_uint32_t*)(u32p) = (v)) | 254 | # define move_to_unaligned32(u32p, v) (*(bb__aliased_uint32_t*)(u32p) = (v)) |
255 | # define move_to_unaligned64(u64p, v) (*(bb__aliased_uint64_t*)(u64p) = (v)) | ||
255 | /* #elif ... - add your favorite arch today! */ | 256 | /* #elif ... - add your favorite arch today! */ |
256 | #else | 257 | #else |
257 | # define BB_UNALIGNED_MEMACCESS_OK 0 | 258 | # define BB_UNALIGNED_MEMACCESS_OK 0 |
@@ -268,6 +269,10 @@ typedef uint64_t bb__aliased_uint64_t FIX_ALIASING; | |||
268 | uint32_t __t = (v); \ | 269 | uint32_t __t = (v); \ |
269 | memcpy((u32p), &__t, 4); \ | 270 | memcpy((u32p), &__t, 4); \ |
270 | } while (0) | 271 | } while (0) |
272 | # define move_to_unaligned64(u64p, v) do { \ | ||
273 | uint64_t __t = (v); \ | ||
274 | memcpy((u64p), &__t, 8); \ | ||
275 | } while (0) | ||
271 | #endif | 276 | #endif |
272 | 277 | ||
273 | /* Unaligned, fixed-endian accessors */ | 278 | /* Unaligned, fixed-endian accessors */ |