From: Laurent Vivier <laurent@vivier.eu>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Cc: "Marek Vasut" <marex@denx.de>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Chris Wulff" <crwulff@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: Re: [PATCH-for-6.2 2/2] disas/nios2: Simplify endianess conversion
Date: Wed, 29 Sep 2021 17:28:34 +0200 [thread overview]
Message-ID: <1fc4c146-890c-de33-de8a-9198ae11a52a@vivier.eu> (raw)
In-Reply-To: <20210807110939.95853-3-f4bug@amsat.org>
Le 07/08/2021 à 13:09, Philippe Mathieu-Daudé a écrit :
> Since commit 12b6e9b27d4 ("disas: Clean up CPUDebug initialization")
> the disassemble_info->bfd_endian enum is set for all targets in
> target_disas(). We can directly call print_insn_nios2() and simplify.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> include/disas/dis-asm.h | 3 +--
> disas/nios2.c | 22 +++-------------------
> target/nios2/cpu.c | 6 +-----
> 3 files changed, 5 insertions(+), 26 deletions(-)
>
> diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
> index 524f29196d9..08e1beec854 100644
> --- a/include/disas/dis-asm.h
> +++ b/include/disas/dis-asm.h
> @@ -455,8 +455,7 @@ int print_insn_crisv32 (bfd_vma, disassemble_info*);
> int print_insn_crisv10 (bfd_vma, disassemble_info*);
> int print_insn_microblaze (bfd_vma, disassemble_info*);
> int print_insn_ia64 (bfd_vma, disassemble_info*);
> -int print_insn_big_nios2 (bfd_vma, disassemble_info*);
> -int print_insn_little_nios2 (bfd_vma, disassemble_info*);
> +int print_insn_nios2(bfd_vma, disassemble_info*);
> int print_insn_xtensa (bfd_vma, disassemble_info*);
> int print_insn_riscv32 (bfd_vma, disassemble_info*);
> int print_insn_riscv64 (bfd_vma, disassemble_info*);
> diff --git a/disas/nios2.c b/disas/nios2.c
> index d124902ae3e..98ac07d72e9 100644
> --- a/disas/nios2.c
> +++ b/disas/nios2.c
> @@ -3478,9 +3478,7 @@ nios2_disassemble (bfd_vma address, unsigned long opcode,
> instruction word at the address given, and prints the disassembled
> instruction on the stream info->stream using info->fprintf_func. */
>
> -static int
> -print_insn_nios2 (bfd_vma address, disassemble_info *info,
> - enum bfd_endian endianness)
> +int print_insn_nios2(bfd_vma address, disassemble_info *info)
> {
> bfd_byte buffer[INSNLEN];
> int status;
> @@ -3488,7 +3486,7 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info,
> status = (*info->read_memory_func)(address, buffer, INSNLEN, info);
> if (status == 0) {
> unsigned long insn;
> - if (endianness == BFD_ENDIAN_BIG) {
> + if (info->endian == BFD_ENDIAN_BIG) {
> insn = (unsigned long) bfd_getb32(buffer);
> } else {
> insn = (unsigned long) bfd_getl32(buffer);
> @@ -3501,7 +3499,7 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info,
> status = (*info->read_memory_func)(address, buffer, 2, info);
> if (status == 0) {
> unsigned long insn;
> - if (endianness == BFD_ENDIAN_BIG) {
> + if (info->endian == BFD_ENDIAN_BIG) {
> insn = (unsigned long) bfd_getb16(buffer);
> } else {
> insn = (unsigned long) bfd_getl16(buffer);
> @@ -3514,17 +3512,3 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info,
> (*info->memory_error_func)(status, address, info);
> return -1;
> }
> -
> -/* These two functions are the main entry points, accessed from
> - disassemble.c. */
> -int
> -print_insn_big_nios2 (bfd_vma address, disassemble_info *info)
> -{
> - return print_insn_nios2 (address, info, BFD_ENDIAN_BIG);
> -}
> -
> -int
> -print_insn_little_nios2 (bfd_vma address, disassemble_info *info)
> -{
> - return print_insn_nios2 (address, info, BFD_ENDIAN_LITTLE);
> -}
> diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c
> index 5e37defef80..5b503b5bb99 100644
> --- a/target/nios2/cpu.c
> +++ b/target/nios2/cpu.c
> @@ -146,11 +146,7 @@ static void nios2_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
> {
> /* NOTE: NiosII R2 is not supported yet. */
> info->mach = bfd_arch_nios2;
> -#ifdef TARGET_WORDS_BIGENDIAN
> - info->print_insn = print_insn_big_nios2;
> -#else
> - info->print_insn = print_insn_little_nios2;
> -#endif
> + info->print_insn = print_insn_nios2;
> }
>
> static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
next prev parent reply other threads:[~2021-09-29 15:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 11:09 [PATCH-for-6.2 0/2] disas/nios2: Simplify endianess conversion Philippe Mathieu-Daudé
2021-08-07 11:09 ` [PATCH-for-6.2 1/2] disas/nios2: Fix style in print_insn_nios2() Philippe Mathieu-Daudé
2021-08-09 6:08 ` Thomas Huth
2021-08-09 7:14 ` Philippe Mathieu-Daudé
2021-09-29 15:28 ` Laurent Vivier
2021-08-07 11:09 ` [PATCH-for-6.2 2/2] disas/nios2: Simplify endianess conversion Philippe Mathieu-Daudé
2021-08-09 6:12 ` Thomas Huth
2021-08-09 9:48 ` Philippe Mathieu-Daudé
2021-09-29 15:28 ` Laurent Vivier [this message]
2021-09-18 9:19 ` [PATCH-for-6.2 0/2] " Philippe Mathieu-Daudé
2021-09-23 15:14 ` Laurent Vivier
2021-09-24 9:40 ` Philippe Mathieu-Daudé
2021-10-19 7:43 ` Laurent Vivier
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=1fc4c146-890c-de33-de8a-9198ae11a52a@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=crwulff@gmail.com \
--cc=f4bug@amsat.org \
--cc=marex@denx.de \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).