From nobody Fri Nov 7 04:13:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154599075706213.556825371869195; Fri, 28 Dec 2018 01:52:37 -0800 (PST) Received: from localhost ([127.0.0.1]:57955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcool-0002H2-J9 for importer@patchew.org; Fri, 28 Dec 2018 04:52:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcomo-0008M8-TM for qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:50:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcoPM-0003T6-Qz for qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:27:19 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:49632 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gcoPM-0003Ho-GT for qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:20 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 599AE1A215D; Fri, 28 Dec 2018 10:25:56 +0100 (CET) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 209341A2124; Fri, 28 Dec 2018 10:25:56 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Fri, 28 Dec 2018 10:25:35 +0100 Message-Id: <1545989148-13582-29-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545989148-13582-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545989148-13582-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PULL 28/41] disas: nanoMIPS: Rename the decoder of 'gpr4.zero' gpr encoding type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Rename the decoder of 'gpr4.zero' gpr encoding type in nanoMIPS disassembler. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 10 +++++----- disas/nanomips.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index a086f65..66b1223 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -397,7 +397,7 @@ uint64 NMD::encode_rd1_from_rd(uint64 d) } =20 =20 -uint64 NMD::encode_gpr4_zero(uint64 d) +uint64 NMD::decode_gpr_gpr4_zero(uint64 d) { static uint64 register_list[] =3D { 8, 9, 10, 0, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23 }; @@ -10395,7 +10395,7 @@ std::string NMD::MOVE_BALC(uint64 instruction) int64 s_value =3D extract_s__se21_0_20_to_1_s1(instruction); =20 std::string rd1 =3D GPR(encode_rd1_from_rd(rd1_value)); - std::string rtz4 =3D GPR(encode_gpr4_zero(rtz4_value)); + std::string rtz4 =3D GPR(decode_gpr_gpr4_zero(rtz4_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); =20 return img::format("MOVE.BALC %s, %s, %s", rd1, rtz4, s); @@ -10421,8 +10421,8 @@ std::string NMD::MOVEP(uint64 instruction) std::string rd2 =3D GPR(encode_rd2_reg1(rd2_value)); std::string re2 =3D GPR(encode_rd2_reg2(rd2_value)); /* !!!!!!!!!! - no conversion function */ - std::string rsz4 =3D GPR(encode_gpr4_zero(rsz4_value)); - std::string rtz4 =3D GPR(encode_gpr4_zero(rtz4_value)); + std::string rsz4 =3D GPR(decode_gpr_gpr4_zero(rsz4_value)); + std::string rtz4 =3D GPR(decode_gpr_gpr4_zero(rtz4_value)); =20 return img::format("MOVEP %s, %s, %s, %s", rd2, re2, rsz4, rtz4); /* hand edited */ @@ -15288,7 +15288,7 @@ std::string NMD::SW_4X4_(uint64 instruction) uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); uint64 u_value =3D extract_u_3_8__s2(instruction); =20 - std::string rtz4 =3D GPR(encode_gpr4_zero(rtz4_value)); + std::string rtz4 =3D GPR(decode_gpr_gpr4_zero(rtz4_value)); std::string u =3D IMMEDIATE(copy(u_value)); std::string rs4 =3D GPR(decode_gpr_gpr4(rs4_value)); =20 diff --git a/disas/nanomips.h b/disas/nanomips.h index 109b131..c1d3a3b 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -108,7 +108,7 @@ private: uint64 decode_gpr_gpr3(uint64 d); uint64 decode_gpr_gpr3_src_store(uint64 d); uint64 encode_rd1_from_rd(uint64 d); - uint64 encode_gpr4_zero(uint64 d); + uint64 decode_gpr_gpr4_zero(uint64 d); uint64 decode_gpr_gpr4(uint64 d); uint64 encode_rd2_reg1(uint64 d); uint64 encode_rd2_reg2(uint64 d); --=20 2.7.4