qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 03/11] disas/nios2: Simplify endianess conversion
Date: Sat, 23 Oct 2021 20:31:15 +0200	[thread overview]
Message-ID: <20211023183123.813116-4-laurent@vivier.eu> (raw)
In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu>

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

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>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210807110939.95853-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 disas/nios2.c           | 22 +++-------------------
 include/disas/dis-asm.h |  3 +--
 target/nios2/cpu.c      |  6 +-----
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/disas/nios2.c b/disas/nios2.c
index d124902ae3e1..98ac07d72e9d 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/include/disas/dis-asm.h b/include/disas/dis-asm.h
index 524f29196d9d..08e1beec854f 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/target/nios2/cpu.c b/target/nios2/cpu.c
index 947bb09bc1ed..58ecd27d757e 100644
--- a/target/nios2/cpu.c
+++ b/target/nios2/cpu.c
@@ -147,11 +147,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)
-- 
2.31.1



  parent reply	other threads:[~2021-10-23 18:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-23 18:31 [PULL 00/11] Trivial branch for 6.2 patches Laurent Vivier
2021-10-23 18:31 ` [PULL 01/11] po: update turkish translation Laurent Vivier
2021-10-23 18:31 ` [PULL 02/11] disas/nios2: Fix style in print_insn_nios2() Laurent Vivier
2021-10-23 18:31 ` Laurent Vivier [this message]
2021-10-23 18:31 ` [PULL 04/11] MAINTAINERS: Add myself as reviewer of 'Machine core' API Laurent Vivier
2021-10-23 18:31 ` [PULL 05/11] softmmu/physmem.c: Fix typo in comment Laurent Vivier
2021-10-23 18:31 ` [PULL 06/11] hw/nvram: Fix Memory Leak in Xilinx eFuse QOM Laurent Vivier
2021-10-23 18:31 ` [PULL 07/11] hw/nvram: Fix Memory Leak in Xilinx Versal eFuse device Laurent Vivier
2021-10-23 18:31 ` [PULL 08/11] hw/nvram: Fix Memory Leak in Xilinx ZynqMP " Laurent Vivier
2021-10-23 18:31 ` [PULL 09/11] README: Fix some documentation URLs Laurent Vivier
2021-10-23 18:31 ` [PULL 10/11] analyze-migration.py: fix a long standing typo Laurent Vivier
2021-10-23 18:31 ` [PULL 11/11] analyze-migration.py: fix extract contents ('-x') errors Laurent Vivier
2021-10-23 23:22 ` [PULL 00/11] Trivial branch for 6.2 patches Richard Henderson

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=20211023183123.813116-4-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=f4bug@amsat.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=thuth@redhat.com \
    --subject='Re: [PULL 03/11] disas/nios2: Simplify endianess conversion' \
    /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

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).