From nobody Mon Feb 9 20:04:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1628334588; cv=none; d=zohomail.com; s=zohoarc; b=Pkr6wG4yjCQwpuwn77dJW4wDju9EATkwKpRftpxvY0WXMeqmH7aCgqhb8s+rszdOqCW5WhLdQp70+IcSCCZQLfHsWdPmYvIhvmVtbwNYDQlI9/qNKsaBvqXJpWkIFBvpKE03dnKwY9yO19sPx5in6DNp1wnvOfG1ltRXoyzr9Gc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628334588; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=szBGIE3QBxffTDAnfy8t7Wr6ZIyLbiyej1TuYcKCd9c=; b=W2U8pidSvi+reBu94zHSeYwT/i8R6LVz9XdcuoCN4I00WytUzSic6RetbAeeJ5J6R5g/GDxOFs82vquB85k7T5HsJw2WeymKw6ASS0Iq3osHESC1uwiM9+mKlTvP95jQp+CqdbnL54prao1bHs8GgkgKmyCDSG3/ewh64dYZybM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 162833458831746.856645915571676; Sat, 7 Aug 2021 04:09:48 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id m12so14499606wru.12 for ; Sat, 07 Aug 2021 04:09:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id g6sm1312685wmq.42.2021.08.07.04.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 04:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=szBGIE3QBxffTDAnfy8t7Wr6ZIyLbiyej1TuYcKCd9c=; b=jXOpWa+rjOLJ+1AiIu1kT9a4yfCERR1+hsFKQq1fCxAQJeDpNhaK1nF+vNCpWqi2Xg Ds3/+tRNGf1M8rNWxzANnWu7VtR+OGrAgHwtXxRE/wsrxecRmWuWJQIidPxaTLxJmE8G d6l1PcTA7R/1u9uMHavcz7HtExOVLC08TmKdyDimnA4RIG4bDGEHMP8CymLpoV0Re27+ lIR8d1EuLj5TW2ejGOSr4pjay45TvUv6/6b7p2Rp/6xIEJm8y+xLSPHQxte+Am0pDfVt O9nikA9JLB9SKWycZmAmlex90ukRRjlh8idGa9iov4FlGNuUot7zOrBrKKUeuCgPwQMb cnYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=szBGIE3QBxffTDAnfy8t7Wr6ZIyLbiyej1TuYcKCd9c=; b=S/TiTkns2pNVC9JBN9+8cjE3DhdrsZRvS8S3RSfBJrZi5/DUvjznBJNIw4W5A9TkvD AFt3jsmuAN92kVhXm14Kir4MKSArlwXm2AF8yhfA5l8SMoMFtss148IdR+QG/EagNh3r 6qdGD3FfCQQpYtu86Ee2HlmAV5v7c0W0/Ftaoa0zSYEvJg7wJdOi1F5pBbRFASb0wS3l SLn972BnH8NqCLifgyFTKMD0HGmtADyEZwNGE0DXtkmWEcPs4MSxT/WIRlP6MUaAZJtL HaSkS+q1zSpCIENayhcKN3vocMVbicarmSaprPR0ixCAL2n8NgQwqyGxhyryiFFzc+mM abhw== X-Gm-Message-State: AOAM531g431qhrD8okOLvb4mOe8mbywMcdyMQ65YINCu55aGRMHLhLxU RlHSQQPP8N7e1sMEAsbjMP4= X-Google-Smtp-Source: ABdhPJwKcXeteKvUCk69vR4GI0rI31KAUh5b36Ticr7MG4g7WpD+3eJ9wDL/1RPk66qJ+mCzI7DwhQ== X-Received: by 2002:a5d:6e12:: with SMTP id h18mr15432593wrz.236.1628334586546; Sat, 07 Aug 2021 04:09:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Chris Wulff , Thomas Huth , Marek Vasut , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2 1/2] disas/nios2: Fix style in print_insn_nios2() Date: Sat, 7 Aug 2021 13:09:38 +0200 Message-Id: <20210807110939.95853-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210807110939.95853-1-f4bug@amsat.org> References: <20210807110939.95853-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1628334589632100001 We are going to modify this function, fix its style first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth --- disas/nios2.c | 53 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/disas/nios2.c b/disas/nios2.c index c3e82140c79..d124902ae3e 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; + bfd_byte buffer[INSNLEN]; + int status; =20 - status =3D (*info->read_memory_func) (address, buffer, INSNLEN, info); - if (status =3D=3D 0) - { - unsigned long insn; - if (endianness =3D=3D BFD_ENDIAN_BIG) - insn =3D (unsigned long) bfd_getb32 (buffer); - else - insn =3D (unsigned long) bfd_getl32 (buffer); - return nios2_disassemble (address, insn, info); + status =3D (*info->read_memory_func)(address, buffer, INSNLEN, info); + if (status =3D=3D 0) { + unsigned long insn; + if (endianness =3D=3D BFD_ENDIAN_BIG) { + insn =3D (unsigned long) bfd_getb32(buffer); + } else { + insn =3D (unsigned long) bfd_getl32(buffer); + } + return nios2_disassemble(address, insn, info); } =20 - /* We might have a 16-bit R2 instruction at the end of memory. Try that= . */ - if (info->mach =3D=3D bfd_mach_nios2r2) - { - status =3D (*info->read_memory_func) (address, buffer, 2, info); - if (status =3D=3D 0) - { - unsigned long insn; - if (endianness =3D=3D BFD_ENDIAN_BIG) - insn =3D (unsigned long) bfd_getb16 (buffer); - else - insn =3D (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 tha= t. */ + if (info->mach =3D=3D bfd_mach_nios2r2) { + status =3D (*info->read_memory_func)(address, buffer, 2, info); + if (status =3D=3D 0) { + unsigned long insn; + if (endianness =3D=3D BFD_ENDIAN_BIG) { + insn =3D (unsigned long) bfd_getb16(buffer); + } else { + insn =3D (unsigned long) bfd_getl16(buffer); + } + return nios2_disassemble(address, insn, info); + } } =20 - /* 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; } =20 /* These two functions are the main entry points, accessed from --=20 2.31.1 From nobody Mon Feb 9 20:04:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1628334593; cv=none; d=zohomail.com; s=zohoarc; b=BPuHLgvdoTM9eZQOl0X5c4FXEP7dyC5Ny3Yqsab3ttHdZ1GzFyu+16Wg5SqGZ9USUWJ42qelc3OAwe2SOfsPLQLBUcbn1ZGrx30QU9LJ47wG3pq5Lm5DnbuNbhOXJR2BBsmOg4Y5nbQxzqdqd/M1F/MKeh3HfZQlrn6YO+s2HG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628334593; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=//QOsMcD3tFm4ZPkQ7uMXA3J+aZ71YJiTMzd5TccQ1I=; b=Nk0MnIjyZPNSMSOI1qpG3KVA1cjqu8ZT9kMG+DHCBpeXLeKpZraCdyTLyATTQyhQMHeL+2BLDG/B6jREJVV53AbwUvD/Te1ySaJlxiBRKlPGNGDwSvrQVv+KpqZzBpfhmx+XzcqfnDF+UxzwTlTRaY9tovlsMk2x4GArdulPaIY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1628334593923211.49174493290184; Sat, 7 Aug 2021 04:09:53 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id k4so7227810wms.3 for ; Sat, 07 Aug 2021 04:09:53 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id s14sm11091169wmc.25.2021.08.07.04.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 04:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=//QOsMcD3tFm4ZPkQ7uMXA3J+aZ71YJiTMzd5TccQ1I=; b=RhDmz1uznQomJyKYVnhYMy7Ok/vu8/wZRtvJVX/heU5QCYRL9YwNMRN1rdIyDk3T70 t8UYtwjIcjU1ar39zDVEH20BoRzVD0HXnwW9KMSAfyxsgi/IFGbDYTTbL8doVt76xjEv Zy9tAAmm4/WNarCso4TZoTT+1EjCF4mblbSSBIsAAZD1GuGfYRt+vkOnHRauMzJRFEIm Uc8KerqyZgmjOj0mPfgwTYE3EAcRjSR6gMIISmEGL/MzZ9pNLuxz+h68PpW/bfWJ/cYO JisXvKSGP0Ucy0wA/6BN98h1BpvKLGeHNTlwgdb8Qt+o+FZA0mCm2ESZJEJD0U8oMzrJ RFVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=//QOsMcD3tFm4ZPkQ7uMXA3J+aZ71YJiTMzd5TccQ1I=; b=NGygD0eqY23p+J99X1EEX+WoVPR0WXJmfWQbCz8HmmzMrKCdeDRozkK76DIhBLiXe2 1XfwArMW8jTSYZ2Z3y8Anf3W5A0YNMsq84LghyQsr+s3Zgxfwd2JAoWD90bZcB+1WrMN yav0IrONZ40FW4zNSHuVauSVoGQkcBx8wRRJ6V3cJHuNNE15+p5vEjxaO/wGq8LyLhGS jU1ghIU00JuO41JhDFVjgk7eKo1yX5WXQ+ajyYs74+J5yjXy+A48EkuZZJKOUUbi/Cgb ZftFs8D/zyq8QfdEatTlc3cpDgP5KXBCAKxBmRhABwfen9dnWSmZqMK8Z+TzieSw2l5D yGYw== X-Gm-Message-State: AOAM530pFnKyBFFT+86Syj7/47qRO4PNmRiFl6pf0bZ/2G7WvcGLUyeb 3PazRi5aRle0gIDNbjxit5k= X-Google-Smtp-Source: ABdhPJyb136XwUrvi/k/Qrd+S4a564jLDhMo0+P/BV9udVSuUh7pVpGDlcG7VmmYpwdKL7gMDazsHw== X-Received: by 2002:a1c:1dcf:: with SMTP id d198mr24282566wmd.103.1628334591893; Sat, 07 Aug 2021 04:09:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Chris Wulff , Thomas Huth , Marek Vasut , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2 2/2] disas/nios2: Simplify endianess conversion Date: Sat, 7 Aug 2021 13:09:39 +0200 Message-Id: <20210807110939.95853-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210807110939.95853-1-f4bug@amsat.org> References: <20210807110939.95853-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1628334596009100001 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=C3=A9 Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth --- 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_i= nfo*); 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 opc= ode, instruction word at the address given, and prints the disassembled instruction on the stream info->stream using info->fprintf_func. */ =20 -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 =3D (*info->read_memory_func)(address, buffer, INSNLEN, info); if (status =3D=3D 0) { unsigned long insn; - if (endianness =3D=3D BFD_ENDIAN_BIG) { + if (info->endian =3D=3D BFD_ENDIAN_BIG) { insn =3D (unsigned long) bfd_getb32(buffer); } else { insn =3D (unsigned long) bfd_getl32(buffer); @@ -3501,7 +3499,7 @@ print_insn_nios2 (bfd_vma address, disassemble_info *= info, status =3D (*info->read_memory_func)(address, buffer, 2, info); if (status =3D=3D 0) { unsigned long insn; - if (endianness =3D=3D BFD_ENDIAN_BIG) { + if (info->endian =3D=3D BFD_ENDIAN_BIG) { insn =3D (unsigned long) bfd_getb16(buffer); } else { insn =3D (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, di= sassemble_info *info) { /* NOTE: NiosII R2 is not supported yet. */ info->mach =3D bfd_arch_nios2; -#ifdef TARGET_WORDS_BIGENDIAN - info->print_insn =3D print_insn_big_nios2; -#else - info->print_insn =3D print_insn_little_nios2; -#endif + info->print_insn =3D print_insn_nios2; } =20 static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, = int n) --=20 2.31.1