From 29dff5a29edfa486bca75ee153a7b6146ebf7c3a Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 29 Nov 2017 17:31:14 -0800 Subject: [PATCH] saa.c: unify the various saa_write*() routines Use cpu_to_le*() to unify the various saa_write*() routines. Signed-off-by: H. Peter Anvin --- nasmlib/saa.c | 62 ++++------------------------------------------------------- 1 file changed, 4 insertions(+), 58 deletions(-) diff --git a/nasmlib/saa.c b/nasmlib/saa.c index 1d457ac6..fe7741a4 100644 --- a/nasmlib/saa.c +++ b/nasmlib/saa.c @@ -299,84 +299,30 @@ void saa_write8(struct SAA *s, uint8_t v) saa_wbytes(s, &v, 1); } -#ifdef WORDS_LITTLEENDIAN - void saa_write16(struct SAA *s, uint16_t v) { + v = cpu_to_le16(v); saa_wbytes(s, &v, 2); } void saa_write32(struct SAA *s, uint32_t v) { + v = cpu_to_le32(v); saa_wbytes(s, &v, 4); } void saa_write64(struct SAA *s, uint64_t v) { + v = cpu_to_le64(v); saa_wbytes(s, &v, 8); } void saa_writeaddr(struct SAA *s, uint64_t v, size_t len) { + v = cpu_to_le64(v); saa_wbytes(s, &v, len); } -#else /* not WORDS_LITTLEENDIAN */ - -void saa_write16(struct SAA *s, uint16_t v) -{ - uint8_t b[2]; - - b[0] = v; - b[1] = v >> 8; - saa_wbytes(s, b, 2); -} - -void saa_write32(struct SAA *s, uint32_t v) -{ - uint8_t b[4]; - - b[0] = v; - b[1] = v >> 8; - b[2] = v >> 16; - b[3] = v >> 24; - saa_wbytes(s, b, 4); -} - -void saa_write64(struct SAA *s, uint64_t v) -{ - uint8_t b[8]; - - b[0] = v; - b[1] = v >> 8; - b[2] = v >> 16; - b[3] = v >> 24; - b[4] = v >> 32; - b[5] = v >> 40; - b[6] = v >> 48; - b[7] = v >> 56; - - saa_wbytes(s, b, 8); -} - -void saa_writeaddr(struct SAA *s, uint64_t v, size_t len) -{ - uint8_t b[8]; - - b[0] = v; - b[1] = v >> 8; - b[2] = v >> 16; - b[3] = v >> 24; - b[4] = v >> 32; - b[5] = v >> 40; - b[6] = v >> 48; - b[7] = v >> 56; - - saa_wbytes(s, b, len); -} - -#endif /* WORDS_LITTLEENDIAN */ - /* write unsigned LEB128 value to SAA */ void saa_wleb128u(struct SAA *psaa, int value) { -- 2.11.4.GIT