Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1019119/?format=api
{ "id": 1019119, "url": "http://patchwork.ozlabs.org/api/patches/1019119/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-15-git-send-email-aleksandar.markovic@rt-rk.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1545989148-13582-15-git-send-email-aleksandar.markovic@rt-rk.com>", "list_archive_url": null, "date": "2018-12-28T09:25:21", "name": "[PULL,14/41] disas: nanoMIPS: Fix a function misnomer", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a673aaecf0658119a7cdd89267321d59134aab60", "submitter": { "id": 68635, "url": "http://patchwork.ozlabs.org/api/people/68635/?format=api", "name": "Aleksandar Markovic", "email": "aleksandar.markovic@rt-rk.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-15-git-send-email-aleksandar.markovic@rt-rk.com/mbox/", "series": [ { "id": 83742, "url": "http://patchwork.ozlabs.org/api/series/83742/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=83742", "date": "2018-12-28T09:25:09", "name": "[PULL,01/41] MAINTAINERS: target/mips: Add MIPS files under default-configs directory", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/83742/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1019119/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1019119/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=rt-rk.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [208.118.235.17])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 43R2650SWtz9s55\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 28 Dec 2018 20:51:25 +1100 (AEDT)", "from localhost ([127.0.0.1]:57943 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1gcona-0000ap-HA\n\tfor incoming@patchwork.ozlabs.org; Fri, 28 Dec 2018 04:51:22 -0500", "from eggs.gnu.org ([208.118.235.92]:52800)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gcomd-0000Dv-Te\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:50:30 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gcoPB-0003IE-Rf\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:26 -0500", "from mx2.rt-rk.com ([89.216.37.149]:49211 helo=mail.rt-rk.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <aleksandar.markovic@rt-rk.com>)\n\tid 1gcoPB-00034r-4O\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:09 -0500", "from localhost (localhost [127.0.0.1])\n\tby mail.rt-rk.com (Postfix) with ESMTP id 5ADC51A208A;\n\tFri, 28 Dec 2018 10:25:55 +0100 (CET)", "from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local\n\t[10.10.13.43])\n\tby mail.rt-rk.com (Postfix) with ESMTPSA id 044971A1DAE;\n\tFri, 28 Dec 2018 10:25:55 +0100 (CET)" ], "X-Virus-Scanned": "amavisd-new at rt-rk.com", "From": "Aleksandar Markovic <aleksandar.markovic@rt-rk.com>", "To": "qemu-devel@nongnu.org", "Date": "Fri, 28 Dec 2018 10:25:21 +0100", "Message-Id": "<1545989148-13582-15-git-send-email-aleksandar.markovic@rt-rk.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1545989148-13582-1-git-send-email-aleksandar.markovic@rt-rk.com>", "References": "<1545989148-13582-1-git-send-email-aleksandar.markovic@rt-rk.com>", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [fuzzy]", "X-Received-From": "89.216.37.149", "Subject": "[Qemu-devel] [PULL 14/41] disas: nanoMIPS: Fix a function misnomer", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "peter.maydell@linaro.org, amarkovic@wavecomp.com", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Aleksandar Markovic <amarkovic@wavecomp.com>\n\nFix wrong function name. The convention in these files is that names of\nextraction functions should reflect bit patterns they are extracting.\n\nReviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>\nReviewed-by: Stefan Markovic <smarkovic@wavecomp.com>\nSigned-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>\n---\n disas/nanomips.cpp | 264 ++++++++++++++++++++++++++---------------------------\n disas/nanomips.h | 2 +-\n 2 files changed, 133 insertions(+), 133 deletions(-)", "diff": "diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp\nindex 4784530..2abf18d 100644\n--- a/disas/nanomips.cpp\n+++ b/disas/nanomips.cpp\n@@ -1395,7 +1395,7 @@ uint64 NMD::extr_uil2il2bs16Fmsb17(uint64 instruction)\n }\n \n \n-uint64 NMD::extract_rd_20_19_18_17_16(uint64 instruction)\n+uint64 NMD::extract_rd_15_14_13_12_11(uint64 instruction)\n {\n uint64 value = 0;\n value |= extract_bits(instruction, 11, 5);\n@@ -1583,7 +1583,7 @@ bool NMD::PREFE_cond(uint64 instruction)\n \n bool NMD::SLTU_cond(uint64 instruction)\n {\n- uint64 rd = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd = extract_rd_15_14_13_12_11(instruction);\n return rd != 0;\n }\n \n@@ -1731,7 +1731,7 @@ std::string NMD::ACLR(uint64 instruction)\n std::string NMD::ADD(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2043,7 +2043,7 @@ std::string NMD::ADDIUPC_48_(uint64 instruction)\n std::string NMD::ADDQ_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2067,7 +2067,7 @@ std::string NMD::ADDQ_PH(uint64 instruction)\n std::string NMD::ADDQ_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2091,7 +2091,7 @@ std::string NMD::ADDQ_S_PH(uint64 instruction)\n std::string NMD::ADDQ_S_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2116,7 +2116,7 @@ std::string NMD::ADDQ_S_W(uint64 instruction)\n std::string NMD::ADDQH_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2141,7 +2141,7 @@ std::string NMD::ADDQH_PH(uint64 instruction)\n std::string NMD::ADDQH_R_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2165,7 +2165,7 @@ std::string NMD::ADDQH_R_PH(uint64 instruction)\n std::string NMD::ADDQH_R_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2189,7 +2189,7 @@ std::string NMD::ADDQH_R_W(uint64 instruction)\n std::string NMD::ADDQH_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2213,7 +2213,7 @@ std::string NMD::ADDQH_W(uint64 instruction)\n std::string NMD::ADDSC(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2260,7 +2260,7 @@ std::string NMD::ADDU_16_(uint64 instruction)\n std::string NMD::ADDU_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2306,7 +2306,7 @@ std::string NMD::ADDU_4X4_(uint64 instruction)\n std::string NMD::ADDU_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2330,7 +2330,7 @@ std::string NMD::ADDU_PH(uint64 instruction)\n std::string NMD::ADDU_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2354,7 +2354,7 @@ std::string NMD::ADDU_QB(uint64 instruction)\n std::string NMD::ADDU_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2378,7 +2378,7 @@ std::string NMD::ADDU_S_PH(uint64 instruction)\n std::string NMD::ADDU_S_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2403,7 +2403,7 @@ std::string NMD::ADDU_S_QB(uint64 instruction)\n std::string NMD::ADDUH_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2428,7 +2428,7 @@ std::string NMD::ADDUH_QB(uint64 instruction)\n std::string NMD::ADDUH_R_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2451,7 +2451,7 @@ std::string NMD::ADDUH_R_QB(uint64 instruction)\n std::string NMD::ADDWC(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -2518,7 +2518,7 @@ std::string NMD::AND_16_(uint64 instruction)\n std::string NMD::AND_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -4725,7 +4725,7 @@ std::string NMD::CMP_UN_S(uint64 instruction)\n std::string NMD::CMPGDU_EQ_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -4749,7 +4749,7 @@ std::string NMD::CMPGDU_EQ_QB(uint64 instruction)\n std::string NMD::CMPGDU_LE_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -4773,7 +4773,7 @@ std::string NMD::CMPGDU_LE_QB(uint64 instruction)\n std::string NMD::CMPGDU_LT_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -4797,7 +4797,7 @@ std::string NMD::CMPGDU_LT_QB(uint64 instruction)\n std::string NMD::CMPGU_EQ_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -4821,7 +4821,7 @@ std::string NMD::CMPGU_EQ_QB(uint64 instruction)\n std::string NMD::CMPGU_LE_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -4845,7 +4845,7 @@ std::string NMD::CMPGU_LE_QB(uint64 instruction)\n std::string NMD::CMPGU_LT_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5333,7 +5333,7 @@ std::string NMD::DADDIU_U12_(uint64 instruction)\n std::string NMD::DADD(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5357,7 +5357,7 @@ std::string NMD::DADD(uint64 instruction)\n std::string NMD::DADDU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5425,7 +5425,7 @@ std::string NMD::DCLZ(uint64 instruction)\n std::string NMD::DDIV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5449,7 +5449,7 @@ std::string NMD::DDIV(uint64 instruction)\n std::string NMD::DDIVU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5673,7 +5673,7 @@ std::string NMD::DI(uint64 instruction)\n std::string NMD::DIV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5745,7 +5745,7 @@ std::string NMD::DIV_S(uint64 instruction)\n std::string NMD::DIVU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5769,7 +5769,7 @@ std::string NMD::DIVU(uint64 instruction)\n std::string NMD::DLSA(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 u2_value = extract_u2_10_9(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n@@ -5909,7 +5909,7 @@ std::string NMD::DMFGC0(uint64 instruction)\n std::string NMD::DMOD(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -5933,7 +5933,7 @@ std::string NMD::DMOD(uint64 instruction)\n std::string NMD::DMODU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6069,7 +6069,7 @@ std::string NMD::DMT(uint64 instruction)\n std::string NMD::DMUH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6093,7 +6093,7 @@ std::string NMD::DMUH(uint64 instruction)\n std::string NMD::DMUHU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6117,7 +6117,7 @@ std::string NMD::DMUHU(uint64 instruction)\n std::string NMD::DMUL(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6141,7 +6141,7 @@ std::string NMD::DMUL(uint64 instruction)\n std::string NMD::DMULU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6597,7 +6597,7 @@ std::string NMD::DROTR32(uint64 instruction)\n std::string NMD::DROTRV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6695,7 +6695,7 @@ std::string NMD::DSLL32(uint64 instruction)\n std::string NMD::DSLLV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6767,7 +6767,7 @@ std::string NMD::DSRA32(uint64 instruction)\n std::string NMD::DSRAV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6839,7 +6839,7 @@ std::string NMD::DSRL32(uint64 instruction)\n std::string NMD::DSRLV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6863,7 +6863,7 @@ std::string NMD::DSRLV(uint64 instruction)\n std::string NMD::DSUB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -6887,7 +6887,7 @@ std::string NMD::DSUB(uint64 instruction)\n std::string NMD::DSUBU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -7112,7 +7112,7 @@ std::string NMD::EXTD(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n uint64 shift_value = extract_shift_10_9_8_7_6(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -7138,7 +7138,7 @@ std::string NMD::EXTD32(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n uint64 shift_value = extract_shift_10_9_8_7_6(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -7453,7 +7453,7 @@ std::string NMD::EXTW(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n uint64 shift_value = extract_shift_10_9_8_7_6(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -7566,7 +7566,7 @@ std::string NMD::FLOOR_W_S(uint64 instruction)\n std::string NMD::FORK(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8018,7 +8018,7 @@ std::string NMD::LBUE(uint64 instruction)\n std::string NMD::LBUX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8042,7 +8042,7 @@ std::string NMD::LBUX(uint64 instruction)\n std::string NMD::LBX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8326,7 +8326,7 @@ std::string NMD::LDPC_48_(uint64 instruction)\n std::string NMD::LDX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8350,7 +8350,7 @@ std::string NMD::LDX(uint64 instruction)\n std::string NMD::LDXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8610,7 +8610,7 @@ std::string NMD::LHUE(uint64 instruction)\n std::string NMD::LHUX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8634,7 +8634,7 @@ std::string NMD::LHUX(uint64 instruction)\n std::string NMD::LHUXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8658,7 +8658,7 @@ std::string NMD::LHUXS(uint64 instruction)\n std::string NMD::LHXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8682,7 +8682,7 @@ std::string NMD::LHXS(uint64 instruction)\n std::string NMD::LHX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -8894,7 +8894,7 @@ std::string NMD::LLWPE(uint64 instruction)\n std::string NMD::LSA(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 u2_value = extract_u2_10_9(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n@@ -9388,7 +9388,7 @@ std::string NMD::LWU_U12_(uint64 instruction)\n std::string NMD::LWUX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -9412,7 +9412,7 @@ std::string NMD::LWUX(uint64 instruction)\n std::string NMD::LWUXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -9436,7 +9436,7 @@ std::string NMD::LWUXS(uint64 instruction)\n std::string NMD::LWX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -9484,7 +9484,7 @@ std::string NMD::LWXS_16_(uint64 instruction)\n std::string NMD::LWXS_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10172,7 +10172,7 @@ std::string NMD::MINA_S(uint64 instruction)\n std::string NMD::MOD(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10196,7 +10196,7 @@ std::string NMD::MOD(uint64 instruction)\n std::string NMD::MODSUB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10220,7 +10220,7 @@ std::string NMD::MODSUB(uint64 instruction)\n std::string NMD::MODU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10388,7 +10388,7 @@ std::string NMD::MOVE(uint64 instruction)\n std::string NMD::MOVN(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10412,7 +10412,7 @@ std::string NMD::MOVN(uint64 instruction)\n std::string NMD::MOVZ(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10834,7 +10834,7 @@ std::string NMD::MTTR(uint64 instruction)\n std::string NMD::MUH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10858,7 +10858,7 @@ std::string NMD::MUH(uint64 instruction)\n std::string NMD::MUHU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10882,7 +10882,7 @@ std::string NMD::MUHU(uint64 instruction)\n std::string NMD::MUL_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10952,7 +10952,7 @@ std::string NMD::MUL_D(uint64 instruction)\n std::string NMD::MUL_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -10976,7 +10976,7 @@ std::string NMD::MUL_PH(uint64 instruction)\n std::string NMD::MUL_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11024,7 +11024,7 @@ std::string NMD::MUL_S(uint64 instruction)\n std::string NMD::MULEQ_S_W_PHL(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11048,7 +11048,7 @@ std::string NMD::MULEQ_S_W_PHL(uint64 instruction)\n std::string NMD::MULEQ_S_W_PHR(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11072,7 +11072,7 @@ std::string NMD::MULEQ_S_W_PHR(uint64 instruction)\n std::string NMD::MULEU_S_PH_QBL(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11096,7 +11096,7 @@ std::string NMD::MULEU_S_PH_QBL(uint64 instruction)\n std::string NMD::MULEU_S_PH_QBR(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11120,7 +11120,7 @@ std::string NMD::MULEU_S_PH_QBR(uint64 instruction)\n std::string NMD::MULQ_RS_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11144,7 +11144,7 @@ std::string NMD::MULQ_RS_PH(uint64 instruction)\n std::string NMD::MULQ_RS_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11168,7 +11168,7 @@ std::string NMD::MULQ_RS_W(uint64 instruction)\n std::string NMD::MULQ_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11192,7 +11192,7 @@ std::string NMD::MULQ_S_PH(uint64 instruction)\n std::string NMD::MULQ_S_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11312,7 +11312,7 @@ std::string NMD::MULTU_DSP_(uint64 instruction)\n std::string NMD::MULU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11416,7 +11416,7 @@ std::string NMD::NOP_32_(uint64 instruction)\n std::string NMD::NOR(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11484,7 +11484,7 @@ std::string NMD::OR_16_(uint64 instruction)\n std::string NMD::OR_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11532,7 +11532,7 @@ std::string NMD::ORI(uint64 instruction)\n std::string NMD::PACKRL_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11574,7 +11574,7 @@ std::string NMD::PAUSE(uint64 instruction)\n std::string NMD::PICK_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11598,7 +11598,7 @@ std::string NMD::PICK_PH(uint64 instruction)\n std::string NMD::PICK_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11842,7 +11842,7 @@ std::string NMD::PRECEU_PH_QBR(uint64 instruction)\n std::string NMD::PRECR_QB_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11914,7 +11914,7 @@ std::string NMD::PRECR_SRA_R_PH_W(uint64 instruction)\n std::string NMD::PRECRQ_PH_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11938,7 +11938,7 @@ std::string NMD::PRECRQ_PH_W(uint64 instruction)\n std::string NMD::PRECRQ_QB_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11962,7 +11962,7 @@ std::string NMD::PRECRQ_QB_PH(uint64 instruction)\n std::string NMD::PRECRQ_RS_PH_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -11986,7 +11986,7 @@ std::string NMD::PRECRQ_RS_PH_W(uint64 instruction)\n std::string NMD::PRECRQU_S_QB_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -12486,7 +12486,7 @@ std::string NMD::ROTR(uint64 instruction)\n std::string NMD::ROTRV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -12856,7 +12856,7 @@ std::string NMD::SBE(uint64 instruction)\n std::string NMD::SBX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -13324,7 +13324,7 @@ std::string NMD::SDPC_48_(uint64 instruction)\n std::string NMD::SDXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -13348,7 +13348,7 @@ std::string NMD::SDXS(uint64 instruction)\n std::string NMD::SDX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -13842,7 +13842,7 @@ std::string NMD::SHLL_S_W(uint64 instruction)\n std::string NMD::SHLLV_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -13866,7 +13866,7 @@ std::string NMD::SHLLV_PH(uint64 instruction)\n std::string NMD::SHLLV_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -13890,7 +13890,7 @@ std::string NMD::SHLLV_QB(uint64 instruction)\n std::string NMD::SHLLV_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -13914,7 +13914,7 @@ std::string NMD::SHLLV_S_PH(uint64 instruction)\n std::string NMD::SHLLV_S_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14058,7 +14058,7 @@ std::string NMD::SHRA_R_W(uint64 instruction)\n std::string NMD::SHRAV_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14082,7 +14082,7 @@ std::string NMD::SHRAV_PH(uint64 instruction)\n std::string NMD::SHRAV_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14106,7 +14106,7 @@ std::string NMD::SHRAV_QB(uint64 instruction)\n std::string NMD::SHRAV_R_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14130,7 +14130,7 @@ std::string NMD::SHRAV_R_PH(uint64 instruction)\n std::string NMD::SHRAV_R_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14154,7 +14154,7 @@ std::string NMD::SHRAV_R_QB(uint64 instruction)\n std::string NMD::SHRAV_R_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14226,7 +14226,7 @@ std::string NMD::SHRL_QB(uint64 instruction)\n std::string NMD::SHRLV_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14250,7 +14250,7 @@ std::string NMD::SHRLV_PH(uint64 instruction)\n std::string NMD::SHRLV_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14274,7 +14274,7 @@ std::string NMD::SHRLV_QB(uint64 instruction)\n std::string NMD::SHX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14298,7 +14298,7 @@ std::string NMD::SHX(uint64 instruction)\n std::string NMD::SHXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14390,7 +14390,7 @@ std::string NMD::SLL_32_(uint64 instruction)\n std::string NMD::SLLV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14414,7 +14414,7 @@ std::string NMD::SLLV(uint64 instruction)\n std::string NMD::SLT(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14486,7 +14486,7 @@ std::string NMD::SLTIU(uint64 instruction)\n std::string NMD::SLTU(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14510,7 +14510,7 @@ std::string NMD::SLTU(uint64 instruction)\n std::string NMD::SOV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14622,7 +14622,7 @@ std::string NMD::SRA(uint64 instruction)\n std::string NMD::SRAV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14694,7 +14694,7 @@ std::string NMD::SRL_32_(uint64 instruction)\n std::string NMD::SRLV(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14718,7 +14718,7 @@ std::string NMD::SRLV(uint64 instruction)\n std::string NMD::SUB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14790,7 +14790,7 @@ std::string NMD::SUB_S(uint64 instruction)\n std::string NMD::SUBQ_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14815,7 +14815,7 @@ std::string NMD::SUBQ_PH(uint64 instruction)\n std::string NMD::SUBQ_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14840,7 +14840,7 @@ std::string NMD::SUBQ_S_PH(uint64 instruction)\n std::string NMD::SUBQ_S_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14865,7 +14865,7 @@ std::string NMD::SUBQ_S_W(uint64 instruction)\n std::string NMD::SUBQH_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14890,7 +14890,7 @@ std::string NMD::SUBQH_PH(uint64 instruction)\n std::string NMD::SUBQH_R_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14915,7 +14915,7 @@ std::string NMD::SUBQH_R_PH(uint64 instruction)\n std::string NMD::SUBQH_R_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14940,7 +14940,7 @@ std::string NMD::SUBQH_R_W(uint64 instruction)\n std::string NMD::SUBQH_W(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -14988,7 +14988,7 @@ std::string NMD::SUBU_16_(uint64 instruction)\n std::string NMD::SUBU_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15012,7 +15012,7 @@ std::string NMD::SUBU_32_(uint64 instruction)\n std::string NMD::SUBU_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15036,7 +15036,7 @@ std::string NMD::SUBU_PH(uint64 instruction)\n std::string NMD::SUBU_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15060,7 +15060,7 @@ std::string NMD::SUBU_QB(uint64 instruction)\n std::string NMD::SUBU_S_PH(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15084,7 +15084,7 @@ std::string NMD::SUBU_S_PH(uint64 instruction)\n std::string NMD::SUBU_S_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15109,7 +15109,7 @@ std::string NMD::SUBU_S_QB(uint64 instruction)\n std::string NMD::SUBUH_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15134,7 +15134,7 @@ std::string NMD::SUBUH_QB(uint64 instruction)\n std::string NMD::SUBUH_R_QB(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15534,7 +15534,7 @@ std::string NMD::SWPC_48_(uint64 instruction)\n std::string NMD::SWX(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -15558,7 +15558,7 @@ std::string NMD::SWX(uint64 instruction)\n std::string NMD::SWXS(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\n@@ -16287,7 +16287,7 @@ std::string NMD::XOR_16_(uint64 instruction)\n std::string NMD::XOR_32_(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 rd_value = extract_rd_20_19_18_17_16(instruction);\n+ uint64 rd_value = extract_rd_15_14_13_12_11(instruction);\n uint64 rs_value = extract_rs_20_19_18_17_16(instruction);\n \n std::string rd = GPR(copy(rd_value));\ndiff --git a/disas/nanomips.h b/disas/nanomips.h\nindex 4defd35..f04a1a8 100644\n--- a/disas/nanomips.h\n+++ b/disas/nanomips.h\n@@ -191,7 +191,7 @@ private:\n uint64 extract_rdl_25_24(uint64 instruction);\n uint64 extract_rd2_3_8(uint64 instruction);\n uint64 extract_rd3_3_2_1(uint64 instruction);\n- uint64 extract_rd_20_19_18_17_16(uint64 instruction);\n+ uint64 extract_rd_15_14_13_12_11(uint64 instruction);\n uint64 extract_rs3_6_5_4(uint64 instruction);\n uint64 extract_rs4_4_2_1_0(uint64 instruction);\n uint64 extract_rs_4_3_2_1_0(uint64 instruction);\n", "prefixes": [ "PULL", "14/41" ] }