mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disas/nios2: Simplify endianess conversion

Browse Source 
Since commit 12b6e9b27d ("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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-08-07 13:09:39 +02:00 committed by Laurent Vivier
parent ed899ac77d
commit dcc99bd833
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
disas/nios2.c
View File

@ -3478,9 +3478,7 @@ nios2_disassemble (bfd_vma address, unsigned long opcode,
instruction word at the address given, and prints the disassembled instruction word at the address given, and prints the disassembled
instruction on the stream info->stream using info->fprintf_func. */ instruction on the stream info->stream using info->fprintf_func. */
static int int print_insn_nios2(bfd_vma address, disassemble_info *info)
print_insn_nios2 (bfd_vma address, disassemble_info *info,
enum bfd_endian endianness)
{ {
bfd_byte buffer[INSNLEN]; bfd_byte buffer[INSNLEN];
int status; int status;
@ -3488,7 +3486,7 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info,
status = (*info->read_memory_func)(address, buffer, INSNLEN, info); status = (*info->read_memory_func)(address, buffer, INSNLEN, info);
if (status == 0) { if (status == 0) {
unsigned long insn; unsigned long insn;
if (endianness == BFD_ENDIAN_BIG) { if (info->endian == BFD_ENDIAN_BIG) {
insn = (unsigned long) bfd_getb32(buffer); insn = (unsigned long) bfd_getb32(buffer);
} else { } else {
insn = (unsigned long) bfd_getl32(buffer); 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); status = (*info->read_memory_func)(address, buffer, 2, info);
if (status == 0) { if (status == 0) {
unsigned long insn; unsigned long insn;
if (endianness == BFD_ENDIAN_BIG) { if (info->endian == BFD_ENDIAN_BIG) {
insn = (unsigned long) bfd_getb16(buffer); insn = (unsigned long) bfd_getb16(buffer);
} else { } else {
insn = (unsigned long) bfd_getl16(buffer); 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); (*info->memory_error_func)(status, address, info);
return -1; 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);
}

3
include/disas/dis-asm.h
View File

@ -455,8 +455,7 @@ int print_insn_crisv32 (bfd_vma, disassemble_info*);
int print_insn_crisv10 (bfd_vma, disassemble_info*); int print_insn_crisv10 (bfd_vma, disassemble_info*);
int print_insn_microblaze (bfd_vma, disassemble_info*); int print_insn_microblaze (bfd_vma, disassemble_info*);
int print_insn_ia64 (bfd_vma, disassemble_info*); int print_insn_ia64 (bfd_vma, disassemble_info*);
int print_insn_big_nios2 (bfd_vma, disassemble_info*); int print_insn_nios2(bfd_vma, disassemble_info*);
int print_insn_little_nios2 (bfd_vma, disassemble_info*);
int print_insn_xtensa (bfd_vma, disassemble_info*); int print_insn_xtensa (bfd_vma, disassemble_info*);
int print_insn_riscv32 (bfd_vma, disassemble_info*); int print_insn_riscv32 (bfd_vma, disassemble_info*);
int print_insn_riscv64 (bfd_vma, disassemble_info*); int print_insn_riscv64 (bfd_vma, disassemble_info*);

6
target/nios2/cpu.c
View File

@ -147,11 +147,7 @@ static void nios2_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
{ {
/* NOTE: NiosII R2 is not supported yet. */ /* NOTE: NiosII R2 is not supported yet. */
info->mach = bfd_arch_nios2; info->mach = bfd_arch_nios2;
#ifdef TARGET_WORDS_BIGENDIAN info->print_insn = print_insn_nios2;
info->print_insn = print_insn_big_nios2;
#else
info->print_insn = print_insn_little_nios2;
#endif
} }
static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)