From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: luoyonggang@gmail.com, alex.bennee@linaro.org, thuth@redhat.com
Subject: [PATCH 05/11] disas: Use qemu/bswap.h for bfd endian loads
Date: Sun, 13 Sep 2020 17:01:47 -0700 [thread overview]
Message-ID: <20200914000153.1725632-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200914000153.1725632-1-richard.henderson@linaro.org>
Use the routines we have already instead of open-coding.
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 d2418c977e..8a216ac495 100644
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
@@ -468,11 +468,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 50b5677930..20fad6aabb 100644
--- a/disas.c
+++ b/disas.c
@@ -85,61 +85,6 @@ generic_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
next prev parent reply other threads:[~2020-09-14 0:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 0:01 [PATCH 00/11] capstone + disassembler patches Richard Henderson
2020-09-14 0:01 ` [PATCH 01/11] capstone: Convert Makefile bits to meson bits Richard Henderson
2020-09-14 1:37 ` Richard Henderson
2020-09-14 13:28 ` Paolo Bonzini
2020-09-14 16:23 ` Richard Henderson
2020-09-14 16:43 ` Paolo Bonzini
2020-09-14 13:31 ` Peter Maydell
2020-09-14 0:01 ` [PATCH 02/11] capstone: Update to upstream "next" branch Richard Henderson
2020-09-14 6:07 ` Philippe Mathieu-Daudé
2020-09-14 0:01 ` [PATCH 03/11] disas: Move host asm annotations to tb_gen_code Richard Henderson
2020-09-14 0:01 ` [PATCH 04/11] disas: Clean up CPUDebug initialization Richard Henderson
2020-09-14 0:01 ` Richard Henderson [this message]
2020-09-14 5:49 ` [PATCH 05/11] disas: Use qemu/bswap.h for bfd endian loads Philippe Mathieu-Daudé
2020-09-14 0:01 ` [PATCH 06/11] disas: Cleanup plugin_disas Richard Henderson
2020-09-14 0:01 ` [PATCH 07/11] disas: Configure capstone for aarch64 host without libvixl Richard Henderson
2020-09-14 0:01 ` [PATCH 08/11] disas: Split out capstone code to disas/capstone.c Richard Henderson
2020-09-14 0:01 ` [PATCH 09/11] disas: Enable capstone disassembly for s390x Richard Henderson
2020-09-14 0:01 ` [PATCH 10/11] disas/capstone: Add skipdata hook " Richard Henderson
2020-09-14 5:54 ` Philippe Mathieu-Daudé
2020-09-14 0:01 ` [PATCH 11/11] disas: Enable capstone disassembly for sparc Richard Henderson
2020-09-14 6:23 ` Philippe Mathieu-Daudé
2020-09-14 21:07 ` Richard Henderson
2020-09-15 6:20 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200914000153.1725632-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=luoyonggang@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).