From nobody Fri Nov 7 04:16:31 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 1545991126250131.42295551964867; Fri, 28 Dec 2018 01:58:46 -0800 (PST) Received: from localhost ([127.0.0.1]:58036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcoui-0002hQ-R1 for importer@patchew.org; Fri, 28 Dec 2018 04:58:44 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gconB-0008M8-Fs for qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:51:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcoPD-0003Js-GG for qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:22 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:49264 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 1gcoPC-00036Q-F7 for qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:11 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 924E01A2128; Fri, 28 Dec 2018 10:25:55 +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 609321A20C6; Fri, 28 Dec 2018 10:25:55 +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:23 +0100 Message-Id: <1545989148-13582-17-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 16/41] disas: nanoMIPS: Name some functions in a more descriptive way 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 some functions that have names that are hard to understand. Reviewed-by: Aleksandar Rikalo Reviewed-by: Stefan Markovic Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 112 ++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 32 +++++++-------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index d8829f5..281d8d9 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -687,7 +687,7 @@ uint64 NMD::extract_shift3_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil3il3bs9Fmsb11(uint64 instruction) +uint64 NMD::extract_u_11_10_9_8_7_6_5_4_3__s3(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 3, 9) << 3; @@ -711,7 +711,7 @@ uint64 NMD::extract_rtz3_9_8_7(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil1il1bs17Fmsb17(uint64 instruction) +uint64 NMD::extract_u_17_to_1__s1(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 1, 17) << 1; @@ -771,7 +771,7 @@ uint64 NMD::extract_shift_4_3_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_shiftxil7il1bs4Fmsb4(uint64 instruction) +uint64 NMD::extract_shiftx_10_9_8_7__s1(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 7, 4) << 1; @@ -840,7 +840,7 @@ uint64 NMD::extract_rs_20_19_18_17_16(uint64 instructio= n) } =20 =20 -uint64 NMD::extr_uil1il1bs2Fmsb2(uint64 instruction) +uint64 NMD::extract_u_2_1__s1(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 1, 2) << 1; @@ -938,7 +938,7 @@ uint64 NMD::extract_rs_4_3_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil3il3bs18Fmsb20(uint64 instruction) +uint64 NMD::extract_u_20_to_3__s3(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 3, 18) << 3; @@ -946,7 +946,7 @@ uint64 NMD::extr_uil3il3bs18Fmsb20(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil0il2bs4Fmsb5(uint64 instruction) +uint64 NMD::extract_u_3_2_1_0__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 4) << 2; @@ -962,7 +962,7 @@ uint64 NMD::extract_cofun_25_24_23(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil0il2bs3Fmsb4(uint64 instruction) +uint64 NMD::extract_u_2_1_0__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 3) << 2; @@ -1229,7 +1229,7 @@ uint64 NMD::extract_msbt_10_9_8_7_6(uint64 instructio= n) } =20 =20 -uint64 NMD::extr_uil0il2bs6Fmsb7(uint64 instruction) +uint64 NMD::extract_u_5_4_3_2_1_0__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 6) << 2; @@ -1263,7 +1263,7 @@ uint64 NMD::extract_rs3_6_5_4(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil0il32bs32Fmsb63(uint64 instruction) +uint64 NMD::extract_u_31_to_0__s32(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 32) << 32; @@ -1311,7 +1311,7 @@ uint64 NMD::extract_op_25_24_23_22_21(uint64 instruct= ion) } =20 =20 -uint64 NMD::extr_uil0il2bs7Fmsb8(uint64 instruction) +uint64 NMD::extract_u_6_5_4_3_2_1_0__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 7) << 2; @@ -1343,7 +1343,7 @@ uint64 NMD::extract_eu_3_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil4il4bs4Fmsb7(uint64 instruction) +uint64 NMD::extract_u_7_6_5_4__s4(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 4, 4) << 4; @@ -1387,7 +1387,7 @@ uint64 NMD::extract_u_20_19_18_17_16_15_14_13(uint64 = instruction) } =20 =20 -uint64 NMD::extr_uil2il2bs16Fmsb17(uint64 instruction) +uint64 NMD::extract_u_17_to_2__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 2, 16) << 2; @@ -1437,7 +1437,7 @@ uint64 NMD::extract_u_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil3il3bs1_il8il2bs1Fmsb3(uint64 instruction) +uint64 NMD::extract_u_3_8__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 3, 1) << 3; @@ -1454,7 +1454,7 @@ uint64 NMD::extract_fd_10_9_8_7_6(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil0il2bs5Fmsb6(uint64 instruction) +uint64 NMD::extract_u_4_3_2_1_0__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 5) << 2; @@ -1487,7 +1487,7 @@ uint64 NMD::extract_ct_25_24_23_22_21(uint64 instruct= ion) } =20 =20 -uint64 NMD::extr_uil2il2bs19Fmsb20(uint64 instruction) +uint64 NMD::extract_u_20_to_2__s2(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 2, 19) << 2; @@ -1505,7 +1505,7 @@ int64 NMD::extract_s_4_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_uil0il1bs4Fmsb4(uint64 instruction) +uint64 NMD::extract_u_3_2_1_0__s1(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 0, 4) << 1; @@ -1539,7 +1539,7 @@ bool NMD::BEQC_16__cond(uint64 instruction) { uint64 rs3 =3D extract_rs3_6_5_4(instruction); uint64 rt3 =3D extract_rt3_9_8_7(instruction); - uint64 u =3D extr_uil0il1bs4Fmsb4(instruction); + uint64 u =3D extract_u_3_2_1_0__s1(instruction); return rs3 < rt3 && u !=3D 0; } =20 @@ -1548,7 +1548,7 @@ bool NMD::BNEC_16__cond(uint64 instruction) { uint64 rs3 =3D extract_rs3_6_5_4(instruction); uint64 rt3 =3D extract_rt3_9_8_7(instruction); - uint64 u =3D extr_uil0il1bs4Fmsb4(instruction); + uint64 u =3D extract_u_3_2_1_0__s1(instruction); return rs3 >=3D rt3 && u !=3D 0; } =20 @@ -1562,7 +1562,7 @@ bool NMD::MOVE_cond(uint64 instruction) =20 bool NMD::P16_BR1_cond(uint64 instruction) { - uint64 u =3D extr_uil0il1bs4Fmsb4(instruction); + uint64 u =3D extract_u_3_2_1_0__s1(instruction); return u !=3D 0; } =20 @@ -1890,7 +1890,7 @@ std::string NMD::ADDIU_GP_B_(uint64 instruction) std::string NMD::ADDIU_GP_W_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil2il2bs19Fmsb20(instruction); + uint64 u_value =3D extract_u_20_to_2__s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -1933,7 +1933,7 @@ std::string NMD::ADDIU_NEG_(uint64 instruction) */ std::string NMD::ADDIU_R1_SP_(uint64 instruction) { - uint64 u_value =3D extr_uil0il2bs6Fmsb7(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)); @@ -1954,7 +1954,7 @@ std::string NMD::ADDIU_R1_SP_(uint64 instruction) */ std::string NMD::ADDIU_R2_(uint64 instruction) { - uint64 u_value =3D extr_uil0il2bs3Fmsb4(instruction); + uint64 u_value =3D extract_u_2_1_0__s2(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 @@ -2874,7 +2874,7 @@ std::string NMD::BC2NEZC(uint64 instruction) */ std::string NMD::BEQC_16_(uint64 instruction) { - uint64 u_value =3D extr_uil0il1bs4Fmsb4(instruction); + uint64 u_value =3D extract_u_3_2_1_0__s1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 @@ -3160,7 +3160,7 @@ std::string NMD::BLTUC(uint64 instruction) */ std::string NMD::BNEC_16_(uint64 instruction) { - uint64 u_value =3D extr_uil0il1bs4Fmsb4(instruction); + uint64 u_value =3D extract_u_3_2_1_0__s1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 @@ -5795,7 +5795,7 @@ std::string NMD::DLSA(uint64 instruction) std::string NMD::DLUI_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - uint64 u_value =3D extr_uil0il32bs32Fmsb63(instruction); + uint64 u_value =3D extract_u_31_to_0__s32(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8066,7 +8066,7 @@ std::string NMD::LBX(uint64 instruction) std::string NMD::LD_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil3il3bs18Fmsb20(instruction); + uint64 u_value =3D extract_u_20_to_3__s3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8136,7 +8136,7 @@ std::string NMD::LD_U12_(uint64 instruction) std::string NMD::LDC1_GP_(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 u_value =3D extr_uil2il2bs16Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8373,7 +8373,7 @@ std::string NMD::LDXS(uint64 instruction) */ std::string NMD::LH_16_(uint64 instruction) { - uint64 u_value =3D extr_uil1il1bs2Fmsb2(instruction); + uint64 u_value =3D extract_u_2_1__s1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 @@ -8398,7 +8398,7 @@ std::string NMD::LH_16_(uint64 instruction) std::string NMD::LH_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil1il1bs17Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_1__s1(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8491,7 +8491,7 @@ std::string NMD::LHE(uint64 instruction) */ std::string NMD::LHU_16_(uint64 instruction) { - uint64 u_value =3D extr_uil1il1bs2Fmsb2(instruction); + uint64 u_value =3D extract_u_2_1__s1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 @@ -8516,7 +8516,7 @@ std::string NMD::LHU_16_(uint64 instruction) std::string NMD::LHU_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil1il1bs17Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_1__s1(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8941,7 +8941,7 @@ std::string NMD::LUI(uint64 instruction) */ std::string NMD::LW_16_(uint64 instruction) { - uint64 u_value =3D extr_uil0il2bs4Fmsb5(instruction); + uint64 u_value =3D extract_u_3_2_1_0__s2(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 @@ -8967,7 +8967,7 @@ std::string NMD::LW_4X4_(uint64 instruction) { uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); uint64 rt4_value =3D extract_rt4_9_7_6_5(instruction); - uint64 u_value =3D extr_uil3il3bs1_il8il2bs1Fmsb3(instruction); + uint64 u_value =3D extract_u_3_8__s2(instruction); =20 std::string rt4 =3D GPR(encode_gpr4(rt4_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8990,7 +8990,7 @@ std::string NMD::LW_4X4_(uint64 instruction) std::string NMD::LW_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil2il2bs19Fmsb20(instruction); + uint64 u_value =3D extract_u_20_to_2__s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -9011,7 +9011,7 @@ std::string NMD::LW_GP_(uint64 instruction) */ std::string NMD::LW_GP16_(uint64 instruction) { - uint64 u_value =3D extr_uil0il2bs7Fmsb8(instruction); + uint64 u_value =3D extract_u_6_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)); @@ -9058,7 +9058,7 @@ std::string NMD::LW_S9_(uint64 instruction) std::string NMD::LW_SP_(uint64 instruction) { uint64 rt_value =3D extract_rt_9_8_7_6_5(instruction); - uint64 u_value =3D extr_uil0il2bs5Fmsb6(instruction); + uint64 u_value =3D extract_u_4_3_2_1_0__s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -9104,7 +9104,7 @@ std::string NMD::LW_U12_(uint64 instruction) std::string NMD::LWC1_GP_(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 u_value =3D extr_uil2il2bs16Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -9318,7 +9318,7 @@ std::string NMD::LWPC_48_(uint64 instruction) std::string NMD::LWU_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil2il2bs16Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -12329,7 +12329,7 @@ std::string NMD::RESTORE_32_(uint64 instruction) { uint64 count_value =3D extract_count_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil3il3bs9Fmsb11(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3__s3(instruction); uint64 gp_value =3D extract_gp_2(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); @@ -12352,7 +12352,7 @@ std::string NMD::RESTORE_JRC_16_(uint64 instruction) { uint64 count_value =3D extract_count_3_2_1_0(instruction); uint64 rt1_value =3D extract_rtl_11(instruction); - uint64 u_value =3D extr_uil4il4bs4Fmsb7(instruction); + uint64 u_value =3D extract_u_7_6_5_4__s4(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); return img::format("RESTORE.JRC %s%s", u, @@ -12374,7 +12374,7 @@ std::string NMD::RESTORE_JRC_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count_value =3D extract_count_19_18_17_16(instruction); - uint64 u_value =3D extr_uil3il3bs9Fmsb11(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3__s3(instruction); uint64 gp_value =3D extract_gp_2(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); @@ -12396,7 +12396,7 @@ std::string NMD::RESTORE_JRC_32_(uint64 instruction) std::string NMD::RESTOREF(uint64 instruction) { uint64 count_value =3D extract_count_19_18_17_16(instruction); - uint64 u_value =3D extr_uil3il3bs9Fmsb11(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3__s3(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); std::string count =3D IMMEDIATE(copy(count_value)); @@ -12511,7 +12511,7 @@ std::string NMD::ROTX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); - uint64 shiftx_value =3D extr_shiftxil7il1bs4Fmsb4(instruction); + uint64 shiftx_value =3D extract_shiftx_10_9_8_7__s1(instruction); uint64 stripe_value =3D extract_stripe_6(instruction); uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 @@ -12672,7 +12672,7 @@ std::string NMD::SAVE_16_(uint64 instruction) { uint64 count_value =3D extract_count_3_2_1_0(instruction); uint64 rt1_value =3D extract_rtl_11(instruction); - uint64 u_value =3D extr_uil4il4bs4Fmsb7(instruction); + uint64 u_value =3D extract_u_7_6_5_4__s4(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); return img::format("SAVE %s%s", u, @@ -12694,7 +12694,7 @@ std::string NMD::SAVE_32_(uint64 instruction) { uint64 count_value =3D extract_count_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil3il3bs9Fmsb11(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3__s3(instruction); uint64 gp_value =3D extract_gp_2(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); @@ -12716,7 +12716,7 @@ std::string NMD::SAVE_32_(uint64 instruction) std::string NMD::SAVEF(uint64 instruction) { uint64 count_value =3D extract_count_19_18_17_16(instruction); - uint64 u_value =3D extr_uil3il3bs9Fmsb11(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3__s3(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); std::string count =3D IMMEDIATE(copy(count_value)); @@ -13024,7 +13024,7 @@ std::string NMD::SCWPE(uint64 instruction) std::string NMD::SD_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil3il3bs18Fmsb20(instruction); + uint64 u_value =3D extract_u_20_to_3__s3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -13134,7 +13134,7 @@ std::string NMD::SDBBP_32_(uint64 instruction) std::string NMD::SDC1_GP_(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 u_value =3D extr_uil2il2bs16Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -13584,7 +13584,7 @@ std::string NMD::SEQI(uint64 instruction) std::string NMD::SH_16_(uint64 instruction) { uint64 rtz3_value =3D extract_rtz3_9_8_7(instruction); - uint64 u_value =3D extr_uil1il1bs2Fmsb2(instruction); + uint64 u_value =3D extract_u_2_1__s1(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); @@ -13608,7 +13608,7 @@ std::string NMD::SH_16_(uint64 instruction) std::string NMD::SH_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil1il1bs17Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_1__s1(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15158,7 +15158,7 @@ std::string NMD::SUBUH_R_QB(uint64 instruction) std::string NMD::SW_16_(uint64 instruction) { uint64 rtz3_value =3D extract_rtz3_9_8_7(instruction); - uint64 u_value =3D extr_uil0il2bs4Fmsb5(instruction); + uint64 u_value =3D extract_u_3_2_1_0__s2(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); @@ -15183,7 +15183,7 @@ std::string NMD::SW_4X4_(uint64 instruction) { uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); uint64 rtz4_value =3D extract_rtz4_9_7_6_5(instruction); - uint64 u_value =3D extr_uil3il3bs1_il8il2bs1Fmsb3(instruction); + uint64 u_value =3D extract_u_3_8__s2(instruction); =20 std::string rtz4 =3D GPR(encode_gpr4_zero(rtz4_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15206,7 +15206,7 @@ std::string NMD::SW_4X4_(uint64 instruction) std::string NMD::SW_GP16_(uint64 instruction) { uint64 rtz3_value =3D extract_rtz3_9_8_7(instruction); - uint64 u_value =3D extr_uil0il2bs7Fmsb8(instruction); + uint64 u_value =3D extract_u_6_5_4_3_2_1_0__s2(instruction); =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15228,7 +15228,7 @@ std::string NMD::SW_GP16_(uint64 instruction) std::string NMD::SW_GP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extr_uil2il2bs19Fmsb20(instruction); + uint64 u_value =3D extract_u_20_to_2__s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15274,7 +15274,7 @@ std::string NMD::SW_S9_(uint64 instruction) std::string NMD::SW_SP_(uint64 instruction) { uint64 rt_value =3D extract_rt_9_8_7_6_5(instruction); - uint64 u_value =3D extr_uil0il2bs5Fmsb6(instruction); + uint64 u_value =3D extract_u_4_3_2_1_0__s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15320,7 +15320,7 @@ std::string NMD::SW_U12_(uint64 instruction) std::string NMD::SWC1_GP_(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 u_value =3D extr_uil2il2bs16Fmsb17(instruction); + uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); diff --git a/disas/nanomips.h b/disas/nanomips.h index f04a1a8..d3722f6 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -218,7 +218,7 @@ private: uint64 extract_shift_20_19_18_17_16(uint64 instruction); uint64 extract_shift_10_9_8_7_6(uint64 instruction); uint64 extract_shiftx_11_10_9_8_7_6(uint64 instruction); - uint64 extr_shiftxil7il1bs4Fmsb4(uint64 instruction); + uint64 extract_shiftx_10_9_8_7__s1(uint64 instruction); uint64 extract_size_20_19_18_17_16(uint64 instruction); uint64 extract_stripe_6(uint64 instruction); uint64 extract_stype_20_19_18_17_16(uint64 instruction); @@ -227,24 +227,24 @@ private: uint64 extract_u_15_to_0(uint64 instruction); uint64 extract_u_17_to_0(uint64 instruction); uint64 extract_u_1_0(uint64 instruction); - uint64 extr_uil0il1bs4Fmsb4(uint64 instruction); - uint64 extr_uil0il2bs3Fmsb4(uint64 instruction); - uint64 extr_uil0il2bs4Fmsb5(uint64 instruction); - uint64 extr_uil0il2bs5Fmsb6(uint64 instruction); - uint64 extr_uil0il2bs6Fmsb7(uint64 instruction); - uint64 extr_uil0il2bs7Fmsb8(uint64 instruction); - uint64 extr_uil0il32bs32Fmsb63(uint64 instruction); + uint64 extract_u_3_2_1_0__s1(uint64 instruction); + uint64 extract_u_2_1_0__s2(uint64 instruction); + uint64 extract_u_3_2_1_0__s2(uint64 instruction); + uint64 extract_u_4_3_2_1_0__s2(uint64 instruction); + uint64 extract_u_5_4_3_2_1_0__s2(uint64 instruction); + uint64 extract_u_6_5_4_3_2_1_0__s2(uint64 instruction); + uint64 extract_u_31_to_0__s32(uint64 instruction); uint64 extract_u_10(uint64 instruction); uint64 extract_u_17_16_15_14_13_12_11(uint64 instruction); uint64 extract_u_20_19_18_17_16_15_14_13(uint64 instruction); - uint64 extr_uil1il1bs17Fmsb17(uint64 instruction); - uint64 extr_uil1il1bs2Fmsb2(uint64 instruction); - uint64 extr_uil2il2bs16Fmsb17(uint64 instruction); - uint64 extr_uil2il2bs19Fmsb20(uint64 instruction); - uint64 extr_uil3il3bs18Fmsb20(uint64 instruction); - uint64 extr_uil3il3bs1_il8il2bs1Fmsb3(uint64 instruction); - uint64 extr_uil3il3bs9Fmsb11(uint64 instruction); - uint64 extr_uil4il4bs4Fmsb7(uint64 instruction); + uint64 extract_u_17_to_1__s1(uint64 instruction); + uint64 extract_u_2_1__s1(uint64 instruction); + uint64 extract_u_17_to_2__s2(uint64 instruction); + uint64 extract_u_20_to_2__s2(uint64 instruction); + uint64 extract_u_20_to_3__s3(uint64 instruction); + uint64 extract_u_3_8__s2(uint64 instruction); + uint64 extract_u_11_10_9_8_7_6_5_4_3__s3(uint64 instruction); + uint64 extract_u_7_6_5_4__s4(uint64 instruction); =20 bool ADDIU_32__cond(uint64 instruction); bool ADDIU_RS5__cond(uint64 instruction); --=20 2.7.4