| Message ID | 20200914000153.1725632-6-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | capstone + disassembler patches | expand |
On 9/14/20 2:01 AM, Richard Henderson wrote: > Use the routines we have already instead of open-coding. Yay \o/ 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 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) > { >
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) {
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(-) -- 2.25.1