[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/11] disas: Use qemu/bswap.h for bfd endian loads
From: |
Richard Henderson |
Subject: |
[PATCH v4 06/11] disas: Use qemu/bswap.h for bfd endian loads |
Date: |
Mon, 21 Sep 2020 10:41:13 -0700 |
Use the routines we have already instead of open-coding.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/disas/dis-asm.h | 32 ++++++++++++++++++++----
disas.c | 55 -----------------------------------------
2 files changed, 27 insertions(+), 60 deletions(-)
diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
index dda247eaf2..6b45aa9898 100644
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
@@ -466,11 +466,33 @@ int print_insn_rx(bfd_vma, disassemble_info *);
/* from libbfd */
-bfd_vma bfd_getl64 (const bfd_byte *addr);
-bfd_vma bfd_getl32 (const bfd_byte *addr);
-bfd_vma bfd_getb32 (const bfd_byte *addr);
-bfd_vma bfd_getl16 (const bfd_byte *addr);
-bfd_vma bfd_getb16 (const bfd_byte *addr);
+#include "qemu/bswap.h"
+
+static inline bfd_vma bfd_getl64(const bfd_byte *addr)
+{
+ return ldq_le_p(addr);
+}
+
+static inline bfd_vma bfd_getl32(const bfd_byte *addr)
+{
+ return (uint32_t)ldl_le_p(addr);
+}
+
+static inline bfd_vma bfd_getl16(const bfd_byte *addr)
+{
+ return lduw_le_p(addr);
+}
+
+static inline bfd_vma bfd_getb32(const bfd_byte *addr)
+{
+ return (uint32_t)ldl_be_p(addr);
+}
+
+static inline bfd_vma bfd_getb16(const bfd_byte *addr)
+{
+ return lduw_be_p(addr);
+}
+
typedef bool bfd_boolean;
#endif /* DISAS_DIS_ASM_H */
diff --git a/disas.c b/disas.c
index 7bc8e9a037..bf19b1b0bf 100644
--- a/disas.c
+++ b/disas.c
@@ -78,61 +78,6 @@ static int symbol_at_address(bfd_vma addr, struct
disassemble_info *info)
return 1;
}
-bfd_vma bfd_getl64 (const bfd_byte *addr)
-{
- unsigned long long v;
-
- v = (unsigned long long) addr[0];
- v |= (unsigned long long) addr[1] << 8;
- v |= (unsigned long long) addr[2] << 16;
- v |= (unsigned long long) addr[3] << 24;
- v |= (unsigned long long) addr[4] << 32;
- v |= (unsigned long long) addr[5] << 40;
- v |= (unsigned long long) addr[6] << 48;
- v |= (unsigned long long) addr[7] << 56;
- return (bfd_vma) v;
-}
-
-bfd_vma bfd_getl32 (const bfd_byte *addr)
-{
- unsigned long v;
-
- v = (unsigned long) addr[0];
- v |= (unsigned long) addr[1] << 8;
- v |= (unsigned long) addr[2] << 16;
- v |= (unsigned long) addr[3] << 24;
- return (bfd_vma) v;
-}
-
-bfd_vma bfd_getb32 (const bfd_byte *addr)
-{
- unsigned long v;
-
- v = (unsigned long) addr[0] << 24;
- v |= (unsigned long) addr[1] << 16;
- v |= (unsigned long) addr[2] << 8;
- v |= (unsigned long) addr[3];
- return (bfd_vma) v;
-}
-
-bfd_vma bfd_getl16 (const bfd_byte *addr)
-{
- unsigned long v;
-
- v = (unsigned long) addr[0];
- v |= (unsigned long) addr[1] << 8;
- return (bfd_vma) v;
-}
-
-bfd_vma bfd_getb16 (const bfd_byte *addr)
-{
- unsigned long v;
-
- v = (unsigned long) addr[0] << 24;
- v |= (unsigned long) addr[1] << 16;
- return (bfd_vma) v;
-}
-
static int print_insn_objdump(bfd_vma pc, disassemble_info *info,
const char *prefix)
{
--
2.25.1
- Re: [PATCH v4 03/11] capstone: Require version 4.0 from a system library, (continued)
- [PATCH v4 01/11] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/21
- [PATCH v4 05/11] disas: Clean up CPUDebug initialization, Richard Henderson, 2020/09/21
- [PATCH v4 08/11] disas: Configure capstone for aarch64 host without libvixl, Richard Henderson, 2020/09/21
- [PATCH v4 07/11] disas: Cleanup plugin_disas, Richard Henderson, 2020/09/21
- [PATCH v4 06/11] disas: Use qemu/bswap.h for bfd endian loads,
Richard Henderson <=
- [PATCH v4 04/11] disas: Move host asm annotations to tb_gen_code, Richard Henderson, 2020/09/21
[PATCH v4 09/11] disas: Split out capstone code to disas/capstone.c, Richard Henderson, 2020/09/21
[PATCH v4 10/11] disas: Enable capstone disassembly for s390x, Richard Henderson, 2020/09/21