From nobody Fri Nov 7 04:18:49 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 1546269831049705.9847024376869; Mon, 31 Dec 2018 07:23:51 -0800 (PST) Received: from localhost ([127.0.0.1]:51204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdzPx-0007mp-HE for importer@patchew.org; Mon, 31 Dec 2018 10:23:49 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdz1H-0005qS-D3 for qemu-devel@nongnu.org; Mon, 31 Dec 2018 09:58:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdz19-00045h-9D for qemu-devel@nongnu.org; Mon, 31 Dec 2018 09:58:15 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:60627 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 1gdz18-0003rf-KI for qemu-devel@nongnu.org; Mon, 31 Dec 2018 09:58:11 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id C96081A211E; Mon, 31 Dec 2018 15:56:48 +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 9C38D1A2117; Mon, 31 Dec 2018 15:56:48 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Mon, 31 Dec 2018 15:56:21 +0100 Message-Id: <1546268200-26966-26-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546268200-26966-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1546268200-26966-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 v2 25/44] disas: nanoMIPS: Rename the decoder of 'gpr3' 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 'gpr3' gpr encoding type in nanoMIPS disassembler. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 96 +++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index e9018ea..2856645 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -296,7 +296,7 @@ uint64 NMD::renumber_registers(uint64 index, uint64 *re= gister_list, * decode sections so they are based on the encode, the equivalent decode * functions need writing eventually. */ -uint64 NMD::encode_gpr3(uint64 d) +uint64 NMD::decode_gpr_gpr3(uint64 d) { static uint64 register_list[] =3D { 16, 17, 18, 19, 4, 5, 6, 7 }; return renumber_registers(d, register_list, @@ -381,14 +381,14 @@ int64 NMD::neg_copy(int64 d) /* strange wrapper around gpr3 */ uint64 NMD::encode_rs3_and_check_rs3_ge_rt3(uint64 d) { -return encode_gpr3(d); +return decode_gpr_gpr3(d); } =20 =20 /* strange wrapper around gpr3 */ uint64 NMD::encode_rs3_and_check_rs3_lt_rt3(uint64 d) { - return encode_gpr3(d); + return decode_gpr_gpr3(d); } =20 =20 @@ -1936,7 +1936,7 @@ std::string NMD::ADDIU_R1_SP_(uint64 instruction) uint64 u_value =3D extract_u_5_4_3_2_1_0__s2(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); =20 return img::format("ADDIU %s, $%d, %s", rt3, 29, u); @@ -1958,8 +1958,8 @@ std::string NMD::ADDIU_R2_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 u_value =3D extract_u_2_1_0__s2(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); std::string u =3D IMMEDIATE(copy(u_value)); =20 return img::format("ADDIU %s, %s, %s", rt3, rs3, u); @@ -2239,9 +2239,9 @@ std::string NMD::ADDU_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 rd3_value =3D extract_rd3_3_2_1(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); - std::string rd3 =3D GPR(encode_gpr3(rd3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); + std::string rd3 =3D GPR(decode_gpr_gpr3(rd3_value)); =20 return img::format("ADDU %s, %s, %s", rd3, rs3, rt3); } @@ -2498,8 +2498,8 @@ std::string NMD::AND_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("AND %s, %s", rs3, rt3); } @@ -2544,8 +2544,8 @@ std::string NMD::ANDI_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 eu_value =3D extract_eu_3_2_1_0(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); std::string eu =3D IMMEDIATE(encode_eu_from_u_andi16(eu_value)); =20 return img::format("ANDI %s, %s, %s", rt3, rs3, eu); @@ -2879,7 +2879,7 @@ std::string NMD::BEQC_16_(uint64 instruction) uint64 u_value =3D extract_u_3_2_1_0__s1(instruction); =20 std::string rs3 =3D GPR(encode_rs3_and_check_rs3_lt_rt3(rs3_value)); - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D ADDRESS(encode_u_from_address(u_value), 2); =20 return img::format("BEQC %s, %s, %s", rs3, rt3, u); @@ -2949,7 +2949,7 @@ std::string NMD::BEQZC_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); int64 s_value =3D extract_s__se7_0_6_5_4_3_2_1_s1(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 2); =20 return img::format("BEQZC %s, %s", rt3, s); @@ -3165,7 +3165,7 @@ std::string NMD::BNEC_16_(uint64 instruction) uint64 u_value =3D extract_u_3_2_1_0__s1(instruction); =20 std::string rs3 =3D GPR(encode_rs3_and_check_rs3_ge_rt3(rs3_value)); - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D ADDRESS(encode_u_from_address(u_value), 2); =20 return img::format("BNEC %s, %s, %s", rs3, rt3, u); @@ -3235,7 +3235,7 @@ std::string NMD::BNEZC_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); int64 s_value =3D extract_s__se7_0_6_5_4_3_2_1_s1(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 2); =20 return img::format("BNEZC %s, %s", rt3, s); @@ -7785,9 +7785,9 @@ std::string NMD::LB_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 u_value =3D extract_u_1_0(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("LB %s, %s(%s)", rt3, u, rs3); } @@ -7903,9 +7903,9 @@ std::string NMD::LBU_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 u_value =3D extract_u_1_0(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("LBU %s, %s(%s)", rt3, u, rs3); } @@ -8377,9 +8377,9 @@ std::string NMD::LH_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 u_value =3D extract_u_2_1__s1(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("LH %s, %s(%s)", rt3, u, rs3); } @@ -8495,9 +8495,9 @@ std::string NMD::LHU_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 u_value =3D extract_u_2_1__s1(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("LHU %s, %s(%s)", rt3, u, rs3); } @@ -8708,7 +8708,7 @@ std::string NMD::LI_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 eu_value =3D extract_eu_6_5_4_3_2_1_0(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string eu =3D IMMEDIATE(encode_eu_from_s_li16(eu_value)); =20 return img::format("LI %s, %s", rt3, eu); @@ -8945,9 +8945,9 @@ std::string NMD::LW_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 u_value =3D extract_u_3_2_1_0__s2(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("LW %s, %s(%s)", rt3, u, rs3); } @@ -9014,7 +9014,7 @@ std::string NMD::LW_GP16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 u_value =3D extract_u_6_5_4_3_2_1_0__s2(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); =20 return img::format("LW %s, %s($%d)", rt3, u, 28); @@ -9463,9 +9463,9 @@ std::string NMD::LWXS_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 rd3_value =3D extract_rd3_3_2_1(instruction); =20 - std::string rd3 =3D GPR(encode_gpr3(rd3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); - std::string rt3 =3D IMMEDIATE(encode_gpr3(rt3_value)); + std::string rd3 =3D GPR(decode_gpr_gpr3(rd3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); + std::string rt3 =3D IMMEDIATE(decode_gpr_gpr3(rt3_value)); =20 return img::format("LWXS %s, %s(%s)", rd3, rs3, rt3); } @@ -11442,8 +11442,8 @@ std::string NMD::NOT_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("NOT %s, %s", rt3, rs3); } @@ -11464,8 +11464,8 @@ std::string NMD::OR_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); =20 return img::format("OR %s, %s", rs3, rt3); } @@ -12743,7 +12743,7 @@ std::string NMD::SB_16_(uint64 instruction) =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("SB %s, %s(%s)", rtz3, u, rs3); } @@ -13589,7 +13589,7 @@ std::string NMD::SH_16_(uint64 instruction) =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("SH %s, %s(%s)", rtz3, u, rs3); } @@ -14345,8 +14345,8 @@ std::string NMD::SLL_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 shift3_value =3D extract_shift3_2_1_0(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); std::string shift3 =3D IMMEDIATE(encode_shift3_from_shift(shift3_value= )); =20 return img::format("SLL %s, %s, %s", rt3, rs3, shift3); @@ -14649,8 +14649,8 @@ std::string NMD::SRL_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 shift3_value =3D extract_shift3_2_1_0(instruction); =20 - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); std::string shift3 =3D IMMEDIATE(encode_shift3_from_shift(shift3_value= )); =20 return img::format("SRL %s, %s, %s", rt3, rs3, shift3); @@ -14967,9 +14967,9 @@ std::string NMD::SUBU_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(instruction); uint64 rd3_value =3D extract_rd3_3_2_1(instruction); =20 - std::string rd3 =3D GPR(encode_gpr3(rd3_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rd3 =3D GPR(decode_gpr_gpr3(rd3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); =20 return img::format("SUBU %s, %s, %s", rd3, rs3, rt3); } @@ -15163,7 +15163,7 @@ std::string NMD::SW_16_(uint64 instruction) =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 return img::format("SW %s, %s(%s)", rtz3, u, rs3); } @@ -16267,8 +16267,8 @@ std::string NMD::XOR_16_(uint64 instruction) uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 - std::string rs3 =3D GPR(encode_gpr3(rs3_value)); - std::string rt3 =3D GPR(encode_gpr3(rt3_value)); + std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); + std::string rt3 =3D GPR(decode_gpr_gpr3(rt3_value)); =20 return img::format("XOR %s, %s", rs3, rt3); } diff --git a/disas/nanomips.h b/disas/nanomips.h index 86f673c..78f8f9b 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -105,7 +105,7 @@ private: =20 uint64 renumber_registers(uint64 index, uint64 *register_list, size_t register_list_size); - uint64 encode_gpr3(uint64 d); + uint64 decode_gpr_gpr3(uint64 d); uint64 encode_gpr3_store(uint64 d); uint64 encode_rd1_from_rd(uint64 d); uint64 encode_gpr4_zero(uint64 d); --=20 2.7.4