From nobody Fri Nov 7 02:31:54 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 1545822605400492.9966568492114; Wed, 26 Dec 2018 03:10:05 -0800 (PST) Received: from localhost ([127.0.0.1]:45503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc74d-0001Eh-UV for importer@patchew.org; Wed, 26 Dec 2018 06:10:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72X-0007yV-PO for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72W-0001s2-Ns for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:53 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:53936 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 1gc72W-0001Cv-Fq for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:52 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 350C61A1E0A; Wed, 26 Dec 2018 12:06:50 +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 1B20E1A1D3B; Wed, 26 Dec 2018 12:06:50 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:09 +0100 Message-Id: <1545822388-10911-2-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 01/20] disas: nanoMIPS: Fix preamble text in nanomips.* files 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Fix several mistakes in preambles of nanomips disassembler source files. Reviewed-by: Stefan Markovic Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 7 ++++--- disas/nanomips.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 1238c2f..f9ef0a2 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1,13 +1,13 @@ /* * Source file for nanoMIPS disassembler component of QEMU * - * Copyright (C) 2018 Wave Computing + * Copyright (C) 2018 Wave Computing, Inc. * Copyright (C) 2018 Matthew Fortune - * Copyright (C) 2018 Aleksandar Markovic + * Copyright (C) 2018 Aleksandar Markovic * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,6 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ =20 extern "C" { diff --git a/disas/nanomips.h b/disas/nanomips.h index 84cc9a6..3df138d 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -1,13 +1,13 @@ /* * Header file for nanoMIPS disassembler component of QEMU * - * Copyright (C) 2018 Wave Computing + * Copyright (C) 2018 Wave Computing, Inc. * Copyright (C) 2018 Matthew Fortune - * Copyright (C) 2018 Aleksandar Markovic + * Copyright (C) 2018 Aleksandar Markovic * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,6 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ =20 #ifndef NANOMIPS_DISASSEMBLER_H --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545823367203203.41186912315266; Wed, 26 Dec 2018 03:22:47 -0800 (PST) Received: from localhost ([127.0.0.1]:45623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Gv-00086X-Jv for importer@patchew.org; Wed, 26 Dec 2018 06:22:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085Z-7f for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72a-0001tr-3x for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:53966 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 1gc72Z-0001Fp-Og for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:56 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 7D3071A1E87; Wed, 26 Dec 2018 12:06:53 +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 5D8181A1D3B; Wed, 26 Dec 2018 12:06:53 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:10 +0100 Message-Id: <1545822388-10911-3-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 02/20] disas: nanoMIPS: Remove functions that are not used 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Some functions were not used at all. Compiler doesn't complain since they are class memebers. Remove them - no future usage is planned. Reviewed-by: Stefan Markovic Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 208 -------------------------------------------------= ---- disas/nanomips.h | 25 ------- 2 files changed, 233 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index f9ef0a2..935c2de 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -852,23 +852,6 @@ uint64 NMD::extract_stripe_6(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil17il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 17, 1); - return value; -} - - -uint64 NMD::extr_xil2il0bs1_il15il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 2, 1); - value |=3D extract_bits(instruction, 15, 1); - return value; -} - - uint64 NMD::extract_ac_13_12(uint64 instruction) { uint64 value =3D 0; @@ -919,14 +902,6 @@ uint64 NMD::extract_shift_5_4_3_2_1_0(uint64 instructi= on) } =20 =20 -uint64 NMD::extr_xil10il0bs6Fmsb5(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 10, 6); - return value; -} - - uint64 NMD::extract_count_19_18_17_16(uint64 instruction) { uint64 value =3D 0; @@ -943,15 +918,6 @@ uint64 NMD::extract_code_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil10il0bs4_il22il0bs4Fmsb3(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 10, 4); - value |=3D extract_bits(instruction, 22, 4); - return value; -} - - uint64 NMD::extract_u_11_10_9_8_7_6_5_4_3_2_1_0(uint64 instruction) { uint64 value =3D 0; @@ -976,14 +942,6 @@ uint64 NMD::extr_uil3il3bs18Fmsb20(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil12il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 12, 1); - return value; -} - - uint64 NMD::extr_uil0il2bs4Fmsb5(uint64 instruction) { uint64 value =3D 0; @@ -1008,14 +966,6 @@ uint64 NMD::extr_uil0il2bs3Fmsb4(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil10il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 10, 1); - return value; -} - - uint64 NMD::extract_rd3_3_2_1(uint64 instruction) { uint64 value =3D 0; @@ -1048,22 +998,6 @@ uint64 NMD::extract_ru_7_6_5_4_3(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil21il0bs5Fmsb4(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 21, 5); - return value; -} - - -uint64 NMD::extr_xil9il0bs3Fmsb2(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 9, 3); - return value; -} - - uint64 NMD::extract_u_17_to_0(uint64 instruction) { uint64 value =3D 0; @@ -1072,15 +1006,6 @@ uint64 NMD::extract_u_17_to_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil14il0bs1_il15il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 14, 1); - value |=3D extract_bits(instruction, 15, 1); - return value; -} - - uint64 NMD::extract_rsz4_4_2_1_0(uint64 instruction) { uint64 value =3D 0; @@ -1090,14 +1015,6 @@ uint64 NMD::extract_rsz4_4_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil24il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 24, 1); - return value; -} - - int64 NMD::extr_sil0il21bs1_il1il1bs20Tmsb21(uint64 instruction) { int64 value =3D 0; @@ -1150,15 +1067,6 @@ int64 NMD::extract_shift_21_20_19_18_17_16(uint64 in= struction) } =20 =20 -uint64 NMD::extr_xil6il0bs3_il10il0bs1Fmsb2(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 6, 3); - value |=3D extract_bits(instruction, 10, 1); - return value; -} - - uint64 NMD::extract_rd2_3_8(uint64 instruction) { uint64 value =3D 0; @@ -1168,14 +1076,6 @@ uint64 NMD::extract_rd2_3_8(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil16il0bs5Fmsb4(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 16, 5); - return value; -} - - uint64 NMD::extract_code_17_to_0(uint64 instruction) { uint64 value =3D 0; @@ -1184,14 +1084,6 @@ uint64 NMD::extract_code_17_to_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil0il0bs12Fmsb11(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 0, 12); - return value; -} - - uint64 NMD::extract_size_20_19_18_17_16(uint64 instruction) { uint64 value =3D 0; @@ -1260,15 +1152,6 @@ uint64 NMD::extract_hs_20_19_18_17_16(uint64 instruc= tion) } =20 =20 -uint64 NMD::extr_xil10il0bs1_il14il0bs2Fmsb1(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 10, 1); - value |=3D extract_bits(instruction, 14, 2); - return value; -} - - uint64 NMD::extract_sel_13_12_11(uint64 instruction) { uint64 value =3D 0; @@ -1285,14 +1168,6 @@ uint64 NMD::extract_lsb_4_3_2_1_0(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil14il0bs2Fmsb1(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 14, 2); - return value; -} - - uint64 NMD::extract_gp_2(uint64 instruction) { uint64 value =3D 0; @@ -1333,14 +1208,6 @@ uint64 NMD::extract_cs_20_19_18_17_16(uint64 instruc= tion) } =20 =20 -uint64 NMD::extr_xil16il0bs10Fmsb9(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 16, 10); - return value; -} - - uint64 NMD::extract_rt4_9_7_6_5(uint64 instruction) { uint64 value =3D 0; @@ -1366,14 +1233,6 @@ uint64 NMD::extr_uil0il2bs6Fmsb7(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil17il0bs9Fmsb8(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 17, 9); - return value; -} - - uint64 NMD::extract_sa_15_14_13(uint64 instruction) { uint64 value =3D 0; @@ -1464,15 +1323,6 @@ uint64 NMD::extract_bit_16_15_14_13_12_11(uint64 ins= truction) } =20 =20 -uint64 NMD::extr_xil10il0bs1_il11il0bs5Fmsb4(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 10, 1); - value |=3D extract_bits(instruction, 11, 5); - return value; -} - - uint64 NMD::extract_mask_20_19_18_17_16_15_14(uint64 instruction) { uint64 value =3D 0; @@ -1533,22 +1383,6 @@ uint64 NMD::extract_u_20_19_18_17_16_15_14_13(uint64= instruction) } =20 =20 -uint64 NMD::extr_xil15il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 15, 1); - return value; -} - - -uint64 NMD::extr_xil11il0bs5Fmsb4(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 11, 5); - return value; -} - - uint64 NMD::extr_uil2il2bs16Fmsb17(uint64 instruction) { uint64 value =3D 0; @@ -1591,15 +1425,6 @@ int64 NMD::extr_sil0il25bs1_il1il1bs24Tmsb25(uint64 = instruction) } =20 =20 -uint64 NMD::extr_xil0il0bs3_il4il0bs1Fmsb2(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 0, 3); - value |=3D extract_bits(instruction, 4, 1); - return value; -} - - uint64 NMD::extract_u_1_0(uint64 instruction) { uint64 value =3D 0; @@ -1617,15 +1442,6 @@ uint64 NMD::extr_uil3il3bs1_il8il2bs1Fmsb3(uint64 in= struction) } =20 =20 -uint64 NMD::extr_xil9il0bs3_il16il0bs5Fmsb4(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 9, 3); - value |=3D extract_bits(instruction, 16, 5); - return value; -} - - uint64 NMD::extract_fd_10_9_8_7_6(uint64 instruction) { uint64 value =3D 0; @@ -1634,14 +1450,6 @@ uint64 NMD::extract_fd_10_9_8_7_6(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil6il0bs3Fmsb2(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 6, 3); - return value; -} - - uint64 NMD::extr_uil0il2bs5Fmsb6(uint64 instruction) { uint64 value =3D 0; @@ -1675,14 +1483,6 @@ uint64 NMD::extract_ct_25_24_23_22_21(uint64 instruc= tion) } =20 =20 -uint64 NMD::extr_xil11il0bs1Fmsb0(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 11, 1); - return value; -} - - uint64 NMD::extr_uil2il2bs19Fmsb20(uint64 instruction) { uint64 value =3D 0; @@ -1709,14 +1509,6 @@ uint64 NMD::extr_uil0il1bs4Fmsb4(uint64 instruction) } =20 =20 -uint64 NMD::extr_xil9il0bs2Fmsb1(uint64 instruction) -{ - uint64 value =3D 0; - value |=3D extract_bits(instruction, 9, 2); - return value; -} - - =20 bool NMD::ADDIU_32__cond(uint64 instruction) { diff --git a/disas/nanomips.h b/disas/nanomips.h index 3df138d..611eeeb 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -245,31 +245,6 @@ private: uint64 extr_uil3il3bs1_il8il2bs1Fmsb3(uint64 instruction); uint64 extr_uil3il3bs9Fmsb11(uint64 instruction); uint64 extr_uil4il4bs4Fmsb7(uint64 instruction); - uint64 extr_xil0il0bs12Fmsb11(uint64 instruction); - uint64 extr_xil0il0bs3_il4il0bs1Fmsb2(uint64 instruction); - uint64 extr_xil10il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil10il0bs1_il11il0bs5Fmsb4(uint64 instruction); - uint64 extr_xil10il0bs1_il14il0bs2Fmsb1(uint64 instruction); - uint64 extr_xil10il0bs4_il22il0bs4Fmsb3(uint64 instruction); - uint64 extr_xil10il0bs6Fmsb5(uint64 instruction); - uint64 extr_xil11il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil11il0bs5Fmsb4(uint64 instruction); - uint64 extr_xil12il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil14il0bs1_il15il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil14il0bs2Fmsb1(uint64 instruction); - uint64 extr_xil15il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil16il0bs10Fmsb9(uint64 instruction); - uint64 extr_xil16il0bs5Fmsb4(uint64 instruction); - uint64 extr_xil17il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil17il0bs9Fmsb8(uint64 instruction); - uint64 extr_xil21il0bs5Fmsb4(uint64 instruction); - uint64 extr_xil24il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil2il0bs1_il15il0bs1Fmsb0(uint64 instruction); - uint64 extr_xil6il0bs3Fmsb2(uint64 instruction); - uint64 extr_xil6il0bs3_il10il0bs1Fmsb2(uint64 instruction); - uint64 extr_xil9il0bs2Fmsb1(uint64 instruction); - uint64 extr_xil9il0bs3Fmsb2(uint64 instruction); - uint64 extr_xil9il0bs3_il16il0bs5Fmsb4(uint64 instruction); =20 bool ADDIU_32__cond(uint64 instruction); bool ADDIU_RS5__cond(uint64 instruction); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 154582348322777.33592349353421; Wed, 26 Dec 2018 03:24:43 -0800 (PST) Received: from localhost ([127.0.0.1]:45636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7In-0001ZK-JM for importer@patchew.org; Wed, 26 Dec 2018 06:24:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72h-00088R-7S for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72c-0001vb-5O for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:03 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:53978 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 1gc72b-0001Gx-Fs for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:58 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 93A5F1A1F93; Wed, 26 Dec 2018 12:06: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 656411A1D3B; Wed, 26 Dec 2018 12:06:55 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:11 +0100 Message-Id: <1545822388-10911-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 03/20] disas: nanoMIPS: Fix a function misnomer 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Fix wrong function name. The convention in these files is that names of extraction functions should reflect bit patterns they are extracting. Reviewed-by: Stefan Markovic Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 264 ++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 2 +- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 935c2de..cfad1ec 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1391,7 +1391,7 @@ uint64 NMD::extr_uil2il2bs16Fmsb17(uint64 instruction) } =20 =20 -uint64 NMD::extract_rd_20_19_18_17_16(uint64 instruction) +uint64 NMD::extract_rd_15_14_13_12_11(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 11, 5); @@ -1579,7 +1579,7 @@ bool NMD::PREFE_cond(uint64 instruction) =20 bool NMD::SLTU_cond(uint64 instruction) { - uint64 rd =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd =3D extract_rd_15_14_13_12_11(instruction); return rd !=3D 0; } =20 @@ -1727,7 +1727,7 @@ std::string NMD::ACLR(uint64 instruction) std::string NMD::ADD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2039,7 +2039,7 @@ std::string NMD::ADDIUPC_48_(uint64 instruction) std::string NMD::ADDQ_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2063,7 +2063,7 @@ std::string NMD::ADDQ_PH(uint64 instruction) std::string NMD::ADDQ_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2087,7 +2087,7 @@ std::string NMD::ADDQ_S_PH(uint64 instruction) std::string NMD::ADDQ_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2112,7 +2112,7 @@ std::string NMD::ADDQ_S_W(uint64 instruction) std::string NMD::ADDQH_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2137,7 +2137,7 @@ std::string NMD::ADDQH_PH(uint64 instruction) std::string NMD::ADDQH_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2161,7 +2161,7 @@ std::string NMD::ADDQH_R_PH(uint64 instruction) std::string NMD::ADDQH_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2185,7 +2185,7 @@ std::string NMD::ADDQH_R_W(uint64 instruction) std::string NMD::ADDQH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2209,7 +2209,7 @@ std::string NMD::ADDQH_W(uint64 instruction) std::string NMD::ADDSC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2256,7 +2256,7 @@ std::string NMD::ADDU_16_(uint64 instruction) std::string NMD::ADDU_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2302,7 +2302,7 @@ std::string NMD::ADDU_4X4_(uint64 instruction) std::string NMD::ADDU_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2326,7 +2326,7 @@ std::string NMD::ADDU_PH(uint64 instruction) std::string NMD::ADDU_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2350,7 +2350,7 @@ std::string NMD::ADDU_QB(uint64 instruction) std::string NMD::ADDU_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2374,7 +2374,7 @@ std::string NMD::ADDU_S_PH(uint64 instruction) std::string NMD::ADDU_S_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2399,7 +2399,7 @@ std::string NMD::ADDU_S_QB(uint64 instruction) std::string NMD::ADDUH_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2424,7 +2424,7 @@ std::string NMD::ADDUH_QB(uint64 instruction) std::string NMD::ADDUH_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2447,7 +2447,7 @@ std::string NMD::ADDUH_R_QB(uint64 instruction) std::string NMD::ADDWC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -2514,7 +2514,7 @@ std::string NMD::AND_16_(uint64 instruction) std::string NMD::AND_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -4721,7 +4721,7 @@ std::string NMD::CMP_UN_S(uint64 instruction) std::string NMD::CMPGDU_EQ_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -4745,7 +4745,7 @@ std::string NMD::CMPGDU_EQ_QB(uint64 instruction) std::string NMD::CMPGDU_LE_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -4769,7 +4769,7 @@ std::string NMD::CMPGDU_LE_QB(uint64 instruction) std::string NMD::CMPGDU_LT_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -4793,7 +4793,7 @@ std::string NMD::CMPGDU_LT_QB(uint64 instruction) std::string NMD::CMPGU_EQ_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -4817,7 +4817,7 @@ std::string NMD::CMPGU_EQ_QB(uint64 instruction) std::string NMD::CMPGU_LE_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -4841,7 +4841,7 @@ std::string NMD::CMPGU_LE_QB(uint64 instruction) std::string NMD::CMPGU_LT_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5329,7 +5329,7 @@ std::string NMD::DADDIU_U12_(uint64 instruction) std::string NMD::DADD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5353,7 +5353,7 @@ std::string NMD::DADD(uint64 instruction) std::string NMD::DADDU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5421,7 +5421,7 @@ std::string NMD::DCLZ(uint64 instruction) std::string NMD::DDIV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5445,7 +5445,7 @@ std::string NMD::DDIV(uint64 instruction) std::string NMD::DDIVU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5669,7 +5669,7 @@ std::string NMD::DI(uint64 instruction) std::string NMD::DIV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5741,7 +5741,7 @@ std::string NMD::DIV_S(uint64 instruction) std::string NMD::DIVU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5765,7 +5765,7 @@ std::string NMD::DIVU(uint64 instruction) std::string NMD::DLSA(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 u2_value =3D extract_u2_10_9(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -5905,7 +5905,7 @@ std::string NMD::DMFGC0(uint64 instruction) std::string NMD::DMOD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -5929,7 +5929,7 @@ std::string NMD::DMOD(uint64 instruction) std::string NMD::DMODU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6065,7 +6065,7 @@ std::string NMD::DMT(uint64 instruction) std::string NMD::DMUH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6089,7 +6089,7 @@ std::string NMD::DMUH(uint64 instruction) std::string NMD::DMUHU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6113,7 +6113,7 @@ std::string NMD::DMUHU(uint64 instruction) std::string NMD::DMUL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6137,7 +6137,7 @@ std::string NMD::DMUL(uint64 instruction) std::string NMD::DMULU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6593,7 +6593,7 @@ std::string NMD::DROTR32(uint64 instruction) std::string NMD::DROTRV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6691,7 +6691,7 @@ std::string NMD::DSLL32(uint64 instruction) std::string NMD::DSLLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6763,7 +6763,7 @@ std::string NMD::DSRA32(uint64 instruction) std::string NMD::DSRAV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6835,7 +6835,7 @@ std::string NMD::DSRL32(uint64 instruction) std::string NMD::DSRLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6859,7 +6859,7 @@ std::string NMD::DSRLV(uint64 instruction) std::string NMD::DSUB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -6883,7 +6883,7 @@ std::string NMD::DSUB(uint64 instruction) std::string NMD::DSUBU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -7108,7 +7108,7 @@ std::string NMD::EXTD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -7134,7 +7134,7 @@ std::string NMD::EXTD32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -7449,7 +7449,7 @@ std::string NMD::EXTW(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -7562,7 +7562,7 @@ std::string NMD::FLOOR_W_S(uint64 instruction) std::string NMD::FORK(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8014,7 +8014,7 @@ std::string NMD::LBUE(uint64 instruction) std::string NMD::LBUX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8038,7 +8038,7 @@ std::string NMD::LBUX(uint64 instruction) std::string NMD::LBX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8322,7 +8322,7 @@ std::string NMD::LDPC_48_(uint64 instruction) std::string NMD::LDX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8346,7 +8346,7 @@ std::string NMD::LDX(uint64 instruction) std::string NMD::LDXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8606,7 +8606,7 @@ std::string NMD::LHUE(uint64 instruction) std::string NMD::LHUX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8630,7 +8630,7 @@ std::string NMD::LHUX(uint64 instruction) std::string NMD::LHUXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8654,7 +8654,7 @@ std::string NMD::LHUXS(uint64 instruction) std::string NMD::LHXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8678,7 +8678,7 @@ std::string NMD::LHXS(uint64 instruction) std::string NMD::LHX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -8890,7 +8890,7 @@ std::string NMD::LLWPE(uint64 instruction) std::string NMD::LSA(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 u2_value =3D extract_u2_10_9(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -9384,7 +9384,7 @@ std::string NMD::LWU_U12_(uint64 instruction) std::string NMD::LWUX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -9408,7 +9408,7 @@ std::string NMD::LWUX(uint64 instruction) std::string NMD::LWUXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -9432,7 +9432,7 @@ std::string NMD::LWUXS(uint64 instruction) std::string NMD::LWX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -9480,7 +9480,7 @@ std::string NMD::LWXS_16_(uint64 instruction) std::string NMD::LWXS_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10168,7 +10168,7 @@ std::string NMD::MINA_S(uint64 instruction) std::string NMD::MOD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10192,7 +10192,7 @@ std::string NMD::MOD(uint64 instruction) std::string NMD::MODSUB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10216,7 +10216,7 @@ std::string NMD::MODSUB(uint64 instruction) std::string NMD::MODU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10384,7 +10384,7 @@ std::string NMD::MOVE(uint64 instruction) std::string NMD::MOVN(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10408,7 +10408,7 @@ std::string NMD::MOVN(uint64 instruction) std::string NMD::MOVZ(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10830,7 +10830,7 @@ std::string NMD::MTTR(uint64 instruction) std::string NMD::MUH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10854,7 +10854,7 @@ std::string NMD::MUH(uint64 instruction) std::string NMD::MUHU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10878,7 +10878,7 @@ std::string NMD::MUHU(uint64 instruction) std::string NMD::MUL_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10948,7 +10948,7 @@ std::string NMD::MUL_D(uint64 instruction) std::string NMD::MUL_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -10972,7 +10972,7 @@ std::string NMD::MUL_PH(uint64 instruction) std::string NMD::MUL_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11020,7 +11020,7 @@ std::string NMD::MUL_S(uint64 instruction) std::string NMD::MULEQ_S_W_PHL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11044,7 +11044,7 @@ std::string NMD::MULEQ_S_W_PHL(uint64 instruction) std::string NMD::MULEQ_S_W_PHR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11068,7 +11068,7 @@ std::string NMD::MULEQ_S_W_PHR(uint64 instruction) std::string NMD::MULEU_S_PH_QBL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11092,7 +11092,7 @@ std::string NMD::MULEU_S_PH_QBL(uint64 instruction) std::string NMD::MULEU_S_PH_QBR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11116,7 +11116,7 @@ std::string NMD::MULEU_S_PH_QBR(uint64 instruction) std::string NMD::MULQ_RS_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11140,7 +11140,7 @@ std::string NMD::MULQ_RS_PH(uint64 instruction) std::string NMD::MULQ_RS_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11164,7 +11164,7 @@ std::string NMD::MULQ_RS_W(uint64 instruction) std::string NMD::MULQ_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11188,7 +11188,7 @@ std::string NMD::MULQ_S_PH(uint64 instruction) std::string NMD::MULQ_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11308,7 +11308,7 @@ std::string NMD::MULTU_DSP_(uint64 instruction) std::string NMD::MULU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11412,7 +11412,7 @@ std::string NMD::NOP_32_(uint64 instruction) std::string NMD::NOR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11480,7 +11480,7 @@ std::string NMD::OR_16_(uint64 instruction) std::string NMD::OR_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11528,7 +11528,7 @@ std::string NMD::ORI(uint64 instruction) std::string NMD::PACKRL_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11570,7 +11570,7 @@ std::string NMD::PAUSE(uint64 instruction) std::string NMD::PICK_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11594,7 +11594,7 @@ std::string NMD::PICK_PH(uint64 instruction) std::string NMD::PICK_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11838,7 +11838,7 @@ std::string NMD::PRECEU_PH_QBR(uint64 instruction) std::string NMD::PRECR_QB_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11910,7 +11910,7 @@ std::string NMD::PRECR_SRA_R_PH_W(uint64 instructio= n) std::string NMD::PRECRQ_PH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11934,7 +11934,7 @@ std::string NMD::PRECRQ_PH_W(uint64 instruction) std::string NMD::PRECRQ_QB_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11958,7 +11958,7 @@ std::string NMD::PRECRQ_QB_PH(uint64 instruction) std::string NMD::PRECRQ_RS_PH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -11982,7 +11982,7 @@ std::string NMD::PRECRQ_RS_PH_W(uint64 instruction) std::string NMD::PRECRQU_S_QB_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -12482,7 +12482,7 @@ std::string NMD::ROTR(uint64 instruction) std::string NMD::ROTRV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -12852,7 +12852,7 @@ std::string NMD::SBE(uint64 instruction) std::string NMD::SBX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -13320,7 +13320,7 @@ std::string NMD::SDPC_48_(uint64 instruction) std::string NMD::SDXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -13344,7 +13344,7 @@ std::string NMD::SDXS(uint64 instruction) std::string NMD::SDX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -13838,7 +13838,7 @@ std::string NMD::SHLL_S_W(uint64 instruction) std::string NMD::SHLLV_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -13862,7 +13862,7 @@ std::string NMD::SHLLV_PH(uint64 instruction) std::string NMD::SHLLV_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -13886,7 +13886,7 @@ std::string NMD::SHLLV_QB(uint64 instruction) std::string NMD::SHLLV_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -13910,7 +13910,7 @@ std::string NMD::SHLLV_S_PH(uint64 instruction) std::string NMD::SHLLV_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14054,7 +14054,7 @@ std::string NMD::SHRA_R_W(uint64 instruction) std::string NMD::SHRAV_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14078,7 +14078,7 @@ std::string NMD::SHRAV_PH(uint64 instruction) std::string NMD::SHRAV_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14102,7 +14102,7 @@ std::string NMD::SHRAV_QB(uint64 instruction) std::string NMD::SHRAV_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14126,7 +14126,7 @@ std::string NMD::SHRAV_R_PH(uint64 instruction) std::string NMD::SHRAV_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14150,7 +14150,7 @@ std::string NMD::SHRAV_R_QB(uint64 instruction) std::string NMD::SHRAV_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14222,7 +14222,7 @@ std::string NMD::SHRL_QB(uint64 instruction) std::string NMD::SHRLV_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14246,7 +14246,7 @@ std::string NMD::SHRLV_PH(uint64 instruction) std::string NMD::SHRLV_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14270,7 +14270,7 @@ std::string NMD::SHRLV_QB(uint64 instruction) std::string NMD::SHX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14294,7 +14294,7 @@ std::string NMD::SHX(uint64 instruction) std::string NMD::SHXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14386,7 +14386,7 @@ std::string NMD::SLL_32_(uint64 instruction) std::string NMD::SLLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14410,7 +14410,7 @@ std::string NMD::SLLV(uint64 instruction) std::string NMD::SLT(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14482,7 +14482,7 @@ std::string NMD::SLTIU(uint64 instruction) std::string NMD::SLTU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14506,7 +14506,7 @@ std::string NMD::SLTU(uint64 instruction) std::string NMD::SOV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14618,7 +14618,7 @@ std::string NMD::SRA(uint64 instruction) std::string NMD::SRAV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14690,7 +14690,7 @@ std::string NMD::SRL_32_(uint64 instruction) std::string NMD::SRLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14714,7 +14714,7 @@ std::string NMD::SRLV(uint64 instruction) std::string NMD::SUB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14786,7 +14786,7 @@ std::string NMD::SUB_S(uint64 instruction) std::string NMD::SUBQ_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14811,7 +14811,7 @@ std::string NMD::SUBQ_PH(uint64 instruction) std::string NMD::SUBQ_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14836,7 +14836,7 @@ std::string NMD::SUBQ_S_PH(uint64 instruction) std::string NMD::SUBQ_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14861,7 +14861,7 @@ std::string NMD::SUBQ_S_W(uint64 instruction) std::string NMD::SUBQH_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14886,7 +14886,7 @@ std::string NMD::SUBQH_PH(uint64 instruction) std::string NMD::SUBQH_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14911,7 +14911,7 @@ std::string NMD::SUBQH_R_PH(uint64 instruction) std::string NMD::SUBQH_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14936,7 +14936,7 @@ std::string NMD::SUBQH_R_W(uint64 instruction) std::string NMD::SUBQH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -14984,7 +14984,7 @@ std::string NMD::SUBU_16_(uint64 instruction) std::string NMD::SUBU_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15008,7 +15008,7 @@ std::string NMD::SUBU_32_(uint64 instruction) std::string NMD::SUBU_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15032,7 +15032,7 @@ std::string NMD::SUBU_PH(uint64 instruction) std::string NMD::SUBU_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15056,7 +15056,7 @@ std::string NMD::SUBU_QB(uint64 instruction) std::string NMD::SUBU_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15080,7 +15080,7 @@ std::string NMD::SUBU_S_PH(uint64 instruction) std::string NMD::SUBU_S_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15105,7 +15105,7 @@ std::string NMD::SUBU_S_QB(uint64 instruction) std::string NMD::SUBUH_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15130,7 +15130,7 @@ std::string NMD::SUBUH_QB(uint64 instruction) std::string NMD::SUBUH_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15530,7 +15530,7 @@ std::string NMD::SWPC_48_(uint64 instruction) std::string NMD::SWX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -15554,7 +15554,7 @@ std::string NMD::SWX(uint64 instruction) std::string NMD::SWXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); @@ -16283,7 +16283,7 @@ std::string NMD::XOR_16_(uint64 instruction) std::string NMD::XOR_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); diff --git a/disas/nanomips.h b/disas/nanomips.h index 611eeeb..0089f17 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -191,7 +191,7 @@ private: uint64 extract_rdl_25_24(uint64 instruction); uint64 extract_rd2_3_8(uint64 instruction); uint64 extract_rd3_3_2_1(uint64 instruction); - uint64 extract_rd_20_19_18_17_16(uint64 instruction); + uint64 extract_rd_15_14_13_12_11(uint64 instruction); uint64 extract_rs3_6_5_4(uint64 instruction); uint64 extract_rs4_4_2_1_0(uint64 instruction); uint64 extract_rs_4_3_2_1_0(uint64 instruction); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545823539529288.20400197240076; Wed, 26 Dec 2018 03:25:39 -0800 (PST) Received: from localhost ([127.0.0.1]:45640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Jh-0002Kg-QD for importer@patchew.org; Wed, 26 Dec 2018 06:25:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72r-0008No-Cs for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72d-0001wV-Iw for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:11 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:53984 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 1gc72c-0001Hc-Fx for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:59 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 7EB061A1FA4; Wed, 26 Dec 2018 12:06: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 403E51A1D3B; Wed, 26 Dec 2018 12:06:56 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:12 +0100 Message-Id: <1545822388-10911-5-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 04/20] disas: nanoMIPS: Fix order of some invocations 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Fix order of extraction function invocations so that extraction goes from MSB side to LSB side of the given instruction coding content. This is desireable because of consistency and easier visual spotting of errors. Reviewed-by: Stefan Markovic Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 776 ++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 388 insertions(+), 388 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index cfad1ec..9e87630 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1597,8 +1597,8 @@ bool NMD::SLTU_cond(uint64 instruction) */ std::string NMD::ABS_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string fs =3D FPR(copy(fs_value)); std::string fd =3D FPR(copy(fd_value)); @@ -1619,8 +1619,8 @@ std::string NMD::ABS_D(uint64 instruction) */ std::string NMD::ABS_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string fs =3D FPR(copy(fs_value)); std::string fd =3D FPR(copy(fd_value)); @@ -1727,8 +1727,8 @@ std::string NMD::ACLR(uint64 instruction) std::string NMD::ADD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -1800,8 +1800,8 @@ std::string NMD::ADD_S(uint64 instruction) std::string NMD::ADDIU_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_15_to_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_15_to_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -1907,8 +1907,8 @@ std::string NMD::ADDIU_GP_W_(uint64 instruction) std::string NMD::ADDIU_NEG_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2039,8 +2039,8 @@ std::string NMD::ADDIUPC_48_(uint64 instruction) std::string NMD::ADDQ_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2063,8 +2063,8 @@ std::string NMD::ADDQ_PH(uint64 instruction) std::string NMD::ADDQ_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2087,8 +2087,8 @@ std::string NMD::ADDQ_S_PH(uint64 instruction) std::string NMD::ADDQ_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2112,8 +2112,8 @@ std::string NMD::ADDQ_S_W(uint64 instruction) std::string NMD::ADDQH_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2137,8 +2137,8 @@ std::string NMD::ADDQH_PH(uint64 instruction) std::string NMD::ADDQH_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2161,8 +2161,8 @@ std::string NMD::ADDQH_R_PH(uint64 instruction) std::string NMD::ADDQH_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2185,8 +2185,8 @@ std::string NMD::ADDQH_R_W(uint64 instruction) std::string NMD::ADDQH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2209,8 +2209,8 @@ std::string NMD::ADDQH_W(uint64 instruction) std::string NMD::ADDSC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2256,8 +2256,8 @@ std::string NMD::ADDU_16_(uint64 instruction) std::string NMD::ADDU_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2279,8 +2279,8 @@ std::string NMD::ADDU_32_(uint64 instruction) */ std::string NMD::ADDU_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 rs4_value =3D extract_rs4_4_2_1_0(instruction); =20 std::string rs4 =3D GPR(encode_gpr4(rs4_value)); std::string rt4 =3D GPR(encode_gpr4(rt4_value)); @@ -2302,8 +2302,8 @@ std::string NMD::ADDU_4X4_(uint64 instruction) std::string NMD::ADDU_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2326,8 +2326,8 @@ std::string NMD::ADDU_PH(uint64 instruction) std::string NMD::ADDU_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2350,8 +2350,8 @@ std::string NMD::ADDU_QB(uint64 instruction) std::string NMD::ADDU_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2374,8 +2374,8 @@ std::string NMD::ADDU_S_PH(uint64 instruction) std::string NMD::ADDU_S_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2399,8 +2399,8 @@ std::string NMD::ADDU_S_QB(uint64 instruction) std::string NMD::ADDUH_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2424,8 +2424,8 @@ std::string NMD::ADDUH_QB(uint64 instruction) std::string NMD::ADDUH_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2447,8 +2447,8 @@ std::string NMD::ADDUH_R_QB(uint64 instruction) std::string NMD::ADDWC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2514,8 +2514,8 @@ std::string NMD::AND_16_(uint64 instruction) std::string NMD::AND_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2561,8 +2561,8 @@ std::string NMD::ANDI_16_(uint64 instruction) std::string NMD::ANDI_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -2585,8 +2585,8 @@ std::string NMD::ANDI_32_(uint64 instruction) std::string NMD::APPEND(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -3378,8 +3378,8 @@ std::string NMD::CACHEE(uint64 instruction) */ std::string NMD::CEIL_L_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3400,8 +3400,8 @@ std::string NMD::CEIL_L_D(uint64 instruction) */ std::string NMD::CEIL_L_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3422,8 +3422,8 @@ std::string NMD::CEIL_L_S(uint64 instruction) */ std::string NMD::CEIL_W_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3444,8 +3444,8 @@ std::string NMD::CEIL_W_D(uint64 instruction) */ std::string NMD::CEIL_W_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3466,8 +3466,8 @@ std::string NMD::CEIL_W_S(uint64 instruction) */ std::string NMD::CFC1(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -3488,8 +3488,8 @@ std::string NMD::CFC1(uint64 instruction) */ std::string NMD::CFC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -3510,8 +3510,8 @@ std::string NMD::CFC2(uint64 instruction) */ std::string NMD::CLASS_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3532,8 +3532,8 @@ std::string NMD::CLASS_D(uint64 instruction) */ std::string NMD::CLASS_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3598,9 +3598,9 @@ std::string NMD::CLZ(uint64 instruction) */ std::string NMD::CMP_AF_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3622,9 +3622,9 @@ std::string NMD::CMP_AF_D(uint64 instruction) */ std::string NMD::CMP_AF_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3646,9 +3646,9 @@ std::string NMD::CMP_AF_S(uint64 instruction) */ std::string NMD::CMP_EQ_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3692,9 +3692,9 @@ std::string NMD::CMP_EQ_PH(uint64 instruction) */ std::string NMD::CMP_EQ_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3716,9 +3716,9 @@ std::string NMD::CMP_EQ_S(uint64 instruction) */ std::string NMD::CMP_LE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3762,9 +3762,9 @@ std::string NMD::CMP_LE_PH(uint64 instruction) */ std::string NMD::CMP_LE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3786,9 +3786,9 @@ std::string NMD::CMP_LE_S(uint64 instruction) */ std::string NMD::CMP_LT_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3832,9 +3832,9 @@ std::string NMD::CMP_LT_PH(uint64 instruction) */ std::string NMD::CMP_LT_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3856,9 +3856,9 @@ std::string NMD::CMP_LT_S(uint64 instruction) */ std::string NMD::CMP_NE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3880,9 +3880,9 @@ std::string NMD::CMP_NE_D(uint64 instruction) */ std::string NMD::CMP_NE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3904,9 +3904,9 @@ std::string NMD::CMP_NE_S(uint64 instruction) */ std::string NMD::CMP_OR_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3928,9 +3928,9 @@ std::string NMD::CMP_OR_D(uint64 instruction) */ std::string NMD::CMP_OR_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3952,9 +3952,9 @@ std::string NMD::CMP_OR_S(uint64 instruction) */ std::string NMD::CMP_SAF_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3976,9 +3976,9 @@ std::string NMD::CMP_SAF_D(uint64 instruction) */ std::string NMD::CMP_SAF_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4000,9 +4000,9 @@ std::string NMD::CMP_SAF_S(uint64 instruction) */ std::string NMD::CMP_SEQ_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4024,9 +4024,9 @@ std::string NMD::CMP_SEQ_D(uint64 instruction) */ std::string NMD::CMP_SEQ_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4048,9 +4048,9 @@ std::string NMD::CMP_SEQ_S(uint64 instruction) */ std::string NMD::CMP_SLE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4072,9 +4072,9 @@ std::string NMD::CMP_SLE_D(uint64 instruction) */ std::string NMD::CMP_SLE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4096,9 +4096,9 @@ std::string NMD::CMP_SLE_S(uint64 instruction) */ std::string NMD::CMP_SLT_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4120,9 +4120,9 @@ std::string NMD::CMP_SLT_D(uint64 instruction) */ std::string NMD::CMP_SLT_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4144,9 +4144,9 @@ std::string NMD::CMP_SLT_S(uint64 instruction) */ std::string NMD::CMP_SNE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4168,9 +4168,9 @@ std::string NMD::CMP_SNE_D(uint64 instruction) */ std::string NMD::CMP_SNE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4192,9 +4192,9 @@ std::string NMD::CMP_SNE_S(uint64 instruction) */ std::string NMD::CMP_SOR_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4216,9 +4216,9 @@ std::string NMD::CMP_SOR_D(uint64 instruction) */ std::string NMD::CMP_SOR_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4240,9 +4240,9 @@ std::string NMD::CMP_SOR_S(uint64 instruction) */ std::string NMD::CMP_SUEQ_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4264,9 +4264,9 @@ std::string NMD::CMP_SUEQ_D(uint64 instruction) */ std::string NMD::CMP_SUEQ_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4288,9 +4288,9 @@ std::string NMD::CMP_SUEQ_S(uint64 instruction) */ std::string NMD::CMP_SULE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4312,9 +4312,9 @@ std::string NMD::CMP_SULE_D(uint64 instruction) */ std::string NMD::CMP_SULE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4336,9 +4336,9 @@ std::string NMD::CMP_SULE_S(uint64 instruction) */ std::string NMD::CMP_SULT_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4360,9 +4360,9 @@ std::string NMD::CMP_SULT_D(uint64 instruction) */ std::string NMD::CMP_SULT_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4384,9 +4384,9 @@ std::string NMD::CMP_SULT_S(uint64 instruction) */ std::string NMD::CMP_SUN_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4408,9 +4408,9 @@ std::string NMD::CMP_SUN_D(uint64 instruction) */ std::string NMD::CMP_SUNE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4432,9 +4432,9 @@ std::string NMD::CMP_SUNE_D(uint64 instruction) */ std::string NMD::CMP_SUNE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4456,9 +4456,9 @@ std::string NMD::CMP_SUNE_S(uint64 instruction) */ std::string NMD::CMP_SUN_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4480,9 +4480,9 @@ std::string NMD::CMP_SUN_S(uint64 instruction) */ std::string NMD::CMP_UEQ_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4504,9 +4504,9 @@ std::string NMD::CMP_UEQ_D(uint64 instruction) */ std::string NMD::CMP_UEQ_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4528,9 +4528,9 @@ std::string NMD::CMP_UEQ_S(uint64 instruction) */ std::string NMD::CMP_ULE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4552,9 +4552,9 @@ std::string NMD::CMP_ULE_D(uint64 instruction) */ std::string NMD::CMP_ULE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4576,9 +4576,9 @@ std::string NMD::CMP_ULE_S(uint64 instruction) */ std::string NMD::CMP_ULT_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4600,9 +4600,9 @@ std::string NMD::CMP_ULT_D(uint64 instruction) */ std::string NMD::CMP_ULT_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4624,9 +4624,9 @@ std::string NMD::CMP_ULT_S(uint64 instruction) */ std::string NMD::CMP_UN_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4648,9 +4648,9 @@ std::string NMD::CMP_UN_D(uint64 instruction) */ std::string NMD::CMP_UNE_D(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4672,9 +4672,9 @@ std::string NMD::CMP_UNE_D(uint64 instruction) */ std::string NMD::CMP_UNE_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4696,9 +4696,9 @@ std::string NMD::CMP_UNE_S(uint64 instruction) */ std::string NMD::CMP_UN_S(uint64 instruction) { - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4721,8 +4721,8 @@ std::string NMD::CMP_UN_S(uint64 instruction) std::string NMD::CMPGDU_EQ_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -4745,8 +4745,8 @@ std::string NMD::CMPGDU_EQ_QB(uint64 instruction) std::string NMD::CMPGDU_LE_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -4769,8 +4769,8 @@ std::string NMD::CMPGDU_LE_QB(uint64 instruction) std::string NMD::CMPGDU_LT_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -4793,8 +4793,8 @@ std::string NMD::CMPGDU_LT_QB(uint64 instruction) std::string NMD::CMPGU_EQ_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -4817,8 +4817,8 @@ std::string NMD::CMPGU_EQ_QB(uint64 instruction) std::string NMD::CMPGU_LE_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -4841,8 +4841,8 @@ std::string NMD::CMPGU_LE_QB(uint64 instruction) std::string NMD::CMPGU_LT_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -4950,8 +4950,8 @@ std::string NMD::COP2_1(uint64 instruction) */ std::string NMD::CTC1(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -4972,8 +4972,8 @@ std::string NMD::CTC1(uint64 instruction) */ std::string NMD::CTC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -4994,8 +4994,8 @@ std::string NMD::CTC2(uint64 instruction) */ std::string NMD::CVT_D_L(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5016,8 +5016,8 @@ std::string NMD::CVT_D_L(uint64 instruction) */ std::string NMD::CVT_D_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5038,8 +5038,8 @@ std::string NMD::CVT_D_S(uint64 instruction) */ std::string NMD::CVT_D_W(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5060,8 +5060,8 @@ std::string NMD::CVT_D_W(uint64 instruction) */ std::string NMD::CVT_L_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5082,8 +5082,8 @@ std::string NMD::CVT_L_D(uint64 instruction) */ std::string NMD::CVT_L_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5104,8 +5104,8 @@ std::string NMD::CVT_L_S(uint64 instruction) */ std::string NMD::CVT_S_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5126,8 +5126,8 @@ std::string NMD::CVT_S_D(uint64 instruction) */ std::string NMD::CVT_S_L(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5148,8 +5148,8 @@ std::string NMD::CVT_S_L(uint64 instruction) */ std::string NMD::CVT_S_PL(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5170,8 +5170,8 @@ std::string NMD::CVT_S_PL(uint64 instruction) */ std::string NMD::CVT_S_PU(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5192,8 +5192,8 @@ std::string NMD::CVT_S_PU(uint64 instruction) */ std::string NMD::CVT_S_W(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5214,8 +5214,8 @@ std::string NMD::CVT_S_W(uint64 instruction) */ std::string NMD::CVT_W_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5236,8 +5236,8 @@ std::string NMD::CVT_W_D(uint64 instruction) */ std::string NMD::CVT_W_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5281,8 +5281,8 @@ std::string NMD::DADDIU_48_(uint64 instruction) std::string NMD::DADDIU_NEG_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5305,8 +5305,8 @@ std::string NMD::DADDIU_NEG_(uint64 instruction) std::string NMD::DADDIU_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5329,8 +5329,8 @@ std::string NMD::DADDIU_U12_(uint64 instruction) std::string NMD::DADD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5353,8 +5353,8 @@ std::string NMD::DADD(uint64 instruction) std::string NMD::DADDU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5421,8 +5421,8 @@ std::string NMD::DCLZ(uint64 instruction) std::string NMD::DDIV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5445,8 +5445,8 @@ std::string NMD::DDIV(uint64 instruction) std::string NMD::DDIVU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5487,9 +5487,9 @@ std::string NMD::DERET(uint64 instruction) std::string NMD::DEXTM(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5513,9 +5513,9 @@ std::string NMD::DEXTM(uint64 instruction) std::string NMD::DEXT(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5539,9 +5539,9 @@ std::string NMD::DEXT(uint64 instruction) std::string NMD::DEXTU(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5565,9 +5565,9 @@ std::string NMD::DEXTU(uint64 instruction) std::string NMD::DINSM(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5593,9 +5593,9 @@ std::string NMD::DINSM(uint64 instruction) std::string NMD::DINS(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5621,9 +5621,9 @@ std::string NMD::DINS(uint64 instruction) std::string NMD::DINSU(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5669,8 +5669,8 @@ std::string NMD::DI(uint64 instruction) std::string NMD::DIV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5692,8 +5692,8 @@ std::string NMD::DIV(uint64 instruction) */ std::string NMD::DIV_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -5716,8 +5716,8 @@ std::string NMD::DIV_D(uint64 instruction) */ std::string NMD::DIV_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -5741,8 +5741,8 @@ std::string NMD::DIV_S(uint64 instruction) std::string NMD::DIVU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5765,9 +5765,9 @@ std::string NMD::DIVU(uint64 instruction) std::string NMD::DLSA(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 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 u2_value =3D extract_u2_10_9(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5858,8 +5858,8 @@ std::string NMD::DMFC1(uint64 instruction) */ std::string NMD::DMFC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -5905,8 +5905,8 @@ std::string NMD::DMFGC0(uint64 instruction) std::string NMD::DMOD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5929,8 +5929,8 @@ std::string NMD::DMOD(uint64 instruction) std::string NMD::DMODU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -5998,8 +5998,8 @@ std::string NMD::DMTC1(uint64 instruction) */ std::string NMD::DMTC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -6065,8 +6065,8 @@ std::string NMD::DMT(uint64 instruction) std::string NMD::DMUH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6089,8 +6089,8 @@ std::string NMD::DMUH(uint64 instruction) std::string NMD::DMUHU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6113,8 +6113,8 @@ std::string NMD::DMUHU(uint64 instruction) std::string NMD::DMUL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6137,8 +6137,8 @@ std::string NMD::DMUL(uint64 instruction) std::string NMD::DMULU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6161,8 +6161,8 @@ std::string NMD::DMULU(uint64 instruction) std::string NMD::DPA_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6185,8 +6185,8 @@ std::string NMD::DPA_W_PH(uint64 instruction) std::string NMD::DPAQ_SA_L_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6209,8 +6209,8 @@ std::string NMD::DPAQ_SA_L_W(uint64 instruction) std::string NMD::DPAQ_S_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6233,8 +6233,8 @@ std::string NMD::DPAQ_S_W_PH(uint64 instruction) std::string NMD::DPAQX_SA_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6257,8 +6257,8 @@ std::string NMD::DPAQX_SA_W_PH(uint64 instruction) std::string NMD::DPAQX_S_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6281,8 +6281,8 @@ std::string NMD::DPAQX_S_W_PH(uint64 instruction) std::string NMD::DPAU_H_QBL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6305,8 +6305,8 @@ std::string NMD::DPAU_H_QBL(uint64 instruction) std::string NMD::DPAU_H_QBR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6329,8 +6329,8 @@ std::string NMD::DPAU_H_QBR(uint64 instruction) std::string NMD::DPAX_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6353,8 +6353,8 @@ std::string NMD::DPAX_W_PH(uint64 instruction) std::string NMD::DPS_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6377,8 +6377,8 @@ std::string NMD::DPS_W_PH(uint64 instruction) std::string NMD::DPSQ_SA_L_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6401,8 +6401,8 @@ std::string NMD::DPSQ_SA_L_W(uint64 instruction) std::string NMD::DPSQ_S_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6425,8 +6425,8 @@ std::string NMD::DPSQ_S_W_PH(uint64 instruction) std::string NMD::DPSQX_SA_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6449,8 +6449,8 @@ std::string NMD::DPSQX_SA_W_PH(uint64 instruction) std::string NMD::DPSQX_S_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6473,8 +6473,8 @@ std::string NMD::DPSQX_S_W_PH(uint64 instruction) std::string NMD::DPSU_H_QBL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6497,8 +6497,8 @@ std::string NMD::DPSU_H_QBL(uint64 instruction) std::string NMD::DPSU_H_QBR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6521,8 +6521,8 @@ std::string NMD::DPSU_H_QBR(uint64 instruction) std::string NMD::DPSX_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6545,8 +6545,8 @@ std::string NMD::DPSX_W_PH(uint64 instruction) std::string NMD::DROTR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6569,8 +6569,8 @@ std::string NMD::DROTR(uint64 instruction) std::string NMD::DROTR32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6593,8 +6593,8 @@ std::string NMD::DROTR32(uint64 instruction) std::string NMD::DROTRV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6617,9 +6617,9 @@ std::string NMD::DROTRV(uint64 instruction) std::string NMD::DROTX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_5_4_3_2_1_0(instruction); - uint64 shiftx_value =3D extract_shiftx_11_10_9_8_7_6(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shiftx_value =3D extract_shiftx_11_10_9_8_7_6(instruction); + uint64 shift_value =3D extract_shift_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6643,8 +6643,8 @@ std::string NMD::DROTX(uint64 instruction) std::string NMD::DSLL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6667,8 +6667,8 @@ std::string NMD::DSLL(uint64 instruction) std::string NMD::DSLL32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6691,8 +6691,8 @@ std::string NMD::DSLL32(uint64 instruction) std::string NMD::DSLLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6715,8 +6715,8 @@ std::string NMD::DSLLV(uint64 instruction) std::string NMD::DSRA(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6739,8 +6739,8 @@ std::string NMD::DSRA(uint64 instruction) std::string NMD::DSRA32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6763,8 +6763,8 @@ std::string NMD::DSRA32(uint64 instruction) std::string NMD::DSRAV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6787,8 +6787,8 @@ std::string NMD::DSRAV(uint64 instruction) std::string NMD::DSRL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6811,8 +6811,8 @@ std::string NMD::DSRL(uint64 instruction) std::string NMD::DSRL32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6835,8 +6835,8 @@ std::string NMD::DSRL32(uint64 instruction) std::string NMD::DSRLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6859,8 +6859,8 @@ std::string NMD::DSRLV(uint64 instruction) std::string NMD::DSUB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -6883,8 +6883,8 @@ std::string NMD::DSUB(uint64 instruction) std::string NMD::DSUBU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7108,8 +7108,8 @@ std::string NMD::EXTD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7134,8 +7134,8 @@ std::string NMD::EXTD32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7183,8 +7183,8 @@ std::string NMD::EXTPDP(uint64 instruction) std::string NMD::EXTPDPV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7231,8 +7231,8 @@ std::string NMD::EXTP(uint64 instruction) std::string NMD::EXTPV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7351,8 +7351,8 @@ std::string NMD::EXTR_W(uint64 instruction) std::string NMD::EXTRV_RS_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7375,8 +7375,8 @@ std::string NMD::EXTRV_RS_W(uint64 instruction) std::string NMD::EXTRV_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7399,8 +7399,8 @@ std::string NMD::EXTRV_R_W(uint64 instruction) std::string NMD::EXTRV_S_H(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7423,8 +7423,8 @@ std::string NMD::EXTRV_S_H(uint64 instruction) std::string NMD::EXTRV_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7449,8 +7449,8 @@ std::string NMD::EXTW(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7473,8 +7473,8 @@ std::string NMD::EXTW(uint64 instruction) */ std::string NMD::FLOOR_L_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7495,8 +7495,8 @@ std::string NMD::FLOOR_L_D(uint64 instruction) */ std::string NMD::FLOOR_L_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7517,8 +7517,8 @@ std::string NMD::FLOOR_L_S(uint64 instruction) */ std::string NMD::FLOOR_W_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7539,8 +7539,8 @@ std::string NMD::FLOOR_W_D(uint64 instruction) */ std::string NMD::FLOOR_W_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7562,8 +7562,8 @@ std::string NMD::FLOOR_W_S(uint64 instruction) std::string NMD::FORK(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7848,8 +7848,8 @@ std::string NMD::LB_S9_(uint64 instruction) std::string NMD::LB_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -7966,8 +7966,8 @@ std::string NMD::LBU_S9_(uint64 instruction) std::string NMD::LBU_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8014,8 +8014,8 @@ std::string NMD::LBUE(uint64 instruction) std::string NMD::LBUX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8038,8 +8038,8 @@ std::string NMD::LBUX(uint64 instruction) std::string NMD::LBX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8108,8 +8108,8 @@ std::string NMD::LD_S9_(uint64 instruction) std::string NMD::LD_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8322,8 +8322,8 @@ std::string NMD::LDPC_48_(uint64 instruction) std::string NMD::LDX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8346,8 +8346,8 @@ std::string NMD::LDX(uint64 instruction) std::string NMD::LDXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8440,8 +8440,8 @@ std::string NMD::LH_S9_(uint64 instruction) std::string NMD::LH_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8558,8 +8558,8 @@ std::string NMD::LHU_S9_(uint64 instruction) std::string NMD::LHU_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8606,8 +8606,8 @@ std::string NMD::LHUE(uint64 instruction) std::string NMD::LHUX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8630,8 +8630,8 @@ std::string NMD::LHUX(uint64 instruction) std::string NMD::LHUXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8654,8 +8654,8 @@ std::string NMD::LHUXS(uint64 instruction) std::string NMD::LHXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8678,8 +8678,8 @@ std::string NMD::LHXS(uint64 instruction) std::string NMD::LHX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8794,8 +8794,8 @@ std::string NMD::LLD(uint64 instruction) std::string NMD::LLDP(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ru =3D GPR(copy(ru_value)); @@ -8842,8 +8842,8 @@ std::string NMD::LLE(uint64 instruction) std::string NMD::LLWP(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ru =3D GPR(copy(ru_value)); @@ -8866,8 +8866,8 @@ std::string NMD::LLWP(uint64 instruction) std::string NMD::LLWPE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ru =3D GPR(copy(ru_value)); @@ -9076,8 +9076,8 @@ std::string NMD::LW_SP_(uint64 instruction) std::string NMD::LW_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -9360,8 +9360,8 @@ std::string NMD::LWU_S9_(uint64 instruction) std::string NMD::LWU_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -9384,8 +9384,8 @@ std::string NMD::LWU_U12_(uint64 instruction) std::string NMD::LWUX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9408,8 +9408,8 @@ std::string NMD::LWUX(uint64 instruction) std::string NMD::LWUXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9432,8 +9432,8 @@ std::string NMD::LWUXS(uint64 instruction) std::string NMD::LWX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9455,9 +9455,9 @@ std::string NMD::LWX(uint64 instruction) */ std::string NMD::LWXS_16_(uint64 instruction) { - uint64 rd3_value =3D extract_rd3_3_2_1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(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)); @@ -9480,8 +9480,8 @@ std::string NMD::LWXS_16_(uint64 instruction) std::string NMD::LWXS_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9504,8 +9504,8 @@ std::string NMD::LWXS_32_(uint64 instruction) std::string NMD::MADD_DSP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9527,8 +9527,8 @@ std::string NMD::MADD_DSP_(uint64 instruction) */ std::string NMD::MADDF_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9551,8 +9551,8 @@ std::string NMD::MADDF_D(uint64 instruction) */ std::string NMD::MADDF_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9576,8 +9576,8 @@ std::string NMD::MADDF_S(uint64 instruction) std::string NMD::MADDU_DSP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9600,8 +9600,8 @@ std::string NMD::MADDU_DSP_(uint64 instruction) std::string NMD::MAQ_S_W_PHL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9624,8 +9624,8 @@ std::string NMD::MAQ_S_W_PHL(uint64 instruction) std::string NMD::MAQ_S_W_PHR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9648,8 +9648,8 @@ std::string NMD::MAQ_S_W_PHR(uint64 instruction) std::string NMD::MAQ_SA_W_PHL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9672,8 +9672,8 @@ std::string NMD::MAQ_SA_W_PHL(uint64 instruction) std::string NMD::MAQ_SA_W_PHR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9695,8 +9695,8 @@ std::string NMD::MAQ_SA_W_PHR(uint64 instruction) */ std::string NMD::MAX_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9719,8 +9719,8 @@ std::string NMD::MAX_D(uint64 instruction) */ std::string NMD::MAX_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9743,8 +9743,8 @@ std::string NMD::MAX_S(uint64 instruction) */ std::string NMD::MAXA_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9767,8 +9767,8 @@ std::string NMD::MAXA_D(uint64 instruction) */ std::string NMD::MAXA_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9837,8 +9837,8 @@ std::string NMD::MFC1(uint64 instruction) */ std::string NMD::MFC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -9929,8 +9929,8 @@ std::string NMD::MFHC1(uint64 instruction) */ std::string NMD::MFHC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -10071,8 +10071,8 @@ std::string NMD::MFTR(uint64 instruction) */ std::string NMD::MIN_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10095,8 +10095,8 @@ std::string NMD::MIN_D(uint64 instruction) */ std::string NMD::MIN_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10119,8 +10119,8 @@ std::string NMD::MIN_S(uint64 instruction) */ std::string NMD::MINA_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10143,8 +10143,8 @@ std::string NMD::MINA_D(uint64 instruction) */ std::string NMD::MINA_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10168,8 +10168,8 @@ std::string NMD::MINA_S(uint64 instruction) std::string NMD::MOD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10192,8 +10192,8 @@ std::string NMD::MOD(uint64 instruction) std::string NMD::MODSUB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10216,8 +10216,8 @@ std::string NMD::MODSUB(uint64 instruction) std::string NMD::MODU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10239,8 +10239,8 @@ std::string NMD::MODU(uint64 instruction) */ std::string NMD::MOV_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10261,8 +10261,8 @@ std::string NMD::MOV_D(uint64 instruction) */ std::string NMD::MOV_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10283,9 +10283,9 @@ std::string NMD::MOV_S(uint64 instruction) */ std::string NMD::MOVE_BALC(uint64 instruction) { + uint64 rtz4_value =3D extract_rtz4_27_26_25_23_22_21(instruction); uint64 rd1_value =3D extract_rdl_25_24(instruction); int64 s_value =3D extr_sil0il21bs1_il1il1bs20Tmsb21(instruction); - uint64 rtz4_value =3D extract_rtz4_27_26_25_23_22_21(instruction); =20 std::string rd1 =3D GPR(encode_rd1_from_rd(rd1_value)); std::string rtz4 =3D GPR(encode_gpr4_zero(rtz4_value)); @@ -10384,8 +10384,8 @@ std::string NMD::MOVE(uint64 instruction) std::string NMD::MOVN(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10408,8 +10408,8 @@ std::string NMD::MOVN(uint64 instruction) std::string NMD::MOVZ(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10432,8 +10432,8 @@ std::string NMD::MOVZ(uint64 instruction) std::string NMD::MSUB_DSP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10455,8 +10455,8 @@ std::string NMD::MSUB_DSP_(uint64 instruction) */ std::string NMD::MSUBF_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10479,8 +10479,8 @@ std::string NMD::MSUBF_D(uint64 instruction) */ std::string NMD::MSUBF_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10504,8 +10504,8 @@ std::string NMD::MSUBF_S(uint64 instruction) std::string NMD::MSUBU_DSP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10573,8 +10573,8 @@ std::string NMD::MTC1(uint64 instruction) */ std::string NMD::MTC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -10665,8 +10665,8 @@ std::string NMD::MTHC1(uint64 instruction) */ std::string NMD::MTHC2(uint64 instruction) { - uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); + uint64 cs_value =3D extract_cs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string cs =3D CPR(copy(cs_value)); @@ -10711,8 +10711,8 @@ std::string NMD::MTHGC0(uint64 instruction) */ std::string NMD::MTHI_DSP_(uint64 instruction) { - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rs =3D GPR(copy(rs_value)); std::string ac =3D AC(copy(ac_value)); @@ -10733,8 +10733,8 @@ std::string NMD::MTHI_DSP_(uint64 instruction) */ std::string NMD::MTHLIP(uint64 instruction) { - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rs =3D GPR(copy(rs_value)); std::string ac =3D AC(copy(ac_value)); @@ -10781,8 +10781,8 @@ std::string NMD::MTHTR(uint64 instruction) */ std::string NMD::MTLO_DSP_(uint64 instruction) { - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rs =3D GPR(copy(rs_value)); std::string ac =3D AC(copy(ac_value)); @@ -10830,8 +10830,8 @@ std::string NMD::MTTR(uint64 instruction) std::string NMD::MUH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10854,8 +10854,8 @@ std::string NMD::MUH(uint64 instruction) std::string NMD::MUHU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10878,8 +10878,8 @@ std::string NMD::MUHU(uint64 instruction) std::string NMD::MUL_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10923,8 +10923,8 @@ std::string NMD::MUL_4X4_(uint64 instruction) */ std::string NMD::MUL_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10948,8 +10948,8 @@ std::string NMD::MUL_D(uint64 instruction) std::string NMD::MUL_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10972,8 +10972,8 @@ std::string NMD::MUL_PH(uint64 instruction) std::string NMD::MUL_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -10995,8 +10995,8 @@ std::string NMD::MUL_S_PH(uint64 instruction) */ std::string NMD::MUL_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -11020,8 +11020,8 @@ std::string NMD::MUL_S(uint64 instruction) std::string NMD::MULEQ_S_W_PHL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11044,8 +11044,8 @@ std::string NMD::MULEQ_S_W_PHL(uint64 instruction) std::string NMD::MULEQ_S_W_PHR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11068,8 +11068,8 @@ std::string NMD::MULEQ_S_W_PHR(uint64 instruction) std::string NMD::MULEU_S_PH_QBL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11092,8 +11092,8 @@ std::string NMD::MULEU_S_PH_QBL(uint64 instruction) std::string NMD::MULEU_S_PH_QBR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11116,8 +11116,8 @@ std::string NMD::MULEU_S_PH_QBR(uint64 instruction) std::string NMD::MULQ_RS_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11140,8 +11140,8 @@ std::string NMD::MULQ_RS_PH(uint64 instruction) std::string NMD::MULQ_RS_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11164,8 +11164,8 @@ std::string NMD::MULQ_RS_W(uint64 instruction) std::string NMD::MULQ_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11188,8 +11188,8 @@ std::string NMD::MULQ_S_PH(uint64 instruction) std::string NMD::MULQ_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11212,8 +11212,8 @@ std::string NMD::MULQ_S_W(uint64 instruction) std::string NMD::MULSA_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11236,8 +11236,8 @@ std::string NMD::MULSA_W_PH(uint64 instruction) std::string NMD::MULSAQ_S_W_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11260,8 +11260,8 @@ std::string NMD::MULSAQ_S_W_PH(uint64 instruction) std::string NMD::MULT_DSP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11284,8 +11284,8 @@ std::string NMD::MULT_DSP_(uint64 instruction) std::string NMD::MULTU_DSP_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string ac =3D AC(copy(ac_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11308,8 +11308,8 @@ std::string NMD::MULTU_DSP_(uint64 instruction) std::string NMD::MULU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11331,8 +11331,8 @@ std::string NMD::MULU(uint64 instruction) */ std::string NMD::NEG_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -11353,8 +11353,8 @@ std::string NMD::NEG_D(uint64 instruction) */ std::string NMD::NEG_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -11412,8 +11412,8 @@ std::string NMD::NOP_32_(uint64 instruction) std::string NMD::NOR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11480,8 +11480,8 @@ std::string NMD::OR_16_(uint64 instruction) std::string NMD::OR_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11504,8 +11504,8 @@ std::string NMD::OR_32_(uint64 instruction) std::string NMD::ORI(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11528,8 +11528,8 @@ std::string NMD::ORI(uint64 instruction) std::string NMD::PACKRL_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11570,8 +11570,8 @@ std::string NMD::PAUSE(uint64 instruction) std::string NMD::PICK_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11594,8 +11594,8 @@ std::string NMD::PICK_PH(uint64 instruction) std::string NMD::PICK_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11838,8 +11838,8 @@ std::string NMD::PRECEU_PH_QBR(uint64 instruction) std::string NMD::PRECR_QB_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11910,8 +11910,8 @@ std::string NMD::PRECR_SRA_R_PH_W(uint64 instructio= n) std::string NMD::PRECRQ_PH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11934,8 +11934,8 @@ std::string NMD::PRECRQ_PH_W(uint64 instruction) std::string NMD::PRECRQ_QB_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11958,8 +11958,8 @@ std::string NMD::PRECRQ_QB_PH(uint64 instruction) std::string NMD::PRECRQ_RS_PH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11982,8 +11982,8 @@ std::string NMD::PRECRQ_RS_PH_W(uint64 instruction) std::string NMD::PRECRQU_S_QB_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12005,9 +12005,9 @@ std::string NMD::PRECRQU_S_QB_PH(uint64 instruction) */ std::string NMD::PREF_S9_(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); uint64 hint_value =3D extract_hint_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); =20 std::string hint =3D IMMEDIATE(copy(hint_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12030,8 +12030,8 @@ std::string NMD::PREF_S9_(uint64 instruction) std::string NMD::PREF_U12_(uint64 instruction) { uint64 hint_value =3D extract_hint_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string hint =3D IMMEDIATE(copy(hint_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -12191,8 +12191,8 @@ std::string NMD::RDPGPR(uint64 instruction) */ std::string NMD::RECIP_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12213,8 +12213,8 @@ std::string NMD::RECIP_D(uint64 instruction) */ std::string NMD::RECIP_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12368,8 +12368,8 @@ std::string NMD::RESTORE_JRC_16_(uint64 instruction) */ std::string NMD::RESTORE_JRC_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 count_value =3D extract_count_19_18_17_16(instruction); uint64 u_value =3D extr_uil3il3bs9Fmsb11(instruction); uint64 gp_value =3D extract_gp_2(instruction); =20 @@ -12413,8 +12413,8 @@ std::string NMD::RESTOREF(uint64 instruction) */ std::string NMD::RINT_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12435,8 +12435,8 @@ std::string NMD::RINT_D(uint64 instruction) */ std::string NMD::RINT_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12458,8 +12458,8 @@ std::string NMD::RINT_S(uint64 instruction) std::string NMD::ROTR(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12482,8 +12482,8 @@ std::string NMD::ROTR(uint64 instruction) std::string NMD::ROTRV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12506,10 +12506,10 @@ std::string NMD::ROTRV(uint64 instruction) std::string NMD::ROTX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); + uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); uint64 shiftx_value =3D extr_shiftxil7il1bs4Fmsb4(instruction); uint64 stripe_value =3D extract_stripe_6(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12534,8 +12534,8 @@ std::string NMD::ROTX(uint64 instruction) */ std::string NMD::ROUND_L_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12556,8 +12556,8 @@ std::string NMD::ROUND_L_D(uint64 instruction) */ std::string NMD::ROUND_L_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12578,8 +12578,8 @@ std::string NMD::ROUND_L_S(uint64 instruction) */ std::string NMD::ROUND_W_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12600,8 +12600,8 @@ std::string NMD::ROUND_W_D(uint64 instruction) */ std::string NMD::ROUND_W_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12622,8 +12622,8 @@ std::string NMD::ROUND_W_S(uint64 instruction) */ std::string NMD::RSQRT_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12644,8 +12644,8 @@ std::string NMD::RSQRT_D(uint64 instruction) */ std::string NMD::RSQRT_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12804,8 +12804,8 @@ std::string NMD::SB_S9_(uint64 instruction) std::string NMD::SB_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -12852,8 +12852,8 @@ std::string NMD::SBE(uint64 instruction) std::string NMD::SBX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12924,8 +12924,8 @@ std::string NMD::SCD(uint64 instruction) std::string NMD::SCDP(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ru =3D GPR(copy(ru_value)); @@ -12972,8 +12972,8 @@ std::string NMD::SCE(uint64 instruction) std::string NMD::SCWP(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ru =3D GPR(copy(ru_value)); @@ -12996,8 +12996,8 @@ std::string NMD::SCWP(uint64 instruction) std::string NMD::SCWPE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ru_value =3D extract_ru_7_6_5_4_3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ru =3D GPR(copy(ru_value)); @@ -13066,8 +13066,8 @@ std::string NMD::SD_S9_(uint64 instruction) std::string NMD::SD_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -13320,8 +13320,8 @@ std::string NMD::SDPC_48_(uint64 instruction) std::string NMD::SDXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13344,8 +13344,8 @@ std::string NMD::SDXS(uint64 instruction) std::string NMD::SDX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13411,8 +13411,8 @@ std::string NMD::SEH(uint64 instruction) */ std::string NMD::SEL_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13435,8 +13435,8 @@ std::string NMD::SEL_D(uint64 instruction) */ std::string NMD::SEL_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13459,8 +13459,8 @@ std::string NMD::SEL_S(uint64 instruction) */ std::string NMD::SELEQZ_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13483,8 +13483,8 @@ std::string NMD::SELEQZ_D(uint64 instruction) */ std::string NMD::SELEQZ_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13507,8 +13507,8 @@ std::string NMD::SELEQZ_S(uint64 instruction) */ std::string NMD::SELNEZ_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13531,8 +13531,8 @@ std::string NMD::SELNEZ_D(uint64 instruction) */ std::string NMD::SELNEZ_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13556,8 +13556,8 @@ std::string NMD::SELNEZ_S(uint64 instruction) std::string NMD::SEQI(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13650,8 +13650,8 @@ std::string NMD::SH_S9_(uint64 instruction) std::string NMD::SH_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -13838,8 +13838,8 @@ std::string NMD::SHLL_S_W(uint64 instruction) std::string NMD::SHLLV_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -13862,8 +13862,8 @@ std::string NMD::SHLLV_PH(uint64 instruction) std::string NMD::SHLLV_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -13886,8 +13886,8 @@ std::string NMD::SHLLV_QB(uint64 instruction) std::string NMD::SHLLV_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -13910,8 +13910,8 @@ std::string NMD::SHLLV_S_PH(uint64 instruction) std::string NMD::SHLLV_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14054,8 +14054,8 @@ std::string NMD::SHRA_R_W(uint64 instruction) std::string NMD::SHRAV_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14078,8 +14078,8 @@ std::string NMD::SHRAV_PH(uint64 instruction) std::string NMD::SHRAV_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14102,8 +14102,8 @@ std::string NMD::SHRAV_QB(uint64 instruction) std::string NMD::SHRAV_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14126,8 +14126,8 @@ std::string NMD::SHRAV_R_PH(uint64 instruction) std::string NMD::SHRAV_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14150,8 +14150,8 @@ std::string NMD::SHRAV_R_QB(uint64 instruction) std::string NMD::SHRAV_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14222,8 +14222,8 @@ std::string NMD::SHRL_QB(uint64 instruction) std::string NMD::SHRLV_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14246,8 +14246,8 @@ std::string NMD::SHRLV_PH(uint64 instruction) std::string NMD::SHRLV_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rt =3D GPR(copy(rt_value)); @@ -14270,8 +14270,8 @@ std::string NMD::SHRLV_QB(uint64 instruction) std::string NMD::SHX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14294,8 +14294,8 @@ std::string NMD::SHX(uint64 instruction) std::string NMD::SHXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14362,8 +14362,8 @@ std::string NMD::SLL_16_(uint64 instruction) std::string NMD::SLL_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14386,8 +14386,8 @@ std::string NMD::SLL_32_(uint64 instruction) std::string NMD::SLLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14410,8 +14410,8 @@ std::string NMD::SLLV(uint64 instruction) std::string NMD::SLT(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14434,8 +14434,8 @@ std::string NMD::SLT(uint64 instruction) std::string NMD::SLTI(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14458,8 +14458,8 @@ std::string NMD::SLTI(uint64 instruction) std::string NMD::SLTIU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14482,8 +14482,8 @@ std::string NMD::SLTIU(uint64 instruction) std::string NMD::SLTU(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14506,8 +14506,8 @@ std::string NMD::SLTU(uint64 instruction) std::string NMD::SOV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14549,8 +14549,8 @@ std::string NMD::SPECIAL2(uint64 instruction) */ std::string NMD::SQRT_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -14571,8 +14571,8 @@ std::string NMD::SQRT_D(uint64 instruction) */ std::string NMD::SQRT_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -14618,8 +14618,8 @@ std::string NMD::SRA(uint64 instruction) std::string NMD::SRAV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14666,8 +14666,8 @@ std::string NMD::SRL_16_(uint64 instruction) std::string NMD::SRL_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 shift_value =3D extract_shift_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14690,8 +14690,8 @@ std::string NMD::SRL_32_(uint64 instruction) std::string NMD::SRLV(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14714,8 +14714,8 @@ std::string NMD::SRLV(uint64 instruction) std::string NMD::SUB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14737,8 +14737,8 @@ std::string NMD::SUB(uint64 instruction) */ std::string NMD::SUB_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -14761,8 +14761,8 @@ std::string NMD::SUB_D(uint64 instruction) */ std::string NMD::SUB_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -14786,8 +14786,8 @@ std::string NMD::SUB_S(uint64 instruction) std::string NMD::SUBQ_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14811,8 +14811,8 @@ std::string NMD::SUBQ_PH(uint64 instruction) std::string NMD::SUBQ_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14836,8 +14836,8 @@ std::string NMD::SUBQ_S_PH(uint64 instruction) std::string NMD::SUBQ_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14861,8 +14861,8 @@ std::string NMD::SUBQ_S_W(uint64 instruction) std::string NMD::SUBQH_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14886,8 +14886,8 @@ std::string NMD::SUBQH_PH(uint64 instruction) std::string NMD::SUBQH_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14911,8 +14911,8 @@ std::string NMD::SUBQH_R_PH(uint64 instruction) std::string NMD::SUBQH_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14936,8 +14936,8 @@ std::string NMD::SUBQH_R_W(uint64 instruction) std::string NMD::SUBQH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14959,9 +14959,9 @@ std::string NMD::SUBQH_W(uint64 instruction) */ std::string NMD::SUBU_16_(uint64 instruction) { - uint64 rd3_value =3D extract_rd3_3_2_1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(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)); @@ -14984,8 +14984,8 @@ std::string NMD::SUBU_16_(uint64 instruction) std::string NMD::SUBU_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15008,8 +15008,8 @@ std::string NMD::SUBU_32_(uint64 instruction) std::string NMD::SUBU_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15032,8 +15032,8 @@ std::string NMD::SUBU_PH(uint64 instruction) std::string NMD::SUBU_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15056,8 +15056,8 @@ std::string NMD::SUBU_QB(uint64 instruction) std::string NMD::SUBU_S_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15080,8 +15080,8 @@ std::string NMD::SUBU_S_PH(uint64 instruction) std::string NMD::SUBU_S_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15105,8 +15105,8 @@ std::string NMD::SUBU_S_QB(uint64 instruction) std::string NMD::SUBUH_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15130,8 +15130,8 @@ std::string NMD::SUBUH_QB(uint64 instruction) std::string NMD::SUBUH_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15292,8 +15292,8 @@ std::string NMD::SW_SP_(uint64 instruction) std::string NMD::SW_U12_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15530,8 +15530,8 @@ std::string NMD::SWPC_48_(uint64 instruction) std::string NMD::SWX(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15554,8 +15554,8 @@ std::string NMD::SWX(uint64 instruction) std::string NMD::SWXS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15939,8 +15939,8 @@ std::string NMD::TNE(uint64 instruction) */ std::string NMD::TRUNC_L_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -15961,8 +15961,8 @@ std::string NMD::TRUNC_L_D(uint64 instruction) */ std::string NMD::TRUNC_L_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -15983,8 +15983,8 @@ std::string NMD::TRUNC_L_S(uint64 instruction) */ std::string NMD::TRUNC_W_D(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -16005,8 +16005,8 @@ std::string NMD::TRUNC_W_D(uint64 instruction) */ std::string NMD::TRUNC_W_S(uint64 instruction) { - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -16283,8 +16283,8 @@ std::string NMD::XOR_16_(uint64 instruction) std::string NMD::XOR_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -16307,8 +16307,8 @@ std::string NMD::XOR_32_(uint64 instruction) std::string NMD::XORI(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545822831696955.1325652856094; Wed, 26 Dec 2018 03:13:51 -0800 (PST) Received: from localhost ([127.0.0.1]:45538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc78H-0005wD-VA for importer@patchew.org; Wed, 26 Dec 2018 06:13:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72S-0007v3-6f for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72O-0001mb-UR for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:48 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54561 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 1gc72O-0001lf-Dd for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:44 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 5166D1A2021; Wed, 26 Dec 2018 12:06:57 +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 2CA0D1A1D3B; Wed, 26 Dec 2018 12:06:57 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:13 +0100 Message-Id: <1545822388-10911-6-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 05/20] 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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: 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 9e87630..477df84 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -683,7 +683,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; @@ -707,7 +707,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; @@ -767,7 +767,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; @@ -836,7 +836,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; @@ -934,7 +934,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; @@ -942,7 +942,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; @@ -958,7 +958,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; @@ -1225,7 +1225,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; @@ -1259,7 +1259,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; @@ -1307,7 +1307,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; @@ -1339,7 +1339,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; @@ -1383,7 +1383,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; @@ -1433,7 +1433,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; @@ -1450,7 +1450,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; @@ -1483,7 +1483,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; @@ -1501,7 +1501,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; @@ -1535,7 +1535,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 @@ -1544,7 +1544,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 @@ -1558,7 +1558,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 @@ -1886,7 +1886,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)); @@ -1929,7 +1929,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)); @@ -1950,7 +1950,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 @@ -2870,7 +2870,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 @@ -3156,7 +3156,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 @@ -5791,7 +5791,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)); @@ -8062,7 +8062,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)); @@ -8132,7 +8132,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)); @@ -8369,7 +8369,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 @@ -8394,7 +8394,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)); @@ -8487,7 +8487,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 @@ -8512,7 +8512,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)); @@ -8937,7 +8937,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 @@ -8963,7 +8963,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)); @@ -8986,7 +8986,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)); @@ -9007,7 +9007,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)); @@ -9054,7 +9054,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)); @@ -9100,7 +9100,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)); @@ -9314,7 +9314,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)); @@ -12325,7 +12325,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)); @@ -12348,7 +12348,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, @@ -12370,7 +12370,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)); @@ -12392,7 +12392,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)); @@ -12507,7 +12507,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 @@ -12668,7 +12668,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, @@ -12690,7 +12690,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)); @@ -12712,7 +12712,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)); @@ -13020,7 +13020,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)); @@ -13130,7 +13130,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)); @@ -13580,7 +13580,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)); @@ -13604,7 +13604,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)); @@ -15154,7 +15154,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)); @@ -15179,7 +15179,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)); @@ -15202,7 +15202,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)); @@ -15224,7 +15224,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)); @@ -15270,7 +15270,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)); @@ -15316,7 +15316,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 0089f17..e5b8093 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 From nobody Fri Nov 7 02:31:54 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 1545822792831833.9303330596339; Wed, 26 Dec 2018 03:13:12 -0800 (PST) Received: from localhost ([127.0.0.1]:45536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc77f-0005Dj-B0 for importer@patchew.org; Wed, 26 Dec 2018 06:13:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72S-0007v1-68 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72O-0001mU-Oc for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:48 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54562 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 1gc72O-0001ld-9c for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:44 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 424B31A209E; Wed, 26 Dec 2018 12:06:58 +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 1F0741A1D3B; Wed, 26 Dec 2018 12:06:58 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:14 +0100 Message-Id: <1545822388-10911-7-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 06/20] disas: nanoMIPS: Fix an FP-related misnomer 1 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 NMD::extract_fd_10_9_8_7_6(uint64 instruction) to NMD::extract_fd_15_14_13_12_11(uint64 instruction). Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 142 ++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 2 +- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 477df84..9682725 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1442,7 +1442,7 @@ uint64 NMD::extract_u_3_8__s2(uint64 instruction) } =20 =20 -uint64 NMD::extract_fd_10_9_8_7_6(uint64 instruction) +uint64 NMD::extract_fd_15_14_13_12_11(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 11, 5); @@ -1753,7 +1753,7 @@ std::string NMD::ADD_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -1778,7 +1778,7 @@ std::string NMD::ADD_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3600,7 +3600,7 @@ std::string NMD::CMP_AF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3624,7 +3624,7 @@ std::string NMD::CMP_AF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3648,7 +3648,7 @@ std::string NMD::CMP_EQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3694,7 +3694,7 @@ std::string NMD::CMP_EQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3718,7 +3718,7 @@ std::string NMD::CMP_LE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3764,7 +3764,7 @@ std::string NMD::CMP_LE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3788,7 +3788,7 @@ std::string NMD::CMP_LT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3834,7 +3834,7 @@ std::string NMD::CMP_LT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3858,7 +3858,7 @@ std::string NMD::CMP_NE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3882,7 +3882,7 @@ std::string NMD::CMP_NE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3906,7 +3906,7 @@ std::string NMD::CMP_OR_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3930,7 +3930,7 @@ std::string NMD::CMP_OR_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3954,7 +3954,7 @@ std::string NMD::CMP_SAF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3978,7 +3978,7 @@ std::string NMD::CMP_SAF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4002,7 +4002,7 @@ std::string NMD::CMP_SEQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4026,7 +4026,7 @@ std::string NMD::CMP_SEQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4050,7 +4050,7 @@ std::string NMD::CMP_SLE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4074,7 +4074,7 @@ std::string NMD::CMP_SLE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4098,7 +4098,7 @@ std::string NMD::CMP_SLT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4122,7 +4122,7 @@ std::string NMD::CMP_SLT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4146,7 +4146,7 @@ std::string NMD::CMP_SNE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4170,7 +4170,7 @@ std::string NMD::CMP_SNE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4194,7 +4194,7 @@ std::string NMD::CMP_SOR_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4218,7 +4218,7 @@ std::string NMD::CMP_SOR_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4242,7 +4242,7 @@ std::string NMD::CMP_SUEQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4266,7 +4266,7 @@ std::string NMD::CMP_SUEQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4290,7 +4290,7 @@ std::string NMD::CMP_SULE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4314,7 +4314,7 @@ std::string NMD::CMP_SULE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4338,7 +4338,7 @@ std::string NMD::CMP_SULT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4362,7 +4362,7 @@ std::string NMD::CMP_SULT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4386,7 +4386,7 @@ std::string NMD::CMP_SUN_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4410,7 +4410,7 @@ std::string NMD::CMP_SUNE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4434,7 +4434,7 @@ std::string NMD::CMP_SUNE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4458,7 +4458,7 @@ std::string NMD::CMP_SUN_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4482,7 +4482,7 @@ std::string NMD::CMP_UEQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4506,7 +4506,7 @@ std::string NMD::CMP_UEQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4530,7 +4530,7 @@ std::string NMD::CMP_ULE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4554,7 +4554,7 @@ std::string NMD::CMP_ULE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4578,7 +4578,7 @@ std::string NMD::CMP_ULT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4602,7 +4602,7 @@ std::string NMD::CMP_ULT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4626,7 +4626,7 @@ std::string NMD::CMP_UN_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4650,7 +4650,7 @@ std::string NMD::CMP_UNE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4674,7 +4674,7 @@ std::string NMD::CMP_UNE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -4698,7 +4698,7 @@ std::string NMD::CMP_UN_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5694,7 +5694,7 @@ std::string NMD::DIV_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5718,7 +5718,7 @@ std::string NMD::DIV_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9529,7 +9529,7 @@ std::string NMD::MADDF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9553,7 +9553,7 @@ std::string NMD::MADDF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9697,7 +9697,7 @@ std::string NMD::MAX_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9721,7 +9721,7 @@ std::string NMD::MAX_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9745,7 +9745,7 @@ std::string NMD::MAXA_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9769,7 +9769,7 @@ std::string NMD::MAXA_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10073,7 +10073,7 @@ std::string NMD::MIN_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10097,7 +10097,7 @@ std::string NMD::MIN_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10121,7 +10121,7 @@ std::string NMD::MINA_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10145,7 +10145,7 @@ std::string NMD::MINA_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10457,7 +10457,7 @@ std::string NMD::MSUBF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10481,7 +10481,7 @@ std::string NMD::MSUBF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10925,7 +10925,7 @@ std::string NMD::MUL_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10997,7 +10997,7 @@ std::string NMD::MUL_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13413,7 +13413,7 @@ std::string NMD::SEL_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13437,7 +13437,7 @@ std::string NMD::SEL_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13461,7 +13461,7 @@ std::string NMD::SELEQZ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13485,7 +13485,7 @@ std::string NMD::SELEQZ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13509,7 +13509,7 @@ std::string NMD::SELNEZ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13533,7 +13533,7 @@ std::string NMD::SELNEZ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -14739,7 +14739,7 @@ std::string NMD::SUB_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); @@ -14763,7 +14763,7 @@ std::string NMD::SUB_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); - uint64 fd_value =3D extract_fd_10_9_8_7_6(instruction); + uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); std::string fs =3D FPR(copy(fs_value)); diff --git a/disas/nanomips.h b/disas/nanomips.h index e5b8093..15d3ffd 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -176,7 +176,7 @@ private: uint64 extract_ct_25_24_23_22_21(uint64 instruction); uint64 extract_eu_3_2_1_0(uint64 instruction); uint64 extract_eu_6_5_4_3_2_1_0(uint64 instruction); - uint64 extract_fd_10_9_8_7_6(uint64 instruction); + uint64 extract_fd_15_14_13_12_11(uint64 instruction); uint64 extract_fs_15_14_13_12_11(uint64 instruction); uint64 extract_ft_15_14_13_12_11(uint64 instruction); uint64 extract_ft_20_19_18_17_16(uint64 instruction); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 15458232641001011.9305591863227; Wed, 26 Dec 2018 03:21:04 -0800 (PST) Received: from localhost ([127.0.0.1]:45604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7FF-0005q7-PW for importer@patchew.org; Wed, 26 Dec 2018 06:21:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72V-0007xK-DA for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72Q-0001nk-Gn for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:51 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54624 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 1gc72P-0001mj-RG for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:46 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id DFD201A20CB; Wed, 26 Dec 2018 12:06:59 +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 B177A1A1D3B; Wed, 26 Dec 2018 12:06:59 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:15 +0100 Message-Id: <1545822388-10911-8-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 07/20] disas: nanoMIPS: Fix an FP-related misnomer 2 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 NMD::extract_fs_15_14_13_12_11(uint64 instruction) to NMD::extract_fs_20_19_18_17_16(uint64 instruction). Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 242 ++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 2 +- 2 files changed, 122 insertions(+), 122 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 9682725..8f6db93 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1110,7 +1110,7 @@ uint64 NMD::extract_u_15_to_0(uint64 instruction) } =20 =20 -uint64 NMD::extract_fs_15_14_13_12_11(uint64 instruction) +uint64 NMD::extract_fs_20_19_18_17_16(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 16, 5); @@ -1598,7 +1598,7 @@ bool NMD::SLTU_cond(uint64 instruction) std::string NMD::ABS_D(uint64 instruction) { uint64 fd_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string fs =3D FPR(copy(fs_value)); std::string fd =3D FPR(copy(fd_value)); @@ -1620,7 +1620,7 @@ std::string NMD::ABS_D(uint64 instruction) std::string NMD::ABS_S(uint64 instruction) { uint64 fd_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string fs =3D FPR(copy(fs_value)); std::string fd =3D FPR(copy(fd_value)); @@ -1752,7 +1752,7 @@ std::string NMD::ADD(uint64 instruction) std::string NMD::ADD_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -1777,7 +1777,7 @@ std::string NMD::ADD_D(uint64 instruction) std::string NMD::ADD_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3379,7 +3379,7 @@ std::string NMD::CACHEE(uint64 instruction) std::string NMD::CEIL_L_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3401,7 +3401,7 @@ std::string NMD::CEIL_L_D(uint64 instruction) std::string NMD::CEIL_L_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3423,7 +3423,7 @@ std::string NMD::CEIL_L_S(uint64 instruction) std::string NMD::CEIL_W_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3445,7 +3445,7 @@ std::string NMD::CEIL_W_D(uint64 instruction) std::string NMD::CEIL_W_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3511,7 +3511,7 @@ std::string NMD::CFC2(uint64 instruction) std::string NMD::CLASS_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3533,7 +3533,7 @@ std::string NMD::CLASS_D(uint64 instruction) std::string NMD::CLASS_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -3599,7 +3599,7 @@ std::string NMD::CLZ(uint64 instruction) std::string NMD::CMP_AF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3623,7 +3623,7 @@ std::string NMD::CMP_AF_D(uint64 instruction) std::string NMD::CMP_AF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3647,7 +3647,7 @@ std::string NMD::CMP_AF_S(uint64 instruction) std::string NMD::CMP_EQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3693,7 +3693,7 @@ std::string NMD::CMP_EQ_PH(uint64 instruction) std::string NMD::CMP_EQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3717,7 +3717,7 @@ std::string NMD::CMP_EQ_S(uint64 instruction) std::string NMD::CMP_LE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3763,7 +3763,7 @@ std::string NMD::CMP_LE_PH(uint64 instruction) std::string NMD::CMP_LE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3787,7 +3787,7 @@ std::string NMD::CMP_LE_S(uint64 instruction) std::string NMD::CMP_LT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3833,7 +3833,7 @@ std::string NMD::CMP_LT_PH(uint64 instruction) std::string NMD::CMP_LT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3857,7 +3857,7 @@ std::string NMD::CMP_LT_S(uint64 instruction) std::string NMD::CMP_NE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3881,7 +3881,7 @@ std::string NMD::CMP_NE_D(uint64 instruction) std::string NMD::CMP_NE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3905,7 +3905,7 @@ std::string NMD::CMP_NE_S(uint64 instruction) std::string NMD::CMP_OR_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3929,7 +3929,7 @@ std::string NMD::CMP_OR_D(uint64 instruction) std::string NMD::CMP_OR_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3953,7 +3953,7 @@ std::string NMD::CMP_OR_S(uint64 instruction) std::string NMD::CMP_SAF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -3977,7 +3977,7 @@ std::string NMD::CMP_SAF_D(uint64 instruction) std::string NMD::CMP_SAF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4001,7 +4001,7 @@ std::string NMD::CMP_SAF_S(uint64 instruction) std::string NMD::CMP_SEQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4025,7 +4025,7 @@ std::string NMD::CMP_SEQ_D(uint64 instruction) std::string NMD::CMP_SEQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4049,7 +4049,7 @@ std::string NMD::CMP_SEQ_S(uint64 instruction) std::string NMD::CMP_SLE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4073,7 +4073,7 @@ std::string NMD::CMP_SLE_D(uint64 instruction) std::string NMD::CMP_SLE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4097,7 +4097,7 @@ std::string NMD::CMP_SLE_S(uint64 instruction) std::string NMD::CMP_SLT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4121,7 +4121,7 @@ std::string NMD::CMP_SLT_D(uint64 instruction) std::string NMD::CMP_SLT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4145,7 +4145,7 @@ std::string NMD::CMP_SLT_S(uint64 instruction) std::string NMD::CMP_SNE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4169,7 +4169,7 @@ std::string NMD::CMP_SNE_D(uint64 instruction) std::string NMD::CMP_SNE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4193,7 +4193,7 @@ std::string NMD::CMP_SNE_S(uint64 instruction) std::string NMD::CMP_SOR_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4217,7 +4217,7 @@ std::string NMD::CMP_SOR_D(uint64 instruction) std::string NMD::CMP_SOR_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4241,7 +4241,7 @@ std::string NMD::CMP_SOR_S(uint64 instruction) std::string NMD::CMP_SUEQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4265,7 +4265,7 @@ std::string NMD::CMP_SUEQ_D(uint64 instruction) std::string NMD::CMP_SUEQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4289,7 +4289,7 @@ std::string NMD::CMP_SUEQ_S(uint64 instruction) std::string NMD::CMP_SULE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4313,7 +4313,7 @@ std::string NMD::CMP_SULE_D(uint64 instruction) std::string NMD::CMP_SULE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4337,7 +4337,7 @@ std::string NMD::CMP_SULE_S(uint64 instruction) std::string NMD::CMP_SULT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4361,7 +4361,7 @@ std::string NMD::CMP_SULT_D(uint64 instruction) std::string NMD::CMP_SULT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4385,7 +4385,7 @@ std::string NMD::CMP_SULT_S(uint64 instruction) std::string NMD::CMP_SUN_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4409,7 +4409,7 @@ std::string NMD::CMP_SUN_D(uint64 instruction) std::string NMD::CMP_SUNE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4433,7 +4433,7 @@ std::string NMD::CMP_SUNE_D(uint64 instruction) std::string NMD::CMP_SUNE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4457,7 +4457,7 @@ std::string NMD::CMP_SUNE_S(uint64 instruction) std::string NMD::CMP_SUN_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4481,7 +4481,7 @@ std::string NMD::CMP_SUN_S(uint64 instruction) std::string NMD::CMP_UEQ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4505,7 +4505,7 @@ std::string NMD::CMP_UEQ_D(uint64 instruction) std::string NMD::CMP_UEQ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4529,7 +4529,7 @@ std::string NMD::CMP_UEQ_S(uint64 instruction) std::string NMD::CMP_ULE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4553,7 +4553,7 @@ std::string NMD::CMP_ULE_D(uint64 instruction) std::string NMD::CMP_ULE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4577,7 +4577,7 @@ std::string NMD::CMP_ULE_S(uint64 instruction) std::string NMD::CMP_ULT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4601,7 +4601,7 @@ std::string NMD::CMP_ULT_D(uint64 instruction) std::string NMD::CMP_ULT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4625,7 +4625,7 @@ std::string NMD::CMP_ULT_S(uint64 instruction) std::string NMD::CMP_UN_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4649,7 +4649,7 @@ std::string NMD::CMP_UN_D(uint64 instruction) std::string NMD::CMP_UNE_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4673,7 +4673,7 @@ std::string NMD::CMP_UNE_D(uint64 instruction) std::string NMD::CMP_UNE_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4697,7 +4697,7 @@ std::string NMD::CMP_UNE_S(uint64 instruction) std::string NMD::CMP_UN_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -4995,7 +4995,7 @@ std::string NMD::CTC2(uint64 instruction) std::string NMD::CVT_D_L(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5017,7 +5017,7 @@ std::string NMD::CVT_D_L(uint64 instruction) std::string NMD::CVT_D_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5039,7 +5039,7 @@ std::string NMD::CVT_D_S(uint64 instruction) std::string NMD::CVT_D_W(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5061,7 +5061,7 @@ std::string NMD::CVT_D_W(uint64 instruction) std::string NMD::CVT_L_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5083,7 +5083,7 @@ std::string NMD::CVT_L_D(uint64 instruction) std::string NMD::CVT_L_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5105,7 +5105,7 @@ std::string NMD::CVT_L_S(uint64 instruction) std::string NMD::CVT_S_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5127,7 +5127,7 @@ std::string NMD::CVT_S_D(uint64 instruction) std::string NMD::CVT_S_L(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5149,7 +5149,7 @@ std::string NMD::CVT_S_L(uint64 instruction) std::string NMD::CVT_S_PL(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5171,7 +5171,7 @@ std::string NMD::CVT_S_PL(uint64 instruction) std::string NMD::CVT_S_PU(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5193,7 +5193,7 @@ std::string NMD::CVT_S_PU(uint64 instruction) std::string NMD::CVT_S_W(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5215,7 +5215,7 @@ std::string NMD::CVT_S_W(uint64 instruction) std::string NMD::CVT_W_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5237,7 +5237,7 @@ std::string NMD::CVT_W_D(uint64 instruction) std::string NMD::CVT_W_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5693,7 +5693,7 @@ std::string NMD::DIV(uint64 instruction) std::string NMD::DIV_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -5717,7 +5717,7 @@ std::string NMD::DIV_D(uint64 instruction) std::string NMD::DIV_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -5837,7 +5837,7 @@ std::string NMD::DMFC0(uint64 instruction) std::string NMD::DMFC1(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string fs =3D FPR(copy(fs_value)); @@ -5977,7 +5977,7 @@ std::string NMD::DMTC0(uint64 instruction) std::string NMD::DMTC1(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7474,7 +7474,7 @@ std::string NMD::EXTW(uint64 instruction) std::string NMD::FLOOR_L_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7496,7 +7496,7 @@ std::string NMD::FLOOR_L_D(uint64 instruction) std::string NMD::FLOOR_L_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7518,7 +7518,7 @@ std::string NMD::FLOOR_L_S(uint64 instruction) std::string NMD::FLOOR_W_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -7540,7 +7540,7 @@ std::string NMD::FLOOR_W_D(uint64 instruction) std::string NMD::FLOOR_W_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9528,7 +9528,7 @@ std::string NMD::MADD_DSP_(uint64 instruction) std::string NMD::MADDF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9552,7 +9552,7 @@ std::string NMD::MADDF_D(uint64 instruction) std::string NMD::MADDF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9696,7 +9696,7 @@ std::string NMD::MAQ_SA_W_PHR(uint64 instruction) std::string NMD::MAX_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9720,7 +9720,7 @@ std::string NMD::MAX_D(uint64 instruction) std::string NMD::MAX_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9744,7 +9744,7 @@ std::string NMD::MAX_S(uint64 instruction) std::string NMD::MAXA_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9768,7 +9768,7 @@ std::string NMD::MAXA_D(uint64 instruction) std::string NMD::MAXA_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -9816,7 +9816,7 @@ std::string NMD::MFC0(uint64 instruction) std::string NMD::MFC1(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string fs =3D FPR(copy(fs_value)); @@ -9908,7 +9908,7 @@ std::string NMD::MFHC0(uint64 instruction) std::string NMD::MFHC1(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10072,7 +10072,7 @@ std::string NMD::MFTR(uint64 instruction) std::string NMD::MIN_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10096,7 +10096,7 @@ std::string NMD::MIN_D(uint64 instruction) std::string NMD::MIN_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10120,7 +10120,7 @@ std::string NMD::MIN_S(uint64 instruction) std::string NMD::MINA_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10144,7 +10144,7 @@ std::string NMD::MINA_D(uint64 instruction) std::string NMD::MINA_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10240,7 +10240,7 @@ std::string NMD::MODU(uint64 instruction) std::string NMD::MOV_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10262,7 +10262,7 @@ std::string NMD::MOV_D(uint64 instruction) std::string NMD::MOV_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10456,7 +10456,7 @@ std::string NMD::MSUB_DSP_(uint64 instruction) std::string NMD::MSUBF_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10480,7 +10480,7 @@ std::string NMD::MSUBF_D(uint64 instruction) std::string NMD::MSUBF_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10552,7 +10552,7 @@ std::string NMD::MTC0(uint64 instruction) std::string NMD::MTC1(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10644,7 +10644,7 @@ std::string NMD::MTHC0(uint64 instruction) std::string NMD::MTHC1(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string fs =3D FPR(copy(fs_value)); @@ -10924,7 +10924,7 @@ std::string NMD::MUL_4X4_(uint64 instruction) std::string NMD::MUL_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -10996,7 +10996,7 @@ std::string NMD::MUL_S_PH(uint64 instruction) std::string NMD::MUL_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -11332,7 +11332,7 @@ std::string NMD::MULU(uint64 instruction) std::string NMD::NEG_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -11354,7 +11354,7 @@ std::string NMD::NEG_D(uint64 instruction) std::string NMD::NEG_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12192,7 +12192,7 @@ std::string NMD::RDPGPR(uint64 instruction) std::string NMD::RECIP_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12214,7 +12214,7 @@ std::string NMD::RECIP_D(uint64 instruction) std::string NMD::RECIP_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12414,7 +12414,7 @@ std::string NMD::RESTOREF(uint64 instruction) std::string NMD::RINT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12436,7 +12436,7 @@ std::string NMD::RINT_D(uint64 instruction) std::string NMD::RINT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12535,7 +12535,7 @@ std::string NMD::ROTX(uint64 instruction) std::string NMD::ROUND_L_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12557,7 +12557,7 @@ std::string NMD::ROUND_L_D(uint64 instruction) std::string NMD::ROUND_L_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12579,7 +12579,7 @@ std::string NMD::ROUND_L_S(uint64 instruction) std::string NMD::ROUND_W_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12601,7 +12601,7 @@ std::string NMD::ROUND_W_D(uint64 instruction) std::string NMD::ROUND_W_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12623,7 +12623,7 @@ std::string NMD::ROUND_W_S(uint64 instruction) std::string NMD::RSQRT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -12645,7 +12645,7 @@ std::string NMD::RSQRT_D(uint64 instruction) std::string NMD::RSQRT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -13412,7 +13412,7 @@ std::string NMD::SEH(uint64 instruction) std::string NMD::SEL_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13436,7 +13436,7 @@ std::string NMD::SEL_D(uint64 instruction) std::string NMD::SEL_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13460,7 +13460,7 @@ std::string NMD::SEL_S(uint64 instruction) std::string NMD::SELEQZ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13484,7 +13484,7 @@ std::string NMD::SELEQZ_D(uint64 instruction) std::string NMD::SELEQZ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13508,7 +13508,7 @@ std::string NMD::SELEQZ_S(uint64 instruction) std::string NMD::SELNEZ_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -13532,7 +13532,7 @@ std::string NMD::SELNEZ_D(uint64 instruction) std::string NMD::SELNEZ_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -14550,7 +14550,7 @@ std::string NMD::SPECIAL2(uint64 instruction) std::string NMD::SQRT_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -14572,7 +14572,7 @@ std::string NMD::SQRT_D(uint64 instruction) std::string NMD::SQRT_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -14738,7 +14738,7 @@ std::string NMD::SUB(uint64 instruction) std::string NMD::SUB_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -14762,7 +14762,7 @@ std::string NMD::SUB_D(uint64 instruction) std::string NMD::SUB_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 std::string fd =3D FPR(copy(fd_value)); @@ -15940,7 +15940,7 @@ std::string NMD::TNE(uint64 instruction) std::string NMD::TRUNC_L_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -15962,7 +15962,7 @@ std::string NMD::TRUNC_L_D(uint64 instruction) std::string NMD::TRUNC_L_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -15984,7 +15984,7 @@ std::string NMD::TRUNC_L_S(uint64 instruction) std::string NMD::TRUNC_W_D(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); @@ -16006,7 +16006,7 @@ std::string NMD::TRUNC_W_D(uint64 instruction) std::string NMD::TRUNC_W_S(uint64 instruction) { uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); - uint64 fs_value =3D extract_fs_15_14_13_12_11(instruction); + uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string fs =3D FPR(copy(fs_value)); diff --git a/disas/nanomips.h b/disas/nanomips.h index 15d3ffd..c6e2221 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -177,7 +177,7 @@ private: uint64 extract_eu_3_2_1_0(uint64 instruction); uint64 extract_eu_6_5_4_3_2_1_0(uint64 instruction); uint64 extract_fd_15_14_13_12_11(uint64 instruction); - uint64 extract_fs_15_14_13_12_11(uint64 instruction); + uint64 extract_fs_20_19_18_17_16(uint64 instruction); uint64 extract_ft_15_14_13_12_11(uint64 instruction); uint64 extract_ft_20_19_18_17_16(uint64 instruction); uint64 extract_gp_2(uint64 instruction); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545823059733936.1659775329963; Wed, 26 Dec 2018 03:17:39 -0800 (PST) Received: from localhost ([127.0.0.1]:45572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Bx-00027l-R2 for importer@patchew.org; Wed, 26 Dec 2018 06:17:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72V-0007xA-As for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72Q-0001ne-Dn for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:51 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54626 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 1gc72P-0001mq-S9 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:46 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id E94141A20BA; Wed, 26 Dec 2018 12:06:59 +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 C4E521A20AF; Wed, 26 Dec 2018 12:06:59 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:16 +0100 Message-Id: <1545822388-10911-9-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 08/20] disas: nanoMIPS: Fix an FP-related misnomer 3 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 NMD::extract_ft_20_19_18_17_16(uint64 instruction) to NMD::extract_ft_25_24_23_22_21(uint64 instruction). Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 258 ++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 2 +- 2 files changed, 130 insertions(+), 130 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 8f6db93..d354a67 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1184,7 +1184,7 @@ uint64 NMD::extract_rt3_9_8_7(uint64 instruction) } =20 =20 -uint64 NMD::extract_ft_20_19_18_17_16(uint64 instruction) +uint64 NMD::extract_ft_25_24_23_22_21(uint64 instruction) { uint64 value =3D 0; value |=3D extract_bits(instruction, 21, 5); @@ -1597,7 +1597,7 @@ bool NMD::SLTU_cond(uint64 instruction) */ std::string NMD::ABS_D(uint64 instruction) { - uint64 fd_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fd_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string fs =3D FPR(copy(fs_value)); @@ -1619,7 +1619,7 @@ std::string NMD::ABS_D(uint64 instruction) */ std::string NMD::ABS_S(uint64 instruction) { - uint64 fd_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 fd_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string fs =3D FPR(copy(fs_value)); @@ -1751,7 +1751,7 @@ std::string NMD::ADD(uint64 instruction) */ std::string NMD::ADD_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -1776,7 +1776,7 @@ std::string NMD::ADD_D(uint64 instruction) */ std::string NMD::ADD_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -2783,7 +2783,7 @@ std::string NMD::BC_32_(uint64 instruction) std::string NMD::BC1EQZC(uint64 instruction) { int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); @@ -2805,7 +2805,7 @@ std::string NMD::BC1EQZC(uint64 instruction) std::string NMD::BC1NEZC(uint64 instruction) { int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); @@ -3378,7 +3378,7 @@ std::string NMD::CACHEE(uint64 instruction) */ std::string NMD::CEIL_L_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3400,7 +3400,7 @@ std::string NMD::CEIL_L_D(uint64 instruction) */ std::string NMD::CEIL_L_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3422,7 +3422,7 @@ std::string NMD::CEIL_L_S(uint64 instruction) */ std::string NMD::CEIL_W_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3444,7 +3444,7 @@ std::string NMD::CEIL_W_D(uint64 instruction) */ std::string NMD::CEIL_W_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3510,7 +3510,7 @@ std::string NMD::CFC2(uint64 instruction) */ std::string NMD::CLASS_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3532,7 +3532,7 @@ std::string NMD::CLASS_D(uint64 instruction) */ std::string NMD::CLASS_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -3598,7 +3598,7 @@ std::string NMD::CLZ(uint64 instruction) */ std::string NMD::CMP_AF_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3622,7 +3622,7 @@ std::string NMD::CMP_AF_D(uint64 instruction) */ std::string NMD::CMP_AF_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3646,7 +3646,7 @@ std::string NMD::CMP_AF_S(uint64 instruction) */ std::string NMD::CMP_EQ_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3692,7 +3692,7 @@ std::string NMD::CMP_EQ_PH(uint64 instruction) */ std::string NMD::CMP_EQ_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3716,7 +3716,7 @@ std::string NMD::CMP_EQ_S(uint64 instruction) */ std::string NMD::CMP_LE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3762,7 +3762,7 @@ std::string NMD::CMP_LE_PH(uint64 instruction) */ std::string NMD::CMP_LE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3786,7 +3786,7 @@ std::string NMD::CMP_LE_S(uint64 instruction) */ std::string NMD::CMP_LT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3832,7 +3832,7 @@ std::string NMD::CMP_LT_PH(uint64 instruction) */ std::string NMD::CMP_LT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3856,7 +3856,7 @@ std::string NMD::CMP_LT_S(uint64 instruction) */ std::string NMD::CMP_NE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3880,7 +3880,7 @@ std::string NMD::CMP_NE_D(uint64 instruction) */ std::string NMD::CMP_NE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3904,7 +3904,7 @@ std::string NMD::CMP_NE_S(uint64 instruction) */ std::string NMD::CMP_OR_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3928,7 +3928,7 @@ std::string NMD::CMP_OR_D(uint64 instruction) */ std::string NMD::CMP_OR_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3952,7 +3952,7 @@ std::string NMD::CMP_OR_S(uint64 instruction) */ std::string NMD::CMP_SAF_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -3976,7 +3976,7 @@ std::string NMD::CMP_SAF_D(uint64 instruction) */ std::string NMD::CMP_SAF_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4000,7 +4000,7 @@ std::string NMD::CMP_SAF_S(uint64 instruction) */ std::string NMD::CMP_SEQ_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4024,7 +4024,7 @@ std::string NMD::CMP_SEQ_D(uint64 instruction) */ std::string NMD::CMP_SEQ_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4048,7 +4048,7 @@ std::string NMD::CMP_SEQ_S(uint64 instruction) */ std::string NMD::CMP_SLE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4072,7 +4072,7 @@ std::string NMD::CMP_SLE_D(uint64 instruction) */ std::string NMD::CMP_SLE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4096,7 +4096,7 @@ std::string NMD::CMP_SLE_S(uint64 instruction) */ std::string NMD::CMP_SLT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4120,7 +4120,7 @@ std::string NMD::CMP_SLT_D(uint64 instruction) */ std::string NMD::CMP_SLT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4144,7 +4144,7 @@ std::string NMD::CMP_SLT_S(uint64 instruction) */ std::string NMD::CMP_SNE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4168,7 +4168,7 @@ std::string NMD::CMP_SNE_D(uint64 instruction) */ std::string NMD::CMP_SNE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4192,7 +4192,7 @@ std::string NMD::CMP_SNE_S(uint64 instruction) */ std::string NMD::CMP_SOR_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4216,7 +4216,7 @@ std::string NMD::CMP_SOR_D(uint64 instruction) */ std::string NMD::CMP_SOR_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4240,7 +4240,7 @@ std::string NMD::CMP_SOR_S(uint64 instruction) */ std::string NMD::CMP_SUEQ_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4264,7 +4264,7 @@ std::string NMD::CMP_SUEQ_D(uint64 instruction) */ std::string NMD::CMP_SUEQ_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4288,7 +4288,7 @@ std::string NMD::CMP_SUEQ_S(uint64 instruction) */ std::string NMD::CMP_SULE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4312,7 +4312,7 @@ std::string NMD::CMP_SULE_D(uint64 instruction) */ std::string NMD::CMP_SULE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4336,7 +4336,7 @@ std::string NMD::CMP_SULE_S(uint64 instruction) */ std::string NMD::CMP_SULT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4360,7 +4360,7 @@ std::string NMD::CMP_SULT_D(uint64 instruction) */ std::string NMD::CMP_SULT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4384,7 +4384,7 @@ std::string NMD::CMP_SULT_S(uint64 instruction) */ std::string NMD::CMP_SUN_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4408,7 +4408,7 @@ std::string NMD::CMP_SUN_D(uint64 instruction) */ std::string NMD::CMP_SUNE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4432,7 +4432,7 @@ std::string NMD::CMP_SUNE_D(uint64 instruction) */ std::string NMD::CMP_SUNE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4456,7 +4456,7 @@ std::string NMD::CMP_SUNE_S(uint64 instruction) */ std::string NMD::CMP_SUN_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4480,7 +4480,7 @@ std::string NMD::CMP_SUN_S(uint64 instruction) */ std::string NMD::CMP_UEQ_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4504,7 +4504,7 @@ std::string NMD::CMP_UEQ_D(uint64 instruction) */ std::string NMD::CMP_UEQ_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4528,7 +4528,7 @@ std::string NMD::CMP_UEQ_S(uint64 instruction) */ std::string NMD::CMP_ULE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4552,7 +4552,7 @@ std::string NMD::CMP_ULE_D(uint64 instruction) */ std::string NMD::CMP_ULE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4576,7 +4576,7 @@ std::string NMD::CMP_ULE_S(uint64 instruction) */ std::string NMD::CMP_ULT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4600,7 +4600,7 @@ std::string NMD::CMP_ULT_D(uint64 instruction) */ std::string NMD::CMP_ULT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4624,7 +4624,7 @@ std::string NMD::CMP_ULT_S(uint64 instruction) */ std::string NMD::CMP_UN_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4648,7 +4648,7 @@ std::string NMD::CMP_UN_D(uint64 instruction) */ std::string NMD::CMP_UNE_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4672,7 +4672,7 @@ std::string NMD::CMP_UNE_D(uint64 instruction) */ std::string NMD::CMP_UNE_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4696,7 +4696,7 @@ std::string NMD::CMP_UNE_S(uint64 instruction) */ std::string NMD::CMP_UN_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -4994,7 +4994,7 @@ std::string NMD::CTC2(uint64 instruction) */ std::string NMD::CVT_D_L(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5016,7 +5016,7 @@ std::string NMD::CVT_D_L(uint64 instruction) */ std::string NMD::CVT_D_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5038,7 +5038,7 @@ std::string NMD::CVT_D_S(uint64 instruction) */ std::string NMD::CVT_D_W(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5060,7 +5060,7 @@ std::string NMD::CVT_D_W(uint64 instruction) */ std::string NMD::CVT_L_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5082,7 +5082,7 @@ std::string NMD::CVT_L_D(uint64 instruction) */ std::string NMD::CVT_L_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5104,7 +5104,7 @@ std::string NMD::CVT_L_S(uint64 instruction) */ std::string NMD::CVT_S_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5126,7 +5126,7 @@ std::string NMD::CVT_S_D(uint64 instruction) */ std::string NMD::CVT_S_L(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5148,7 +5148,7 @@ std::string NMD::CVT_S_L(uint64 instruction) */ std::string NMD::CVT_S_PL(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5170,7 +5170,7 @@ std::string NMD::CVT_S_PL(uint64 instruction) */ std::string NMD::CVT_S_PU(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5192,7 +5192,7 @@ std::string NMD::CVT_S_PU(uint64 instruction) */ std::string NMD::CVT_S_W(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5214,7 +5214,7 @@ std::string NMD::CVT_S_W(uint64 instruction) */ std::string NMD::CVT_W_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5236,7 +5236,7 @@ std::string NMD::CVT_W_D(uint64 instruction) */ std::string NMD::CVT_W_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -5692,7 +5692,7 @@ std::string NMD::DIV(uint64 instruction) */ std::string NMD::DIV_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -5716,7 +5716,7 @@ std::string NMD::DIV_D(uint64 instruction) */ std::string NMD::DIV_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -7473,7 +7473,7 @@ std::string NMD::EXTW(uint64 instruction) */ std::string NMD::FLOOR_L_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -7495,7 +7495,7 @@ std::string NMD::FLOOR_L_D(uint64 instruction) */ std::string NMD::FLOOR_L_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -7517,7 +7517,7 @@ std::string NMD::FLOOR_L_S(uint64 instruction) */ std::string NMD::FLOOR_W_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -7539,7 +7539,7 @@ std::string NMD::FLOOR_W_D(uint64 instruction) */ std::string NMD::FLOOR_W_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -8131,7 +8131,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 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -8154,7 +8154,7 @@ std::string NMD::LDC1_GP_(uint64 instruction) std::string NMD::LDC1_S9_(uint64 instruction) { int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -8177,7 +8177,7 @@ std::string NMD::LDC1_S9_(uint64 instruction) */ std::string NMD::LDC1_U12_(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -9099,7 +9099,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 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -9122,7 +9122,7 @@ std::string NMD::LWC1_GP_(uint64 instruction) std::string NMD::LWC1_S9_(uint64 instruction) { int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -9145,7 +9145,7 @@ std::string NMD::LWC1_S9_(uint64 instruction) */ std::string NMD::LWC1_U12_(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -9527,7 +9527,7 @@ std::string NMD::MADD_DSP_(uint64 instruction) */ std::string NMD::MADDF_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -9551,7 +9551,7 @@ std::string NMD::MADDF_D(uint64 instruction) */ std::string NMD::MADDF_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -9695,7 +9695,7 @@ std::string NMD::MAQ_SA_W_PHR(uint64 instruction) */ std::string NMD::MAX_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -9719,7 +9719,7 @@ std::string NMD::MAX_D(uint64 instruction) */ std::string NMD::MAX_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -9743,7 +9743,7 @@ std::string NMD::MAX_S(uint64 instruction) */ std::string NMD::MAXA_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -9767,7 +9767,7 @@ std::string NMD::MAXA_D(uint64 instruction) */ std::string NMD::MAXA_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10071,7 +10071,7 @@ std::string NMD::MFTR(uint64 instruction) */ std::string NMD::MIN_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10095,7 +10095,7 @@ std::string NMD::MIN_D(uint64 instruction) */ std::string NMD::MIN_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10119,7 +10119,7 @@ std::string NMD::MIN_S(uint64 instruction) */ std::string NMD::MINA_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10143,7 +10143,7 @@ std::string NMD::MINA_D(uint64 instruction) */ std::string NMD::MINA_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10239,7 +10239,7 @@ std::string NMD::MODU(uint64 instruction) */ std::string NMD::MOV_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -10261,7 +10261,7 @@ std::string NMD::MOV_D(uint64 instruction) */ std::string NMD::MOV_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -10455,7 +10455,7 @@ std::string NMD::MSUB_DSP_(uint64 instruction) */ std::string NMD::MSUBF_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10479,7 +10479,7 @@ std::string NMD::MSUBF_D(uint64 instruction) */ std::string NMD::MSUBF_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10923,7 +10923,7 @@ std::string NMD::MUL_4X4_(uint64 instruction) */ std::string NMD::MUL_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -10995,7 +10995,7 @@ std::string NMD::MUL_S_PH(uint64 instruction) */ std::string NMD::MUL_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -11331,7 +11331,7 @@ std::string NMD::MULU(uint64 instruction) */ std::string NMD::NEG_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -11353,7 +11353,7 @@ std::string NMD::NEG_D(uint64 instruction) */ std::string NMD::NEG_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12191,7 +12191,7 @@ std::string NMD::RDPGPR(uint64 instruction) */ std::string NMD::RECIP_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12213,7 +12213,7 @@ std::string NMD::RECIP_D(uint64 instruction) */ std::string NMD::RECIP_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12413,7 +12413,7 @@ std::string NMD::RESTOREF(uint64 instruction) */ std::string NMD::RINT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12435,7 +12435,7 @@ std::string NMD::RINT_D(uint64 instruction) */ std::string NMD::RINT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12534,7 +12534,7 @@ std::string NMD::ROTX(uint64 instruction) */ std::string NMD::ROUND_L_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12556,7 +12556,7 @@ std::string NMD::ROUND_L_D(uint64 instruction) */ std::string NMD::ROUND_L_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12578,7 +12578,7 @@ std::string NMD::ROUND_L_S(uint64 instruction) */ std::string NMD::ROUND_W_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12600,7 +12600,7 @@ std::string NMD::ROUND_W_D(uint64 instruction) */ std::string NMD::ROUND_W_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12622,7 +12622,7 @@ std::string NMD::ROUND_W_S(uint64 instruction) */ std::string NMD::RSQRT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -12644,7 +12644,7 @@ std::string NMD::RSQRT_D(uint64 instruction) */ std::string NMD::RSQRT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -13129,7 +13129,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 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -13152,7 +13152,7 @@ std::string NMD::SDC1_GP_(uint64 instruction) std::string NMD::SDC1_S9_(uint64 instruction) { int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -13175,7 +13175,7 @@ std::string NMD::SDC1_S9_(uint64 instruction) */ std::string NMD::SDC1_U12_(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -13411,7 +13411,7 @@ std::string NMD::SEH(uint64 instruction) */ std::string NMD::SEL_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -13435,7 +13435,7 @@ std::string NMD::SEL_D(uint64 instruction) */ std::string NMD::SEL_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -13459,7 +13459,7 @@ std::string NMD::SEL_S(uint64 instruction) */ std::string NMD::SELEQZ_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -13483,7 +13483,7 @@ std::string NMD::SELEQZ_D(uint64 instruction) */ std::string NMD::SELEQZ_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -13507,7 +13507,7 @@ std::string NMD::SELEQZ_S(uint64 instruction) */ std::string NMD::SELNEZ_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -13531,7 +13531,7 @@ std::string NMD::SELNEZ_D(uint64 instruction) */ std::string NMD::SELNEZ_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -14549,7 +14549,7 @@ std::string NMD::SPECIAL2(uint64 instruction) */ std::string NMD::SQRT_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -14571,7 +14571,7 @@ std::string NMD::SQRT_D(uint64 instruction) */ std::string NMD::SQRT_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -14737,7 +14737,7 @@ std::string NMD::SUB(uint64 instruction) */ std::string NMD::SUB_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -14761,7 +14761,7 @@ std::string NMD::SUB_D(uint64 instruction) */ std::string NMD::SUB_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); uint64 fd_value =3D extract_fd_15_14_13_12_11(instruction); =20 @@ -15315,7 +15315,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 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_17_to_2__s2(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -15338,7 +15338,7 @@ std::string NMD::SWC1_GP_(uint64 instruction) std::string NMD::SWC1_S9_(uint64 instruction) { int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -15361,7 +15361,7 @@ std::string NMD::SWC1_S9_(uint64 instruction) */ std::string NMD::SWC1_U12_(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -15939,7 +15939,7 @@ std::string NMD::TNE(uint64 instruction) */ std::string NMD::TRUNC_L_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -15961,7 +15961,7 @@ std::string NMD::TRUNC_L_D(uint64 instruction) */ std::string NMD::TRUNC_L_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -15983,7 +15983,7 @@ std::string NMD::TRUNC_L_S(uint64 instruction) */ std::string NMD::TRUNC_W_D(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -16005,7 +16005,7 @@ std::string NMD::TRUNC_W_D(uint64 instruction) */ std::string NMD::TRUNC_W_S(uint64 instruction) { - uint64 ft_value =3D extract_ft_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 fs_value =3D extract_fs_20_19_18_17_16(instruction); =20 std::string ft =3D FPR(copy(ft_value)); diff --git a/disas/nanomips.h b/disas/nanomips.h index c6e2221..824cb24 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -179,7 +179,7 @@ private: uint64 extract_fd_15_14_13_12_11(uint64 instruction); uint64 extract_fs_20_19_18_17_16(uint64 instruction); uint64 extract_ft_15_14_13_12_11(uint64 instruction); - uint64 extract_ft_20_19_18_17_16(uint64 instruction); + uint64 extract_ft_25_24_23_22_21(uint64 instruction); uint64 extract_gp_2(uint64 instruction); uint64 extract_hint_25_24_23_22_21(uint64 instruction); uint64 extract_hs_20_19_18_17_16(uint64 instruction); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545822792099284.1803667867382; Wed, 26 Dec 2018 03:13:12 -0800 (PST) Received: from localhost ([127.0.0.1]:45534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc77e-0005D2-4m for importer@patchew.org; Wed, 26 Dec 2018 06:13:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72V-0007ws-6r for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72Q-0001nx-J1 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:51 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54630 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 1gc72Q-0001my-1P for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:46 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 060A11A20D3; Wed, 26 Dec 2018 12:07:00 +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 D1D161A20B8; Wed, 26 Dec 2018 12:06:59 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:17 +0100 Message-Id: <1545822388-10911-10-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 09/20] disas: nanoMIPS: Name more 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 more functions that have names that are hard to understand. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 212 ++++++++++++++++++++++++++-----------------------= ---- disas/nanomips.h | 28 +++---- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index d354a67..372af90 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -715,7 +715,7 @@ uint64 NMD::extract_u_17_to_1__s1(uint64 instruction) } =20 =20 -int64 NMD::extr_sil11il0bs10Tmsb9(uint64 instruction) +int64 NMD::extract_s__se9_20_19_18_17_16_15_14_13_12_11(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 11, 10); @@ -724,7 +724,7 @@ int64 NMD::extr_sil11il0bs10Tmsb9(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il11bs1_il1il1bs10Tmsb11(uint64 instruction) +int64 NMD::extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 11; @@ -791,7 +791,7 @@ uint64 NMD::extract_count3_14_13_12(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64 instructi= on) +int64 NMD::extract_s__se31_0_11_to_2_20_to_12_s12(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 31; @@ -802,7 +802,7 @@ int64 NMD::extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb= 31(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il7bs1_il1il1bs6Tmsb7(uint64 instruction) +int64 NMD::extract_s__se7_0_6_5_4_3_2_1_s1(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 7; @@ -876,7 +876,7 @@ uint64 NMD::extract_rdl_25_24(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il10bs1_il1il1bs9Tmsb10(uint64 instruction) +int64 NMD::extract_s__se10_0_9_8_7_6_5_4_3_2_1_s1(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 10; @@ -1015,7 +1015,7 @@ uint64 NMD::extract_rsz4_4_2_1_0(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il21bs1_il1il1bs20Tmsb21(uint64 instruction) +int64 NMD::extract_s__se21_0_20_to_1_s1(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 21; @@ -1058,7 +1058,7 @@ uint64 NMD::extract_rt_41_40_39_38_37(uint64 instruct= ion) } =20 =20 -int64 NMD::extract_shift_21_20_19_18_17_16(uint64 instruction) +int64 NMD::extract_shift__se5_21_20_19_18_17_16(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 16, 6); @@ -1092,7 +1092,7 @@ uint64 NMD::extract_size_20_19_18_17_16(uint64 instru= ction) } =20 =20 -int64 NMD::extr_sil2il2bs6_il15il8bs1Tmsb8(uint64 instruction) +int64 NMD::extract_s__se8_15_7_6_5_4_3_2_s2(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 2, 6) << 2; @@ -1118,7 +1118,7 @@ uint64 NMD::extract_fs_20_19_18_17_16(uint64 instruct= ion) } =20 =20 -int64 NMD::extr_sil0il0bs8_il15il8bs1Tmsb8(uint64 instruction) +int64 NMD::extract_s__se8_15_7_6_5_4_3_2_1_0(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 8); @@ -1241,7 +1241,7 @@ uint64 NMD::extract_sa_15_14_13(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il14bs1_il1il1bs13Tmsb14(uint64 instruction) +int64 NMD::extract_s__se14_0_13_to_1_s1(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 14; @@ -1347,7 +1347,7 @@ uint64 NMD::extract_u_7_6_5_4__s4(uint64 instruction) } =20 =20 -int64 NMD::extr_sil3il3bs5_il15il8bs1Tmsb8(uint64 instruction) +int64 NMD::extract_s__se8_15_7_6_5_4_3_s3(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 3, 5) << 3; @@ -1365,7 +1365,7 @@ uint64 NMD::extract_ft_15_14_13_12_11(uint64 instruct= ion) } =20 =20 -int64 NMD::extr_sil0il16bs16_il16il0bs16Tmsb31(uint64 instruction) +int64 NMD::extract_s__se31_15_to_0_31_to_16(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 16) << 16; @@ -1415,7 +1415,7 @@ uint64 NMD::extract_code_1_0(uint64 instruction) } =20 =20 -int64 NMD::extr_sil0il25bs1_il1il1bs24Tmsb25(uint64 instruction) +int64 NMD::extract_s__se25_0_24_to_1_s1(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 1) << 25; @@ -1491,7 +1491,7 @@ uint64 NMD::extract_u_20_to_2__s2(uint64 instruction) } =20 =20 -int64 NMD::extract_s_4_2_1_0(uint64 instruction) +int64 NMD::extract_s__se3_4_2_1_0(uint64 instruction) { int64 value =3D 0; value |=3D extract_bits(instruction, 0, 3); @@ -1704,7 +1704,7 @@ std::string NMD::ABSQ_S_W(uint64 instruction) std::string NMD::ACLR(uint64 instruction) { uint64 bit_value =3D extract_bit_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string bit =3D IMMEDIATE(copy(bit_value)); @@ -1823,7 +1823,7 @@ std::string NMD::ADDIU_32_(uint64 instruction) std::string NMD::ADDIU_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -1844,7 +1844,7 @@ std::string NMD::ADDIU_48_(uint64 instruction) std::string NMD::ADDIU_GP48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -1973,7 +1973,7 @@ std::string NMD::ADDIU_R2_(uint64 instruction) std::string NMD::ADDIU_RS5_(uint64 instruction) { uint64 rt_value =3D extract_rt_9_8_7_6_5(instruction); - int64 s_value =3D extract_s_4_2_1_0(instruction); + int64 s_value =3D extract_s__se3_4_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -1995,7 +1995,7 @@ std::string NMD::ADDIU_RS5_(uint64 instruction) std::string NMD::ADDIUPC_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il21bs1_il1il1bs20Tmsb21(instruction); + int64 s_value =3D extract_s__se21_0_20_to_1_s1(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); @@ -2017,7 +2017,7 @@ std::string NMD::ADDIUPC_32_(uint64 instruction) std::string NMD::ADDIUPC_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 6); @@ -2471,7 +2471,7 @@ std::string NMD::ADDWC(uint64 instruction) std::string NMD::ALUIPC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(instr= uction); + int64 s_value =3D extract_s__se31_0_11_to_2_20_to_12_s12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); @@ -2609,7 +2609,7 @@ std::string NMD::APPEND(uint64 instruction) std::string NMD::ASET(uint64 instruction) { uint64 bit_value =3D extract_bit_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string bit =3D IMMEDIATE(copy(bit_value)); @@ -2632,7 +2632,7 @@ std::string NMD::ASET(uint64 instruction) */ std::string NMD::BALC_16_(uint64 instruction) { - int64 s_value =3D extr_sil0il10bs1_il1il1bs9Tmsb10(instruction); + int64 s_value =3D extract_s__se10_0_9_8_7_6_5_4_3_2_1_s1(instruction); =20 std::string s =3D ADDRESS(encode_s_from_address(s_value), 2); =20 @@ -2652,7 +2652,7 @@ std::string NMD::BALC_16_(uint64 instruction) */ std::string NMD::BALC_32_(uint64 instruction) { - int64 s_value =3D extr_sil0il25bs1_il1il1bs24Tmsb25(instruction); + int64 s_value =3D extract_s__se25_0_24_to_1_s1(instruction); =20 std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); =20 @@ -2696,7 +2696,7 @@ std::string NMD::BBEQZC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 bit_value =3D extract_bit_16_15_14_13_12_11(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); =20 std::string rt =3D GPR(copy(rt_value)); std::string bit =3D IMMEDIATE(copy(bit_value)); @@ -2720,7 +2720,7 @@ std::string NMD::BBNEZC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 bit_value =3D extract_bit_16_15_14_13_12_11(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); =20 std::string rt =3D GPR(copy(rt_value)); std::string bit =3D IMMEDIATE(copy(bit_value)); @@ -2742,7 +2742,7 @@ std::string NMD::BBNEZC(uint64 instruction) */ std::string NMD::BC_16_(uint64 instruction) { - int64 s_value =3D extr_sil0il10bs1_il1il1bs9Tmsb10(instruction); + int64 s_value =3D extract_s__se10_0_9_8_7_6_5_4_3_2_1_s1(instruction); =20 std::string s =3D ADDRESS(encode_s_from_address(s_value), 2); =20 @@ -2762,7 +2762,7 @@ std::string NMD::BC_16_(uint64 instruction) */ std::string NMD::BC_32_(uint64 instruction) { - int64 s_value =3D extr_sil0il25bs1_il1il1bs24Tmsb25(instruction); + int64 s_value =3D extract_s__se25_0_24_to_1_s1(instruction); =20 std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); =20 @@ -2782,7 +2782,7 @@ std::string NMD::BC_32_(uint64 instruction) */ std::string NMD::BC1EQZC(uint64 instruction) { - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -2804,7 +2804,7 @@ std::string NMD::BC1EQZC(uint64 instruction) */ std::string NMD::BC1NEZC(uint64 instruction) { - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); =20 std::string ft =3D FPR(copy(ft_value)); @@ -2826,7 +2826,7 @@ std::string NMD::BC1NEZC(uint64 instruction) */ std::string NMD::BC2EQZC(uint64 instruction) { - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 ct_value =3D extract_ct_25_24_23_22_21(instruction); =20 std::string ct =3D CPR(copy(ct_value)); @@ -2848,7 +2848,7 @@ std::string NMD::BC2EQZC(uint64 instruction) */ std::string NMD::BC2NEZC(uint64 instruction) { - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 ct_value =3D extract_ct_25_24_23_22_21(instruction); =20 std::string ct =3D CPR(copy(ct_value)); @@ -2895,7 +2895,7 @@ std::string NMD::BEQC_16_(uint64 instruction) std::string NMD::BEQC_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rs =3D GPR(copy(rs_value)); @@ -2919,7 +2919,7 @@ std::string NMD::BEQC_32_(uint64 instruction) std::string NMD::BEQIC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); uint64 u_value =3D extract_u_17_16_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -2942,7 +2942,7 @@ std::string NMD::BEQIC(uint64 instruction) */ std::string NMD::BEQZC_16_(uint64 instruction) { - int64 s_value =3D extr_sil0il7bs1_il1il1bs6Tmsb7(instruction); + int64 s_value =3D extract_s__se7_0_6_5_4_3_2_1_s1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); =20 std::string rt3 =3D GPR(encode_gpr3(rt3_value)); @@ -2965,7 +2965,7 @@ std::string NMD::BEQZC_16_(uint64 instruction) std::string NMD::BGEC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rs =3D GPR(copy(rs_value)); @@ -2989,7 +2989,7 @@ std::string NMD::BGEC(uint64 instruction) std::string NMD::BGEIC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); uint64 u_value =3D extract_u_17_16_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -3013,7 +3013,7 @@ std::string NMD::BGEIC(uint64 instruction) std::string NMD::BGEIUC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); uint64 u_value =3D extract_u_17_16_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -3037,7 +3037,7 @@ std::string NMD::BGEIUC(uint64 instruction) std::string NMD::BGEUC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rs =3D GPR(copy(rs_value)); @@ -3061,7 +3061,7 @@ std::string NMD::BGEUC(uint64 instruction) std::string NMD::BLTC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rs =3D GPR(copy(rs_value)); @@ -3085,7 +3085,7 @@ std::string NMD::BLTC(uint64 instruction) std::string NMD::BLTIC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); uint64 u_value =3D extract_u_17_16_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -3109,7 +3109,7 @@ std::string NMD::BLTIC(uint64 instruction) std::string NMD::BLTIUC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); uint64 u_value =3D extract_u_17_16_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -3133,7 +3133,7 @@ std::string NMD::BLTIUC(uint64 instruction) std::string NMD::BLTUC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rs =3D GPR(copy(rs_value)); @@ -3181,7 +3181,7 @@ std::string NMD::BNEC_16_(uint64 instruction) std::string NMD::BNEC_32_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rs =3D GPR(copy(rs_value)); @@ -3205,7 +3205,7 @@ std::string NMD::BNEC_32_(uint64 instruction) std::string NMD::BNEIC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il11bs1_il1il1bs10Tmsb11(instruction); + int64 s_value =3D extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(instruct= ion); uint64 u_value =3D extract_u_17_16_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -3228,7 +3228,7 @@ std::string NMD::BNEIC(uint64 instruction) */ std::string NMD::BNEZC_16_(uint64 instruction) { - int64 s_value =3D extr_sil0il7bs1_il1il1bs6Tmsb7(instruction); + int64 s_value =3D extract_s__se7_0_6_5_4_3_2_1_s1(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(instruction); =20 std::string rt3 =3D GPR(encode_gpr3(rt3_value)); @@ -3250,7 +3250,7 @@ std::string NMD::BNEZC_16_(uint64 instruction) */ std::string NMD::BPOSGE32C(uint64 instruction) { - int64 s_value =3D extr_sil0il14bs1_il1il1bs13Tmsb14(instruction); + int64 s_value =3D extract_s__se14_0_13_to_1_s1(instruction); =20 std::string s =3D ADDRESS(encode_s_from_address(s_value), 4); =20 @@ -3330,7 +3330,7 @@ std::string NMD::BRSC(uint64 instruction) */ std::string NMD::CACHE(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 op_value =3D extract_op_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -3354,7 +3354,7 @@ std::string NMD::CACHE(uint64 instruction) */ std::string NMD::CACHEE(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 op_value =3D extract_op_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -5259,7 +5259,7 @@ std::string NMD::CVT_W_S(uint64 instruction) std::string NMD::DADDIU_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -7824,7 +7824,7 @@ std::string NMD::LB_GP_(uint64 instruction) std::string NMD::LB_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -7872,7 +7872,7 @@ std::string NMD::LB_U12_(uint64 instruction) std::string NMD::LBE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -7942,7 +7942,7 @@ std::string NMD::LBU_GP_(uint64 instruction) std::string NMD::LBU_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -7990,7 +7990,7 @@ std::string NMD::LBU_U12_(uint64 instruction) std::string NMD::LBUE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8084,7 +8084,7 @@ std::string NMD::LD_GP_(uint64 instruction) std::string NMD::LD_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8153,7 +8153,7 @@ std::string NMD::LDC1_GP_(uint64 instruction) */ std::string NMD::LDC1_S9_(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -8249,7 +8249,7 @@ std::string NMD::LDC1X(uint64 instruction) */ std::string NMD::LDC2(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ct_value =3D extract_ct_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -8275,7 +8275,7 @@ std::string NMD::LDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8300,7 +8300,7 @@ std::string NMD::LDM(uint64 instruction) std::string NMD::LDPC_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 6); @@ -8416,7 +8416,7 @@ std::string NMD::LH_GP_(uint64 instruction) std::string NMD::LH_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8464,7 +8464,7 @@ std::string NMD::LH_U12_(uint64 instruction) std::string NMD::LHE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8534,7 +8534,7 @@ std::string NMD::LHU_GP_(uint64 instruction) std::string NMD::LHU_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8582,7 +8582,7 @@ std::string NMD::LHU_U12_(uint64 instruction) std::string NMD::LHUE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8724,7 +8724,7 @@ std::string NMD::LI_16_(uint64 instruction) std::string NMD::LI_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8746,7 +8746,7 @@ std::string NMD::LI_48_(uint64 instruction) std::string NMD::LL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil2il2bs6_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8770,7 +8770,7 @@ std::string NMD::LL(uint64 instruction) std::string NMD::LLD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil3il3bs5_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_s3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8818,7 +8818,7 @@ std::string NMD::LLDP(uint64 instruction) std::string NMD::LLE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil2il2bs6_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -8916,7 +8916,7 @@ std::string NMD::LSA(uint64 instruction) std::string NMD::LUI(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(instr= uction); + int64 s_value =3D extract_s__se31_0_11_to_2_20_to_12_s12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -9030,7 +9030,7 @@ std::string NMD::LW_GP16_(uint64 instruction) std::string NMD::LW_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -9121,7 +9121,7 @@ std::string NMD::LWC1_GP_(uint64 instruction) */ std::string NMD::LWC1_S9_(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -9217,7 +9217,7 @@ std::string NMD::LWC1XS(uint64 instruction) */ std::string NMD::LWC2(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ct_value =3D extract_ct_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -9242,7 +9242,7 @@ std::string NMD::LWC2(uint64 instruction) std::string NMD::LWE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -9267,7 +9267,7 @@ std::string NMD::LWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -9292,7 +9292,7 @@ std::string NMD::LWM(uint64 instruction) std::string NMD::LWPC_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 6); @@ -9336,7 +9336,7 @@ std::string NMD::LWU_GP_(uint64 instruction) std::string NMD::LWU_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -10285,7 +10285,7 @@ std::string NMD::MOVE_BALC(uint64 instruction) { uint64 rtz4_value =3D extract_rtz4_27_26_25_23_22_21(instruction); uint64 rd1_value =3D extract_rdl_25_24(instruction); - int64 s_value =3D extr_sil0il21bs1_il1il1bs20Tmsb21(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)); @@ -12007,7 +12007,7 @@ std::string NMD::PREF_S9_(uint64 instruction) { uint64 hint_value =3D extract_hint_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string hint =3D IMMEDIATE(copy(hint_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12053,7 +12053,7 @@ std::string NMD::PREF_U12_(uint64 instruction) */ std::string NMD::PREFE(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 hint_value =3D extract_hint_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -12236,7 +12236,7 @@ std::string NMD::RECIP_S(uint64 instruction) std::string NMD::REPL_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil11il0bs10Tmsb9(instruction); + int64 s_value =3D extract_s__se9_20_19_18_17_16_15_14_13_12_11(instruc= tion); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12780,7 +12780,7 @@ std::string NMD::SB_GP_(uint64 instruction) std::string NMD::SB_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -12828,7 +12828,7 @@ std::string NMD::SB_U12_(uint64 instruction) std::string NMD::SBE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -12876,7 +12876,7 @@ std::string NMD::SBX(uint64 instruction) std::string NMD::SC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil2il2bs6_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -12900,7 +12900,7 @@ std::string NMD::SC(uint64 instruction) std::string NMD::SCD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil3il3bs5_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_s3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -12948,7 +12948,7 @@ std::string NMD::SCDP(uint64 instruction) std::string NMD::SCE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil2il2bs6_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -13042,7 +13042,7 @@ std::string NMD::SD_GP_(uint64 instruction) std::string NMD::SD_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -13151,7 +13151,7 @@ std::string NMD::SDC1_GP_(uint64 instruction) */ std::string NMD::SDC1_S9_(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -13248,7 +13248,7 @@ std::string NMD::SDC1XS(uint64 instruction) std::string NMD::SDC2(uint64 instruction) { uint64 cs_value =3D extract_cs_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string cs =3D CPR(copy(cs_value)); @@ -13273,7 +13273,7 @@ std::string NMD::SDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -13298,7 +13298,7 @@ std::string NMD::SDM(uint64 instruction) std::string NMD::SDPC_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 6); @@ -13626,7 +13626,7 @@ std::string NMD::SH_GP_(uint64 instruction) std::string NMD::SH_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -13674,7 +13674,7 @@ std::string NMD::SH_U12_(uint64 instruction) std::string NMD::SHE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -13697,7 +13697,7 @@ std::string NMD::SHE(uint64 instruction) */ std::string NMD::SHILO(uint64 instruction) { - int64 shift_value =3D extract_shift_21_20_19_18_17_16(instruction); + int64 shift_value =3D extract_shift__se5_21_20_19_18_17_16(instruction= ); uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string shift =3D IMMEDIATE(copy(shift_value)); @@ -15246,7 +15246,7 @@ std::string NMD::SW_GP_(uint64 instruction) std::string NMD::SW_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -15337,7 +15337,7 @@ std::string NMD::SWC1_GP_(uint64 instruction) */ std::string NMD::SWC1_S9_(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 @@ -15434,7 +15434,7 @@ std::string NMD::SWC1XS(uint64 instruction) std::string NMD::SWC2(uint64 instruction) { uint64 cs_value =3D extract_cs_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string cs =3D CPR(copy(cs_value)); @@ -15458,7 +15458,7 @@ std::string NMD::SWC2(uint64 instruction) std::string NMD::SWE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -15483,7 +15483,7 @@ std::string NMD::SWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -15508,7 +15508,7 @@ std::string NMD::SWM(uint64 instruction) std::string NMD::SWPC_48_(uint64 instruction) { uint64 rt_value =3D extract_rt_41_40_39_38_37(instruction); - int64 s_value =3D extr_sil0il16bs16_il16il0bs16Tmsb31(instruction); + int64 s_value =3D extract_s__se31_15_to_0_31_to_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D ADDRESS(encode_s_from_address(s_value), 6); @@ -15597,7 +15597,7 @@ std::string NMD::SYNC(uint64 instruction) */ std::string NMD::SYNCI(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string s =3D IMMEDIATE(copy(s_value)); @@ -15619,7 +15619,7 @@ std::string NMD::SYNCI(uint64 instruction) */ std::string NMD::SYNCIE(uint64 instruction) { - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string s =3D IMMEDIATE(copy(s_value)); @@ -16029,7 +16029,7 @@ std::string NMD::UALDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -16054,7 +16054,7 @@ std::string NMD::UALDM(uint64 instruction) std::string NMD::UALH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -16079,7 +16079,7 @@ std::string NMD::UALWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -16105,7 +16105,7 @@ std::string NMD::UASDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -16130,7 +16130,7 @@ std::string NMD::UASDM(uint64 instruction) std::string NMD::UASH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); @@ -16155,7 +16155,7 @@ std::string NMD::UASWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extr_sil0il0bs8_il15il8bs1Tmsb8(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); diff --git a/disas/nanomips.h b/disas/nanomips.h index 824cb24..f1ecab9 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -143,20 +143,20 @@ private: std::string CPR(uint64 reg); std::string ADDRESS(uint64 value, int instruction_size); =20 - int64 extract_s_4_2_1_0(uint64 instruction); - int64 extr_sil0il0bs8_il15il8bs1Tmsb8(uint64 instruction); - int64 extr_sil0il10bs1_il1il1bs9Tmsb10(uint64 instruction); - int64 extr_sil0il11bs1_il1il1bs10Tmsb11(uint64 instruction); - int64 extr_sil0il14bs1_il1il1bs13Tmsb14(uint64 instruction); - int64 extr_sil0il16bs16_il16il0bs16Tmsb31(uint64 instruction); - int64 extr_sil0il21bs1_il1il1bs20Tmsb21(uint64 instruction); - int64 extr_sil0il25bs1_il1il1bs24Tmsb25(uint64 instruction); - int64 extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64 instructio= n); - int64 extr_sil0il7bs1_il1il1bs6Tmsb7(uint64 instruction); - int64 extr_sil11il0bs10Tmsb9(uint64 instruction); - int64 extract_shift_21_20_19_18_17_16(uint64 instruction); - int64 extr_sil2il2bs6_il15il8bs1Tmsb8(uint64 instruction); - int64 extr_sil3il3bs5_il15il8bs1Tmsb8(uint64 instruction); + int64 extract_s__se3_4_2_1_0(uint64 instruction); + int64 extract_s__se7_0_6_5_4_3_2_1_s1(uint64 instruction); + int64 extract_s__se8_15_7_6_5_4_3_s3(uint64 instruction); + int64 extract_s__se8_15_7_6_5_4_3_2_s2(uint64 instruction); + int64 extract_s__se8_15_7_6_5_4_3_2_1_0(uint64 instruction); + int64 extract_s__se9_20_19_18_17_16_15_14_13_12_11(uint64 instruction); + int64 extract_s__se10_0_9_8_7_6_5_4_3_2_1_s1(uint64 instruction); + int64 extract_s__se11_0_10_9_8_7_6_5_4_3_2_1_0_s1(uint64 instruction); + int64 extract_s__se14_0_13_to_1_s1(uint64 instruction); + int64 extract_s__se21_0_20_to_1_s1(uint64 instruction); + int64 extract_s__se25_0_24_to_1_s1(uint64 instruction); + int64 extract_s__se31_15_to_0_31_to_16(uint64 instruction); + int64 extract_s__se31_0_11_to_2_20_to_12_s12(uint64 instruction); + int64 extract_shift__se5_21_20_19_18_17_16(uint64 instruction); =20 uint64 extract_ac_13_12(uint64 instruction); uint64 extract_bit_16_15_14_13_12_11(uint64 instruction); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545822791011734.5437859309072; Wed, 26 Dec 2018 03:13:11 -0800 (PST) Received: from localhost ([127.0.0.1]:45532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc77d-0005Bf-AN for importer@patchew.org; Wed, 26 Dec 2018 06:13:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72W-0007yT-Iu for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72S-0001oz-2P for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:52 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54662 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 1gc72R-0001o1-Dm for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:48 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 24DCA1A1D3B; Wed, 26 Dec 2018 12:07:00 +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 DF7061A20BB; Wed, 26 Dec 2018 12:06:59 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:18 +0100 Message-Id: <1545822388-10911-11-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 10/20] disas: nanoMIPS: Fix order of more invocations 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Fix order of extraction function invocations so that extraction goes from MSB side to LSB side of the given instruction coding content. This is desireable because of consistency and easier visual spotting of errors. After this patch, all such invocations should be in the desired order. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 210 ++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 372af90..e7f6975 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -7081,9 +7081,9 @@ std::string NMD::EVPE(uint64 instruction) std::string NMD::EXT(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7107,9 +7107,9 @@ std::string NMD::EXT(uint64 instruction) std::string NMD::EXTD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); + uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7133,9 +7133,9 @@ std::string NMD::EXTD(uint64 instruction) std::string NMD::EXTD32(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); + uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7159,8 +7159,8 @@ std::string NMD::EXTD32(uint64 instruction) std::string NMD::EXTPDP(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 size_value =3D extract_size_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7207,8 +7207,8 @@ std::string NMD::EXTPDPV(uint64 instruction) std::string NMD::EXTP(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ac_value =3D extract_ac_13_12(instruction); uint64 size_value =3D extract_size_20_19_18_17_16(instruction); + uint64 ac_value =3D extract_ac_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string ac =3D AC(copy(ac_value)); @@ -7448,9 +7448,9 @@ std::string NMD::EXTRV_W(uint64 instruction) std::string NMD::EXTW(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); uint64 rd_value =3D extract_rd_15_14_13_12_11(instruction); + uint64 shift_value =3D extract_shift_10_9_8_7_6(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7626,9 +7626,9 @@ std::string NMD::HYPCALL_16_(uint64 instruction) std::string NMD::INS(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 msbd_value =3D extract_msbt_10_9_8_7_6(instruction); uint64 lsb_value =3D extract_lsb_4_3_2_1_0(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -7777,9 +7777,9 @@ std::string NMD::JRC(uint64 instruction) */ std::string NMD::LB_16_(uint64 instruction) { - uint64 u_value =3D extract_u_1_0(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(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 u =3D IMMEDIATE(copy(u_value)); @@ -7824,8 +7824,8 @@ std::string NMD::LB_GP_(uint64 instruction) std::string NMD::LB_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -7872,8 +7872,8 @@ std::string NMD::LB_U12_(uint64 instruction) std::string NMD::LBE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -7895,9 +7895,9 @@ std::string NMD::LBE(uint64 instruction) */ std::string NMD::LBU_16_(uint64 instruction) { - uint64 u_value =3D extract_u_1_0(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(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 u =3D IMMEDIATE(copy(u_value)); @@ -7942,8 +7942,8 @@ std::string NMD::LBU_GP_(uint64 instruction) std::string NMD::LBU_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -7990,8 +7990,8 @@ std::string NMD::LBU_U12_(uint64 instruction) std::string NMD::LBUE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8084,8 +8084,8 @@ std::string NMD::LD_GP_(uint64 instruction) std::string NMD::LD_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8153,9 +8153,9 @@ std::string NMD::LDC1_GP_(uint64 instruction) */ std::string NMD::LDC1_S9_(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8178,8 +8178,8 @@ std::string NMD::LDC1_S9_(uint64 instruction) std::string NMD::LDC1_U12_(uint64 instruction) { uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8202,8 +8202,8 @@ std::string NMD::LDC1_U12_(uint64 instruction) std::string NMD::LDC1XS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8226,8 +8226,8 @@ std::string NMD::LDC1XS(uint64 instruction) std::string NMD::LDC1X(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8249,9 +8249,9 @@ std::string NMD::LDC1X(uint64 instruction) */ std::string NMD::LDC2(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ct_value =3D extract_ct_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string ct =3D CPR(copy(ct_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8274,9 +8274,9 @@ std::string NMD::LDC2(uint64 instruction) std::string NMD::LDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8369,9 +8369,9 @@ std::string NMD::LDXS(uint64 instruction) */ std::string NMD::LH_16_(uint64 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); + uint64 u_value =3D extract_u_2_1__s1(instruction); =20 std::string rt3 =3D GPR(encode_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8416,8 +8416,8 @@ std::string NMD::LH_GP_(uint64 instruction) std::string NMD::LH_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8464,8 +8464,8 @@ std::string NMD::LH_U12_(uint64 instruction) std::string NMD::LHE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8487,9 +8487,9 @@ std::string NMD::LHE(uint64 instruction) */ std::string NMD::LHU_16_(uint64 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); + uint64 u_value =3D extract_u_2_1__s1(instruction); =20 std::string rt3 =3D GPR(encode_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8534,8 +8534,8 @@ std::string NMD::LHU_GP_(uint64 instruction) std::string NMD::LHU_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8582,8 +8582,8 @@ std::string NMD::LHU_U12_(uint64 instruction) std::string NMD::LHUE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8701,8 +8701,8 @@ std::string NMD::LHX(uint64 instruction) */ std::string NMD::LI_16_(uint64 instruction) { - uint64 eu_value =3D extract_eu_6_5_4_3_2_1_0(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 eu =3D IMMEDIATE(encode_eu_from_s_li16(eu_value)); @@ -8746,8 +8746,8 @@ std::string NMD::LI_48_(uint64 instruction) std::string NMD::LL(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8770,8 +8770,8 @@ std::string NMD::LL(uint64 instruction) std::string NMD::LLD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_s3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_s3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8818,8 +8818,8 @@ std::string NMD::LLDP(uint64 instruction) std::string NMD::LLE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -8890,9 +8890,9 @@ std::string NMD::LLWPE(uint64 instruction) std::string NMD::LSA(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 rd_value =3D extract_rd_15_14_13_12_11(instruction); uint64 u2_value =3D extract_u2_10_9(instruction); - uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); =20 std::string rd =3D GPR(copy(rd_value)); std::string rs =3D GPR(copy(rs_value)); @@ -8937,9 +8937,9 @@ std::string NMD::LUI(uint64 instruction) */ std::string NMD::LW_16_(uint64 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); + uint64 u_value =3D extract_u_3_2_1_0__s2(instruction); =20 std::string rt3 =3D GPR(encode_gpr3(rt3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -8961,8 +8961,8 @@ std::string NMD::LW_16_(uint64 instruction) */ 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 rs4_value =3D extract_rs4_4_2_1_0(instruction); uint64 u_value =3D extract_u_3_8__s2(instruction); =20 std::string rt4 =3D GPR(encode_gpr4(rt4_value)); @@ -9007,8 +9007,8 @@ std::string NMD::LW_GP_(uint64 instruction) */ std::string NMD::LW_GP16_(uint64 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); + 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 u =3D IMMEDIATE(copy(u_value)); @@ -9030,8 +9030,8 @@ std::string NMD::LW_GP16_(uint64 instruction) std::string NMD::LW_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -9121,9 +9121,9 @@ std::string NMD::LWC1_GP_(uint64 instruction) */ std::string NMD::LWC1_S9_(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -9146,8 +9146,8 @@ std::string NMD::LWC1_S9_(uint64 instruction) std::string NMD::LWC1_U12_(uint64 instruction) { uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -9170,8 +9170,8 @@ std::string NMD::LWC1_U12_(uint64 instruction) std::string NMD::LWC1X(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9194,8 +9194,8 @@ std::string NMD::LWC1X(uint64 instruction) std::string NMD::LWC1XS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -9217,9 +9217,9 @@ std::string NMD::LWC1XS(uint64 instruction) */ std::string NMD::LWC2(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ct_value =3D extract_ct_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string ct =3D CPR(copy(ct_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -9242,8 +9242,8 @@ std::string NMD::LWC2(uint64 instruction) std::string NMD::LWE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -9266,9 +9266,9 @@ std::string NMD::LWE(uint64 instruction) std::string NMD::LWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -9336,8 +9336,8 @@ std::string NMD::LWU_GP_(uint64 instruction) std::string NMD::LWU_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -10307,9 +10307,9 @@ std::string NMD::MOVE_BALC(uint64 instruction) */ std::string NMD::MOVEP(uint64 instruction) { - uint64 rsz4_value =3D extract_rsz4_4_2_1_0(instruction); uint64 rtz4_value =3D extract_rtz4_9_7_6_5(instruction); uint64 rd2_value =3D extract_rd2_3_8(instruction); + uint64 rsz4_value =3D extract_rsz4_4_2_1_0(instruction); =20 std::string rd2 =3D GPR(encode_rd2_reg1(rd2_value)); std::string re2 =3D GPR(encode_rd2_reg2(rd2_value)); @@ -10334,9 +10334,9 @@ std::string NMD::MOVEP(uint64 instruction) */ std::string NMD::MOVEP_REV_(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 rd2_value =3D extract_rd2_3_8(instruction); + uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); =20 std::string rs4 =3D GPR(encode_gpr4(rs4_value)); std::string rt4 =3D GPR(encode_gpr4(rt4_value)); @@ -10901,8 +10901,8 @@ std::string NMD::MUL_32_(uint64 instruction) */ std::string NMD::MUL_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 rs4_value =3D extract_rs4_4_2_1_0(instruction); =20 std::string rs4 =3D GPR(encode_gpr4(rs4_value)); std::string rt4 =3D GPR(encode_gpr4(rt4_value)); @@ -11862,8 +11862,8 @@ std::string NMD::PRECR_QB_PH(uint64 instruction) std::string NMD::PRECR_SRA_PH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -11886,8 +11886,8 @@ std::string NMD::PRECR_SRA_PH_W(uint64 instruction) std::string NMD::PRECR_SRA_R_PH_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12053,9 +12053,9 @@ std::string NMD::PREF_U12_(uint64 instruction) */ std::string NMD::PREFE(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 hint_value =3D extract_hint_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string hint =3D IMMEDIATE(copy(hint_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12078,8 +12078,8 @@ std::string NMD::PREFE(uint64 instruction) std::string NMD::PREPEND(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -12323,8 +12323,8 @@ std::string NMD::REPLV_QB(uint64 instruction) */ 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 count_value =3D extract_count_19_18_17_16(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 @@ -12346,9 +12346,9 @@ std::string NMD::RESTORE_32_(uint64 instruction) */ 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 extract_u_7_6_5_4__s4(instruction); + uint64 count_value =3D extract_count_3_2_1_0(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); return img::format("RESTORE.JRC %s%s", u, @@ -12666,9 +12666,9 @@ std::string NMD::RSQRT_S(uint64 instruction) */ 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 extract_u_7_6_5_4__s4(instruction); + uint64 count_value =3D extract_count_3_2_1_0(instruction); =20 std::string u =3D IMMEDIATE(copy(u_value)); return img::format("SAVE %s%s", u, @@ -12734,8 +12734,8 @@ std::string NMD::SAVEF(uint64 instruction) std::string NMD::SB_16_(uint64 instruction) { uint64 rtz3_value =3D extract_rtz3_9_8_7(instruction); - uint64 u_value =3D extract_u_1_0(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); + uint64 u_value =3D extract_u_1_0(instruction); =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -12780,8 +12780,8 @@ std::string NMD::SB_GP_(uint64 instruction) std::string NMD::SB_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12828,8 +12828,8 @@ std::string NMD::SB_U12_(uint64 instruction) std::string NMD::SBE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12876,8 +12876,8 @@ std::string NMD::SBX(uint64 instruction) std::string NMD::SC(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12900,8 +12900,8 @@ std::string NMD::SC(uint64 instruction) std::string NMD::SCD(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_s3(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_s3(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -12948,8 +12948,8 @@ std::string NMD::SCDP(uint64 instruction) std::string NMD::SCE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_s2(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13042,8 +13042,8 @@ std::string NMD::SD_GP_(uint64 instruction) std::string NMD::SD_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13151,9 +13151,9 @@ std::string NMD::SDC1_GP_(uint64 instruction) */ std::string NMD::SDC1_S9_(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13176,8 +13176,8 @@ std::string NMD::SDC1_S9_(uint64 instruction) std::string NMD::SDC1_U12_(uint64 instruction) { uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -13200,8 +13200,8 @@ std::string NMD::SDC1_U12_(uint64 instruction) std::string NMD::SDC1X(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13224,8 +13224,8 @@ std::string NMD::SDC1X(uint64 instruction) std::string NMD::SDC1XS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13248,8 +13248,8 @@ std::string NMD::SDC1XS(uint64 instruction) std::string NMD::SDC2(uint64 instruction) { uint64 cs_value =3D extract_cs_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string cs =3D CPR(copy(cs_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13272,9 +13272,9 @@ std::string NMD::SDC2(uint64 instruction) std::string NMD::SDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13580,8 +13580,8 @@ 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 extract_u_2_1__s1(instruction); uint64 rs3_value =3D extract_rs3_6_5_4(instruction); + uint64 u_value =3D extract_u_2_1__s1(instruction); =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -13626,8 +13626,8 @@ std::string NMD::SH_GP_(uint64 instruction) std::string NMD::SH_S9_(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13674,8 +13674,8 @@ std::string NMD::SH_U12_(uint64 instruction) std::string NMD::SHE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -13814,8 +13814,8 @@ std::string NMD::SHLL_S_PH(uint64 instruction) std::string NMD::SHLL_S_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13934,8 +13934,8 @@ std::string NMD::SHLLV_S_W(uint64 instruction) std::string NMD::SHRA_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13958,8 +13958,8 @@ std::string NMD::SHRA_PH(uint64 instruction) std::string NMD::SHRA_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -13982,8 +13982,8 @@ std::string NMD::SHRA_QB(uint64 instruction) std::string NMD::SHRA_R_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14006,8 +14006,8 @@ std::string NMD::SHRA_R_PH(uint64 instruction) std::string NMD::SHRA_R_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14030,8 +14030,8 @@ std::string NMD::SHRA_R_QB(uint64 instruction) std::string NMD::SHRA_R_W(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12_11(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14174,8 +14174,8 @@ std::string NMD::SHRAV_R_W(uint64 instruction) std::string NMD::SHRL_PH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13_12(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14198,8 +14198,8 @@ std::string NMD::SHRL_PH(uint64 instruction) std::string NMD::SHRL_QB(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 sa_value =3D extract_sa_15_14_13(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 sa_value =3D extract_sa_15_14_13(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string rs =3D GPR(copy(rs_value)); @@ -14337,9 +14337,9 @@ std::string NMD::SIGRIE(uint64 instruction) */ std::string NMD::SLL_16_(uint64 instruction) { - uint64 shift3_value =3D extract_shift3_2_1_0(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(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)); @@ -14641,9 +14641,9 @@ std::string NMD::SRAV(uint64 instruction) */ std::string NMD::SRL_16_(uint64 instruction) { - uint64 shift3_value =3D extract_shift3_2_1_0(instruction); uint64 rt3_value =3D extract_rt3_9_8_7(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)); @@ -15154,8 +15154,8 @@ 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 extract_u_3_2_1_0__s2(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 rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15177,8 +15177,8 @@ std::string NMD::SW_16_(uint64 instruction) */ 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 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)); @@ -15201,8 +15201,8 @@ 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 extract_u_6_5_4_3_2_1_0__s2(instruction); + uint64 rtz3_value =3D extract_rtz3_9_8_7(instruction); =20 std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15337,9 +15337,9 @@ std::string NMD::SWC1_GP_(uint64 instruction) */ std::string NMD::SWC1_S9_(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -15362,8 +15362,8 @@ std::string NMD::SWC1_S9_(uint64 instruction) std::string NMD::SWC1_U12_(uint64 instruction) { uint64 ft_value =3D extract_ft_25_24_23_22_21(instruction); - uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 u_value =3D extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string u =3D IMMEDIATE(copy(u_value)); @@ -15386,8 +15386,8 @@ std::string NMD::SWC1_U12_(uint64 instruction) std::string NMD::SWC1X(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15410,8 +15410,8 @@ std::string NMD::SWC1X(uint64 instruction) std::string NMD::SWC1XS(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + uint64 ft_value =3D extract_ft_15_14_13_12_11(instruction); =20 std::string ft =3D FPR(copy(ft_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15434,8 +15434,8 @@ std::string NMD::SWC1XS(uint64 instruction) std::string NMD::SWC2(uint64 instruction) { uint64 cs_value =3D extract_cs_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string cs =3D CPR(copy(cs_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -15458,8 +15458,8 @@ std::string NMD::SWC2(uint64 instruction) std::string NMD::SWE(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -15482,9 +15482,9 @@ std::string NMD::SWE(uint64 instruction) std::string NMD::SWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -15597,8 +15597,8 @@ std::string NMD::SYNC(uint64 instruction) */ std::string NMD::SYNCI(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string s =3D IMMEDIATE(copy(s_value)); std::string rs =3D GPR(copy(rs_value)); @@ -15619,8 +15619,8 @@ std::string NMD::SYNCI(uint64 instruction) */ std::string NMD::SYNCIE(uint64 instruction) { - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string s =3D IMMEDIATE(copy(s_value)); std::string rs =3D GPR(copy(rs_value)); @@ -16028,9 +16028,9 @@ std::string NMD::TRUNC_W_S(uint64 instruction) std::string NMD::UALDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -16054,8 +16054,8 @@ std::string NMD::UALDM(uint64 instruction) std::string NMD::UALH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -16078,9 +16078,9 @@ std::string NMD::UALH(uint64 instruction) std::string NMD::UALWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -16104,9 +16104,9 @@ std::string NMD::UALWM(uint64 instruction) std::string NMD::UASDM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -16130,8 +16130,8 @@ std::string NMD::UASDM(uint64 instruction) std::string NMD::UASH(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); @@ -16154,9 +16154,9 @@ std::string NMD::UASH(uint64 instruction) std::string NMD::UASWM(uint64 instruction) { uint64 rt_value =3D extract_rt_25_24_23_22_21(instruction); - uint64 count3_value =3D extract_count3_14_13_12(instruction); - int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); uint64 rs_value =3D extract_rs_20_19_18_17_16(instruction); + int64 s_value =3D extract_s__se8_15_7_6_5_4_3_2_1_0(instruction); + uint64 count3_value =3D extract_count3_14_13_12(instruction); =20 std::string rt =3D GPR(copy(rt_value)); std::string s =3D IMMEDIATE(copy(s_value)); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=listsout.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from listsout.gnu.org (listsout.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1545822609809933.7157841866484; Wed, 26 Dec 2018 03:10:09 -0800 (PST) Received: from localhost ([127.0.0.1]:45507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc74e-0001H0-Us for importer@patchew.org; Wed, 26 Dec 2018 06:10:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72S-0007v0-5i for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72Q-0001nW-Bj for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:48 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54633 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 1gc72Q-0001n2-0k for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:46 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 1893F1A1DE1; Wed, 26 Dec 2018 12:07:00 +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 EDE0E1A1D3B; Wed, 26 Dec 2018 12:06:59 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:19 +0100 Message-Id: <1545822388-10911-12-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 11/20] disas: nanoMIPS: Clean up handling of 48-bit instructions 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Clean up handling of 48-bit nanoMIPS instructions: - ADDIU[48] - ADDIU[GP48] - ADDIUPC[48] - LI[48] - LWPC[48] - SWPC[48] Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 70 ++++++++++++++++++++++++++++----------------------= ---- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index e7f6975..72e2266 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -1812,13 +1812,14 @@ std::string NMD::ADDIU_32_(uint64 instruction) =20 =20 /* + * ADDIU[48] rt, imm - Add Immediate (Untrapped) (rs =3D rt) * - * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 0010000100111111 + * 4 3 2 1 + * 765432109876543210987654321098765432109876543210 + * 011000 00001 * rt ----- - * rs ----- + * s[15:0] ---------------- + * s[31:16] ---------------- */ std::string NMD::ADDIU_48_(uint64 instruction) { @@ -1833,13 +1834,14 @@ std::string NMD::ADDIU_48_(uint64 instruction) =20 =20 /* + * ADDIU[GP48] rt, imm - Add Immediate (Untrapped) (rs =3D 28) * - * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 0010000100111111 + * 4 3 2 1 + * 765432109876543210987654321098765432109876543210 + * 011000 00010 * rt ----- - * rs ----- + * s[15:0] ---------------- + * s[31:16] ---------------- */ std::string NMD::ADDIU_GP48_(uint64 instruction) { @@ -2005,14 +2007,14 @@ std::string NMD::ADDIUPC_32_(uint64 instruction) =20 =20 /* + * ADDIUPC[48] rt, imm - Add Immediate (Untrapped) to PC * - * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 x1110000101 + * 4 3 2 1 + * 765432109876543210987654321098765432109876543210 + * 011000 00011 * rt ----- - * rs ----- - * rd ----- + * s[15:0] ---------------- + * s[31:16] ---------------- */ std::string NMD::ADDIUPC_48_(uint64 instruction) { @@ -8712,14 +8714,14 @@ std::string NMD::LI_16_(uint64 instruction) =20 =20 /* + * LI[48] rt, s - Load Immediate * - * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 x1110000101 + * 4 3 2 1 + * 765432109876543210987654321098765432109876543210 + * 011000 00000 * rt ----- - * rs ----- - * rd ----- + * s[15:0] ---------------- + * s[31:16] ---------------- */ std::string NMD::LI_48_(uint64 instruction) { @@ -9280,14 +9282,14 @@ std::string NMD::LWM(uint64 instruction) =20 =20 /* + * LWPC[48] rt, address - Load Word PC relative * - * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 x1110000101 + * 4 3 2 1 + * 765432109876543210987654321098765432109876543210 + * 011000 01011 * rt ----- - * rs ----- - * rd ----- + * s[15:0] ---------------- + * s[31:16] ---------------- */ std::string NMD::LWPC_48_(uint64 instruction) { @@ -15496,14 +15498,14 @@ std::string NMD::SWM(uint64 instruction) =20 =20 /* - * ADDQH_R.W rd, rt, rs - Add Fractional Words And Shift Right to Halve Re= sults + * SWPC[48] rt, address - Load Word PC relative * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 00010001101 + * 4 3 2 1 + * 765432109876543210987654321098765432109876543210 + * 011000 01111 * rt ----- - * rs ----- - * rd ----- + * s[15:0] ---------------- + * s[31:16] ---------------- */ std::string NMD::SWPC_48_(uint64 instruction) { --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545822648441984.8096166186028; Wed, 26 Dec 2018 03:10:48 -0800 (PST) Received: from localhost ([127.0.0.1]:45512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc75K-0002Pr-WB for importer@patchew.org; Wed, 26 Dec 2018 06:10:47 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72S-0007vh-TZ for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72R-0001oj-QH for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:48 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54664 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 1gc72R-0001o5-F5 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:47 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 2B0181A1DEE; Wed, 26 Dec 2018 12:07:00 +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 01DED1A20D0; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:20 +0100 Message-Id: <1545822388-10911-13-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 12/20] disas: nanoMIPS: Clean up handling of 16-bit logic instructions 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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 Clean up handling of 16-bit logic nanoMIPS instructions: - AND[16] - ANDI[16] - NOR[16] - NOT[16] - OR[16] - XOR[16] Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 55 ++++++++++++++++++++++++--------------------------= ---- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 72e2266..115c347 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -2483,13 +2483,12 @@ std::string NMD::ALUIPC(uint64 instruction) =20 =20 /* - * AND[16] rt3, rs3 - + * AND[16] rt3, rs3 - Write logical OR of registers rs3 and rt3 to registe= r rt3 * * 5432109876543210 - * 101100 + * 010100 1000 * rt3 --- * rs3 --- - * eu ---- */ std::string NMD::AND_16_(uint64 instruction) { @@ -2499,7 +2498,7 @@ std::string NMD::AND_16_(uint64 instruction) std::string rt3 =3D GPR(encode_gpr3(rt3_value)); std::string rs3 =3D GPR(encode_gpr3(rs3_value)); =20 - return img::format("AND %s, %s", rs3, rt3); + return img::format("AND[16] %s, %s", rs3, rt3); } =20 =20 @@ -2528,10 +2527,10 @@ std::string NMD::AND_32_(uint64 instruction) =20 =20 /* - * ANDI rt, rs, u - + * ANDI rt, rs, u - Write logical AND of register rs3 and immediate eu to = rt3 * * 5432109876543210 - * 101100 + * 111100 * rt3 --- * rs3 --- * eu ---- @@ -2546,7 +2545,7 @@ std::string NMD::ANDI_16_(uint64 instruction) std::string rs3 =3D GPR(encode_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); + return img::format("ANDI[16] %s, %s, %s", rt3, rs3, eu); } =20 =20 @@ -11426,14 +11425,12 @@ std::string NMD::NOR(uint64 instruction) =20 =20 /* - * ADDQH_R.W rd, rt, rs - Add Fractional Words And Shift Right to Halve Re= sults + * NOT[16] rt3, rs3 - Write logical inversion of register rs3 to register = rt3 * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 00010001101 - * rt ----- - * rs ----- - * rd ----- + * 5432109876543210 + * 010100 0000 + * rt3 --- + * rs3 --- */ std::string NMD::NOT_16_(uint64 instruction) { @@ -11443,19 +11440,17 @@ std::string NMD::NOT_16_(uint64 instruction) std::string rt3 =3D GPR(encode_gpr3(rt3_value)); std::string rs3 =3D GPR(encode_gpr3(rs3_value)); =20 - return img::format("NOT %s, %s", rt3, rs3); + return img::format("NOT[16] %s, %s", rt3, rs3); } =20 =20 /* - * ADDQH_R.W rd, rt, rs - Add Fractional Words And Shift Right to Halve Re= sults + * OR[16] rs3, rt3 - Write logical OR of registers rs3 and rt3 to register= rt3 * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 00010001101 - * rt ----- - * rs ----- - * rd ----- + * 5432109876543210 + * 010100 1100 + * rt3 --- + * rs3 --- */ std::string NMD::OR_16_(uint64 instruction) { @@ -11465,7 +11460,7 @@ std::string NMD::OR_16_(uint64 instruction) std::string rs3 =3D GPR(encode_gpr3(rs3_value)); std::string rt3 =3D GPR(encode_gpr3(rt3_value)); =20 - return img::format("OR %s, %s", rs3, rt3); + return img::format("OR[16] %s, %s", rs3, rt3); } =20 =20 @@ -16251,14 +16246,12 @@ std::string NMD::WRPGPR(uint64 instruction) =20 =20 /* - * ADDQH_R.W rd, rt, rs - Add Fractional Words And Shift Right to Halve Re= sults + * XOR[16] rs3, rt3 - Write logical XOR of registers rs3 and rt3 to regist= er rt3 * - * 3 2 1 - * 10987654321098765432109876543210 - * 001000 00010001101 - * rt ----- - * rs ----- - * rd ----- + * 5432109876543210 + * 010100 0100 + * rt3 --- + * rs3 --- */ std::string NMD::XOR_16_(uint64 instruction) { @@ -16268,7 +16261,7 @@ std::string NMD::XOR_16_(uint64 instruction) std::string rs3 =3D GPR(encode_gpr3(rs3_value)); std::string rt3 =3D GPR(encode_gpr3(rt3_value)); =20 - return img::format("XOR %s, %s", rs3, rt3); + return img::format("XOR[16] %s, %s", rs3, rt3); } =20 =20 --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545823168637128.24317737012063; Wed, 26 Dec 2018 03:19:28 -0800 (PST) Received: from localhost ([127.0.0.1]:45593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Di-00043L-TL for importer@patchew.org; Wed, 26 Dec 2018 06:19:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085X-5V for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72c-0001vP-2r for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54667 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 1gc72b-0001oB-LE for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:57 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 37DBD1A20BB; Wed, 26 Dec 2018 12:07:00 +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 0A6261A1D8E; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:21 +0100 Message-Id: <1545822388-10911-14-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 13/20] 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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. 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 115c347..44d520a 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -295,7 +295,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, @@ -380,14 +380,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 @@ -1934,7 +1934,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); @@ -1956,8 +1956,8 @@ std::string NMD::ADDIU_R2_(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)); std::string u =3D IMMEDIATE(copy(u_value)); =20 return img::format("ADDIU %s, %s, %s", rt3, rs3, u); @@ -2237,9 +2237,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); } @@ -2495,8 +2495,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[16] %s, %s", rs3, rt3); } @@ -2541,8 +2541,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[16] %s, %s, %s", rt3, rs3, eu); @@ -2876,7 +2876,7 @@ std::string NMD::BEQC_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(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); @@ -2946,7 +2946,7 @@ std::string NMD::BEQZC_16_(uint64 instruction) int64 s_value =3D extract_s__se7_0_6_5_4_3_2_1_s1(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 s =3D ADDRESS(encode_s_from_address(s_value), 2); =20 return img::format("BEQZC %s, %s", rt3, s); @@ -3162,7 +3162,7 @@ std::string NMD::BNEC_16_(uint64 instruction) uint64 rs3_value =3D extract_rs3_6_5_4(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); @@ -3232,7 +3232,7 @@ std::string NMD::BNEZC_16_(uint64 instruction) int64 s_value =3D extract_s__se7_0_6_5_4_3_2_1_s1(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 s =3D ADDRESS(encode_s_from_address(s_value), 2); =20 return img::format("BNEZC %s, %s", rt3, s); @@ -7782,9 +7782,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); } @@ -7900,9 +7900,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); } @@ -8374,9 +8374,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); } @@ -8492,9 +8492,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); } @@ -8705,7 +8705,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); @@ -8942,9 +8942,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); } @@ -9011,7 +9011,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); @@ -9460,9 +9460,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); } @@ -11437,8 +11437,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[16] %s, %s", rt3, rs3); } @@ -11457,8 +11457,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[16] %s, %s", rs3, rt3); } @@ -12736,7 +12736,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); } @@ -13582,7 +13582,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); } @@ -14338,8 +14338,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); @@ -14642,8 +14642,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); @@ -14960,9 +14960,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); } @@ -15156,7 +15156,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); } @@ -16258,8 +16258,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[16] %s, %s", rs3, rt3); } diff --git a/disas/nanomips.h b/disas/nanomips.h index f1ecab9..ec750cc 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 From nobody Fri Nov 7 02:31:54 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 1545823016602366.06329825363525; Wed, 26 Dec 2018 03:16:56 -0800 (PST) Received: from localhost ([127.0.0.1]:45570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7BG-0001TF-Ma for importer@patchew.org; Wed, 26 Dec 2018 06:16:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085V-5a for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72b-0001um-OI for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54666 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 1gc72b-0001o9-Ft for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:57 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 454D61A20CE; Wed, 26 Dec 2018 12:07:00 +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 1F0761A20B8; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:22 +0100 Message-Id: <1545822388-10911-15-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH v5 14/20] disas: nanoMIPS: Comment 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Comment the decoder of 'gpr3' gpr encoding type in nanoMIPS disassembler. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 44d520a..7b50e24 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -291,9 +291,54 @@ uint64 NMD::renumber_registers(uint64 index, uint64 *r= egister_list, =20 =20 /* - * these functions should be decode functions but the json does not have - * decode sections so they are based on the encode, the equivalent decode - * functions need writing eventually. + * NMD::decode_gpr_gpr3() - decoder for 'gpr3' gpr encoding type + * + * Map a 3-bit code to the 5-bit register space according to this patter= n: + * + * 7 6 5 4 3 2 1 0 + * | | | | | | | | + * | | | | | | | | + * | | | =E2=94=94-----------------------=E2=94= =90 + * | | =E2=94=94-----------------------=E2=94= =90 | + * | =E2=94=94-----------------------=E2=94=90 = | | + * =E2=94=94-----------------------=E2=94=90 | = | | + * | | | | | | | | + * =E2=94=8C-------=E2=94=98 | | | | | = | | + * | =E2=94=8C-------=E2=94=98 | | | | = | | + * | | =E2=94=8C-------=E2=94=98 | | | = | | + * | | | =E2=94=8C-------=E2=94=98 | | = | | + * | | | | | | | | + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * 3 2 1 0 + * + * Used in handling following instructions: + * + * - ADDIU[R1.SP] + * - ADDIU[R2] + * - ADDU[16] + * - AND[16] + * - ANDI[16] + * - BEQC[16] + * - BEQZC[16] + * - BNEC[16] + * - BNEZC[16] + * - LB[16] + * - LBU[16] + * - LH[16] + * - LHU[16] + * - LI[16] + * - LW[16] + * - LW[GP16] + * - LWXS[16] + * - NOT[16] + * - OR[16] + * - SB[16] + * - SH[16] + * - SLL[16] + * - SRL[16] + * - SUBU[16] + * - SW[16] + * - XOR[16] */ uint64 NMD::decode_gpr_gpr3(uint64 d) { --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545823480845171.21538402584383; Wed, 26 Dec 2018 03:24:40 -0800 (PST) Received: from localhost ([127.0.0.1]:45638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Il-0001ZO-3Y for importer@patchew.org; Wed, 26 Dec 2018 06:24:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085W-5D for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72c-0001vH-0L for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54669 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 1gc72b-0001oH-OO for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:57 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 4BAB91A20B8; Wed, 26 Dec 2018 12:07:00 +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 2B1C31A20D5; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:23 +0100 Message-Id: <1545822388-10911-16-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 15/20] disas: nanoMIPS: Rename the decoder of 'gpr3.src.store' 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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.src.store' gpr encoding type in nanoMIPS disassembler. 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 7b50e24..14e5866 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -348,7 +348,7 @@ uint64 NMD::decode_gpr_gpr3(uint64 d) } =20 =20 -uint64 NMD::encode_gpr3_store(uint64 d) +uint64 NMD::decode_gpr_gpr3_src_store(uint64 d) { static uint64 register_list[] =3D { 0, 17, 18, 19, 4, 5, 6, 7 }; return renumber_registers(d, register_list, @@ -12779,7 +12779,7 @@ std::string NMD::SB_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 rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); + std::string rtz3 =3D GPR(decode_gpr_gpr3_src_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 @@ -13625,7 +13625,7 @@ std::string NMD::SH_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 rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); + std::string rtz3 =3D GPR(decode_gpr_gpr3_src_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 @@ -15199,7 +15199,7 @@ std::string NMD::SW_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 rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); + std::string rtz3 =3D GPR(decode_gpr_gpr3_src_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); std::string rs3 =3D GPR(decode_gpr_gpr3(rs3_value)); =20 @@ -15246,7 +15246,7 @@ std::string NMD::SW_GP16_(uint64 instruction) uint64 u_value =3D extract_u_6_5_4_3_2_1_0__s2(instruction); uint64 rtz3_value =3D extract_rtz3_9_8_7(instruction); =20 - std::string rtz3 =3D GPR(encode_gpr3_store(rtz3_value)); + std::string rtz3 =3D GPR(decode_gpr_gpr3_src_store(rtz3_value)); std::string u =3D IMMEDIATE(copy(u_value)); =20 return img::format("SW %s, %s($%d)", rtz3, u, 28); diff --git a/disas/nanomips.h b/disas/nanomips.h index ec750cc..bb66c5f 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -106,7 +106,7 @@ private: uint64 renumber_registers(uint64 index, uint64 *register_list, size_t register_list_size); uint64 decode_gpr_gpr3(uint64 d); - uint64 encode_gpr3_store(uint64 d); + uint64 decode_gpr_gpr3_src_store(uint64 d); uint64 encode_rd1_from_rd(uint64 d); uint64 encode_gpr4_zero(uint64 d); uint64 encode_gpr4(uint64 d); --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 15458233349609.389584362701044; Wed, 26 Dec 2018 03:22:14 -0800 (PST) Received: from localhost ([127.0.0.1]:45615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7GP-0007b5-Au for importer@patchew.org; Wed, 26 Dec 2018 06:22:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085T-4h for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72b-0001uu-PN for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54670 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 1gc72b-0001oF-HM for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:57 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 529071A20C6; Wed, 26 Dec 2018 12:07:00 +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 33D201A20AF; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:24 +0100 Message-Id: <1545822388-10911-17-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH v5 16/20] disas: nanoMIPS: Comment the decoder of 'gpr3.src.store' 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Comment the decoder of 'gpr3.src.store' gpr encoding type in nanoMIPS disassembler. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 14e5866..9464b1e 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -348,6 +348,38 @@ uint64 NMD::decode_gpr_gpr3(uint64 d) } =20 =20 +/* + * NMD::decode_gpr_gpr3_src_store() - decoder for 'gpr3.src.store' gpr enc= oding + * type + * + * Map a 3-bit code to the 5-bit register space according to this patter= n: + * + * 7 6 5 4 3 2 1 0 + * | | | | | | | | + * | | | | | | | =E2=94=94---------------------= --=E2=94=90 + * | | | =E2=94=94-----------------------=E2=94= =90 | + * | | =E2=94=94-----------------------=E2=94= =90 | | + * | =E2=94=94-----------------------=E2=94=90 = | | | + * =E2=94=94-----------------------=E2=94=90 | = | | | + * | | | | | | | | + * =E2=94=8C-------=E2=94=98 | | | | = | | | + * | =E2=94=8C-------=E2=94=98 | | | = | | | + * | | =E2=94=8C-------=E2=94=98 | | = | | | + * | | | | | | | | + * | | | | | | | | + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * 3 2 1 0 + * + * This pattern is the same one used for 'gpr3' gpr encoding type, excep= t for + * the input value 0, that is mapped to the output value 0 instead of 16. + * + * Used in handling following instructions: + * + * - SB[16] + * - SH[16] + * - SW[16] + * - SW[GP16] + */ uint64 NMD::decode_gpr_gpr3_src_store(uint64 d) { static uint64 register_list[] =3D { 0, 17, 18, 19, 4, 5, 6, 7 }; --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545823174531696.863628154249; Wed, 26 Dec 2018 03:19:34 -0800 (PST) Received: from localhost ([127.0.0.1]:45591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Df-00042f-Jf for importer@patchew.org; Wed, 26 Dec 2018 06:19:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085a-71 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72c-0001vV-4U for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54674 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 1gc72b-0001oJ-O9 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:58 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 57B0F1A20EB; Wed, 26 Dec 2018 12:07:00 +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 3B9231A20D0; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:25 +0100 Message-Id: <1545822388-10911-18-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 17/20] disas: nanoMIPS: Rename the decoder of 'gpr4' 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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' gpr encoding type in nanoMIPS disassembler. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 20 ++++++++++---------- disas/nanomips.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 9464b1e..67be70a 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -405,7 +405,7 @@ uint64 NMD::encode_gpr4_zero(uint64 d) } =20 =20 -uint64 NMD::encode_gpr4(uint64 d) +uint64 NMD::decode_gpr_gpr4(uint64 d) { static uint64 register_list[] =3D { 8, 9, 10, 11, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23 }; @@ -2361,8 +2361,8 @@ std::string NMD::ADDU_4X4_(uint64 instruction) uint64 rt4_value =3D extract_rt4_9_7_6_5(instruction); uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); =20 - std::string rs4 =3D GPR(encode_gpr4(rs4_value)); - std::string rt4 =3D GPR(encode_gpr4(rt4_value)); + std::string rs4 =3D GPR(decode_gpr_gpr4(rs4_value)); + std::string rt4 =3D GPR(decode_gpr_gpr4(rt4_value)); =20 return img::format("ADDU %s, %s", rs4, rt4); } @@ -9043,9 +9043,9 @@ std::string NMD::LW_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 rt4 =3D GPR(encode_gpr4(rt4_value)); + std::string rt4 =3D GPR(decode_gpr_gpr4(rt4_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs4 =3D GPR(encode_gpr4(rs4_value)); + std::string rs4 =3D GPR(decode_gpr_gpr4(rs4_value)); =20 return img::format("LW %s, %s(%s)", rt4, u, rs4); } @@ -10416,8 +10416,8 @@ std::string NMD::MOVEP_REV_(uint64 instruction) uint64 rd2_value =3D extract_rd2_3_8(instruction); uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); =20 - std::string rs4 =3D GPR(encode_gpr4(rs4_value)); - std::string rt4 =3D GPR(encode_gpr4(rt4_value)); + std::string rs4 =3D GPR(decode_gpr_gpr4(rs4_value)); + std::string rt4 =3D GPR(decode_gpr_gpr4(rt4_value)); std::string rd2 =3D GPR(encode_rd2_reg1(rd2_value)); std::string rs2 =3D GPR(encode_rd2_reg2(rd2_value)); /* !!!!!!!!!! - no conversion function */ @@ -10982,8 +10982,8 @@ std::string NMD::MUL_4X4_(uint64 instruction) uint64 rt4_value =3D extract_rt4_9_7_6_5(instruction); uint64 rs4_value =3D extract_rs4_4_2_1_0(instruction); =20 - std::string rs4 =3D GPR(encode_gpr4(rs4_value)); - std::string rt4 =3D GPR(encode_gpr4(rt4_value)); + std::string rs4 =3D GPR(decode_gpr_gpr4(rs4_value)); + std::string rt4 =3D GPR(decode_gpr_gpr4(rt4_value)); =20 return img::format("MUL %s, %s", rs4, rt4); } @@ -15257,7 +15257,7 @@ std::string NMD::SW_4X4_(uint64 instruction) =20 std::string rtz4 =3D GPR(encode_gpr4_zero(rtz4_value)); std::string u =3D IMMEDIATE(copy(u_value)); - std::string rs4 =3D GPR(encode_gpr4(rs4_value)); + std::string rs4 =3D GPR(decode_gpr_gpr4(rs4_value)); =20 return img::format("SW %s, %s(%s)", rtz4, u, rs4); } diff --git a/disas/nanomips.h b/disas/nanomips.h index bb66c5f..0734844 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -109,7 +109,7 @@ private: uint64 decode_gpr_gpr3_src_store(uint64 d); uint64 encode_rd1_from_rd(uint64 d); uint64 encode_gpr4_zero(uint64 d); - uint64 encode_gpr4(uint64 d); + uint64 decode_gpr_gpr4(uint64 d); uint64 encode_rd2_reg1(uint64 d); uint64 encode_rd2_reg2(uint64 d); =20 --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545822974632623.1706835951682; Wed, 26 Dec 2018 03:16:14 -0800 (PST) Received: from localhost ([127.0.0.1]:45568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7Aa-0000XD-SY for importer@patchew.org; Wed, 26 Dec 2018 06:16:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085Y-5Y for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72b-0001vB-Uz for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54673 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 1gc72b-0001oK-NO for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:57 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 5EFE91A20AF; Wed, 26 Dec 2018 12:07:00 +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 444431A1D8E; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:26 +0100 Message-Id: <1545822388-10911-19-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH v5 18/20] disas: nanoMIPS: Comment the decoder of 'gpr4' 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Comment the decoder of 'gpr4' gpr encoding type in nanoMIPS disassembler. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 67be70a..c1db153 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -405,6 +405,32 @@ uint64 NMD::encode_gpr4_zero(uint64 d) } =20 =20 +/* + * NMD::decode_gpr_gpr4() - decoder for 'gpr4' gpr encoding type + * + * Map a 4-bit code to the 5-bit register space according to this patter= n: + * + * 1 0 + * 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | =E2=94=94---------------=E2=94= =90 + * | | | | | | | | | | =E2=94=94---------------=E2=94= =90 | + * | | | | | | | | | =E2=94=94---------------=E2=94=90 = | | + * | | | | | | | | =E2=94=94---------------=E2=94=90 | = | | + * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | | | | + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * 3 2 1 0 + * + * Used in handling following instructions: + * + * - ADDU[4X4] + * - LW[4X4] + * - MOVEP[REV] + * - MUL[4X4] + * - SW[4X4] + */ uint64 NMD::decode_gpr_gpr4(uint64 d) { static uint64 register_list[] =3D { 8, 9, 10, 11, 4, 5, 6, 7, --=20 2.7.4 From nobody Fri Nov 7 02:31:54 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 1545822972528710.7852327667463; Wed, 26 Dec 2018 03:16:12 -0800 (PST) Received: from localhost ([127.0.0.1]:45566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7AY-0000WL-NY for importer@patchew.org; Wed, 26 Dec 2018 06:16:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085S-4M for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72d-0001wG-5u for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54707 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 1gc72c-0001ov-U6 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:59 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 67AB51A1D8E; Wed, 26 Dec 2018 12:07:00 +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 4D72A1A20D9; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:27 +0100 Message-Id: <1545822388-10911-20-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-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] [PATCH v5 19/20] 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net 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. 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 c1db153..969c48b 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -396,7 +396,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 }; @@ -10392,7 +10392,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); @@ -10418,8 +10418,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 */ @@ -15281,7 +15281,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 0734844..917f33e 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 From nobody Fri Nov 7 02:31:54 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 1545823211575105.05106632497507; Wed, 26 Dec 2018 03:20:11 -0800 (PST) Received: from localhost ([127.0.0.1]:45595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc7EP-0004m2-UY for importer@patchew.org; Wed, 26 Dec 2018 06:20:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc72f-00085U-55 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc72d-0001wA-57 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:08:01 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54706 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 1gc72c-0001ot-TD for qemu-devel@nongnu.org; Wed, 26 Dec 2018 06:07:59 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 6F4E51A20D0; Wed, 26 Dec 2018 12:07:00 +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 56F821A20D5; Wed, 26 Dec 2018 12:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 12:06:28 +0100 Message-Id: <1545822388-10911-21-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1545822388-10911-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH v5 20/20] disas: nanoMIPS: Comment 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: smarkovic@wavecomp.com, amarkovic@wavecomp.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Comment the decoder of 'gpr4.zero' gpr encoding type in nanoMIPS disassembler. Signed-off-by: Aleksandar Markovic --- disas/nanomips.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 969c48b..d7d4e6a 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -396,6 +396,33 @@ uint64 NMD::encode_rd1_from_rd(uint64 d) } =20 =20 +/* + * NMD::decode_gpr_gpr4_zero() - decoder for 'gpr4.zero' gpr encoding type + * + * Map a 4-bit code to the 5-bit register space according to this patter= n: + * + * 1 0 + * 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | =E2=94=94-------------------= --=E2=94=90 + * | | | | | | | | | | | =E2=94=94---------------=E2=94= =90 | + * | | | | | | | | | | =E2=94=94---------------=E2=94= =90 | | + * | | | | | | | | | =E2=94=94---------------=E2=94=90 = | | | + * | | | | | | | | =E2=94=94---------------=E2=94=90 | = | | | + * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | | | | + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * 3 2 1 0 + * + * This pattern is the same one used for 'gpr4' gpr encoding type, excep= t for + * the input value 3, that is mapped to the output value 0 instead of 11. + * + * Used in handling following instructions: + * + * - MOVE.BALC + * - MOVEP + * - SW[4X4] + */ uint64 NMD::decode_gpr_gpr4_zero(uint64 d) { static uint64 register_list[] =3D { 8, 9, 10, 0, 4, 5, 6, 7, --=20 2.7.4