mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

bytesex.h: make sure WRITE*() doesn't screw up on wrong pointer type

Browse Source 
Make the WRITE*() macros independent of pointer type.  As it was, we
would get totally wrong result on X86_MEMORY machines if the pointer
was not uint8_t *.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2017-11-29 17:07:58 -08:00
parent 7370483b00
commit df5548a40c
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/bytesex.h
View File

@ -54,26 +54,30 @@
#define WRITECHAR(p,v) \
do { \
*(uint8_t *)(p) = (v); \
(p) += 1; \
uint8_t *_wc_p = (uint8_t *)(p); \
*_wc_p = (v); \
(p) = (void *)(_wc_p + 1); \
} while (0)
#define WRITESHORT(p,v) \
do { \
*(uint16_t *)(p) = (v); \
(p) += 2; \
uint16_t *_ws_p = (uint16_t *)(p); \
*_ws_p = (v); \
(p) = (void *)(_ws_p + 1); \
} while (0)
#define WRITELONG(p,v) \
do { \
*(uint32_t *)(p) = (v); \
(p) += 4; \
uint32_t *_wl_p = (uint32_t *)(p); \
*_wl_p = (v); \
(p) = (void *)(_wl_p + 1); \
} while (0)
#define WRITEDLONG(p,v) \
do { \
*(uint64_t *)(p) = (v); \
(p) += 8; \
uint64_t *_wq_p = (uint64_t *)(p); \
*_wq_p = (v); \
(p) = (void *)(_wq_p + 1); \
} while (0)
#else /* !X86_MEMORY */
@ -263,8 +267,9 @@ static inline uint64_t cpu_to_le64(uint64_t v)
{ \
uint64_t _wa_v = cpu_to_le64(v); \
size_t _wa_s = (s); \
memcpy((p), &_wa_v, _wa_s); \
(p) += _wa_s; \
uint8_t *_wa_p = (uint8_t *)(p); \
memcpy(_wa_p, &_wa_v, _wa_s); \
(p) = (void *)(_wa_p + _wa_s); \
} \
break; \
} \