[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] disas/nios2: Fix style in print_insn_nios2()
From: |
Laurent Vivier |
Subject: |
[PULL 02/11] disas/nios2: Fix style in print_insn_nios2() |
Date: |
Sat, 23 Oct 2021 20:31:14 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
We are going to modify this function, fix its style first.
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-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
disas/nios2.c | 55 +++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/disas/nios2.c b/disas/nios2.c
index c3e82140c798..d124902ae3e1 100644
--- a/disas/nios2.c
+++ b/disas/nios2.c
@@ -3482,38 +3482,37 @@ static int
print_insn_nios2 (bfd_vma address, disassemble_info *info,
enum bfd_endian endianness)
{
- bfd_byte buffer[INSNLEN];
- int status;
-
- status = (*info->read_memory_func) (address, buffer, INSNLEN, info);
- if (status == 0)
- {
- unsigned long insn;
- if (endianness == BFD_ENDIAN_BIG)
- insn = (unsigned long) bfd_getb32 (buffer);
- else
- insn = (unsigned long) bfd_getl32 (buffer);
- return nios2_disassemble (address, insn, info);
+ bfd_byte buffer[INSNLEN];
+ int status;
+
+ status = (*info->read_memory_func)(address, buffer, INSNLEN, info);
+ if (status == 0) {
+ unsigned long insn;
+ if (endianness == BFD_ENDIAN_BIG) {
+ insn = (unsigned long) bfd_getb32(buffer);
+ } else {
+ insn = (unsigned long) bfd_getl32(buffer);
+ }
+ return nios2_disassemble(address, insn, info);
}
- /* We might have a 16-bit R2 instruction at the end of memory. Try that. */
- if (info->mach == bfd_mach_nios2r2)
- {
- status = (*info->read_memory_func) (address, buffer, 2, info);
- if (status == 0)
- {
- unsigned long insn;
- if (endianness == BFD_ENDIAN_BIG)
- insn = (unsigned long) bfd_getb16 (buffer);
- else
- insn = (unsigned long) bfd_getl16 (buffer);
- return nios2_disassemble (address, insn, info);
- }
+ /* We might have a 16-bit R2 instruction at the end of memory. Try that. */
+ if (info->mach == bfd_mach_nios2r2) {
+ status = (*info->read_memory_func)(address, buffer, 2, info);
+ if (status == 0) {
+ unsigned long insn;
+ if (endianness == BFD_ENDIAN_BIG) {
+ insn = (unsigned long) bfd_getb16(buffer);
+ } else {
+ insn = (unsigned long) bfd_getl16(buffer);
+ }
+ return nios2_disassemble(address, insn, info);
+ }
}
- /* If we got here, we couldn't read anything. */
- (*info->memory_error_func) (status, address, info);
- return -1;
+ /* If we got here, we couldn't read anything. */
+ (*info->memory_error_func)(status, address, info);
+ return -1;
}
/* These two functions are the main entry points, accessed from
--
2.31.1
- [PULL 00/11] Trivial branch for 6.2 patches, Laurent Vivier, 2021/10/23
- [PULL 01/11] po: update turkish translation, Laurent Vivier, 2021/10/23
- [PULL 04/11] MAINTAINERS: Add myself as reviewer of 'Machine core' API, Laurent Vivier, 2021/10/23
- [PULL 05/11] softmmu/physmem.c: Fix typo in comment, Laurent Vivier, 2021/10/23
- [PULL 11/11] analyze-migration.py: fix extract contents ('-x') errors, Laurent Vivier, 2021/10/23
- [PULL 10/11] analyze-migration.py: fix a long standing typo, Laurent Vivier, 2021/10/23
- [PULL 09/11] README: Fix some documentation URLs, Laurent Vivier, 2021/10/23
- [PULL 03/11] disas/nios2: Simplify endianess conversion, Laurent Vivier, 2021/10/23
- [PULL 07/11] hw/nvram: Fix Memory Leak in Xilinx Versal eFuse device, Laurent Vivier, 2021/10/23
- [PULL 02/11] disas/nios2: Fix style in print_insn_nios2(),
Laurent Vivier <=
- [PULL 06/11] hw/nvram: Fix Memory Leak in Xilinx eFuse QOM, Laurent Vivier, 2021/10/23
- [PULL 08/11] hw/nvram: Fix Memory Leak in Xilinx ZynqMP eFuse device, Laurent Vivier, 2021/10/23
- Re: [PULL 00/11] Trivial branch for 6.2 patches, Richard Henderson, 2021/10/23