Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1019132/?format=api
{ "id": 1019132, "url": "http://patchwork.ozlabs.org/api/patches/1019132/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-19-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-19-git-send-email-aleksandar.markovic@rt-rk.com>", "list_archive_url": null, "date": "2018-12-28T09:25:25", "name": "[PULL,18/41] disas: nanoMIPS: Fix an FP-related misnomer 2", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b90663ed45a66389ae0ba518374b71bd39be74a9", "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-19-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/1019132/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1019132/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 43R2H74Pk1z9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 28 Dec 2018 20:59:15 +1100 (AEDT)", "from localhost ([127.0.0.1]:58040 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 1gcovB-00039o-E8\n\tfor incoming@patchwork.ozlabs.org; Fri, 28 Dec 2018 04:59:13 -0500", "from eggs.gnu.org ([208.118.235.92]:52762)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gcon1-0000Bp-Dv\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:51:00 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gcoPD-0003Jf-Ht\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:30 -0500", "from mx2.rt-rk.com ([89.216.37.149]:49268 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 1gcoPC-00036Y-HY\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:11 -0500", "from localhost (localhost [127.0.0.1])\n\tby mail.rt-rk.com (Postfix) with ESMTP id C33701A212D;\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 7C7B71A210D;\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:25 +0100", "Message-Id": "<1545989148-13582-19-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 18/41] disas: nanoMIPS: Fix an FP-related\n\tmisnomer 2", "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\nRename NMD::extract_fs_15_14_13_12_11(uint64 instruction) to\nNMD::extract_fs_20_19_18_17_16(uint64 instruction).\n\nReviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>\nSigned-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>\n---\n disas/nanomips.cpp | 242 ++++++++++++++++++++++++++---------------------------\n disas/nanomips.h | 2 +-\n 2 files changed, 122 insertions(+), 122 deletions(-)", "diff": "diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp\nindex bff1900..b9ad0f7 100644\n--- a/disas/nanomips.cpp\n+++ b/disas/nanomips.cpp\n@@ -1114,7 +1114,7 @@ uint64 NMD::extract_u_15_to_0(uint64 instruction)\n }\n \n \n-uint64 NMD::extract_fs_15_14_13_12_11(uint64 instruction)\n+uint64 NMD::extract_fs_20_19_18_17_16(uint64 instruction)\n {\n uint64 value = 0;\n value |= extract_bits(instruction, 16, 5);\n@@ -1602,7 +1602,7 @@ bool NMD::SLTU_cond(uint64 instruction)\n std::string NMD::ABS_D(uint64 instruction)\n {\n uint64 fd_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string fs = FPR(copy(fs_value));\n std::string fd = FPR(copy(fd_value));\n@@ -1624,7 +1624,7 @@ std::string NMD::ABS_D(uint64 instruction)\n std::string NMD::ABS_S(uint64 instruction)\n {\n uint64 fd_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string fs = FPR(copy(fs_value));\n std::string fd = FPR(copy(fd_value));\n@@ -1756,7 +1756,7 @@ std::string NMD::ADD(uint64 instruction)\n std::string NMD::ADD_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string ft = FPR(copy(ft_value));\n@@ -1781,7 +1781,7 @@ std::string NMD::ADD_D(uint64 instruction)\n std::string NMD::ADD_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string ft = FPR(copy(ft_value));\n@@ -3383,7 +3383,7 @@ std::string NMD::CACHEE(uint64 instruction)\n std::string NMD::CEIL_L_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -3405,7 +3405,7 @@ std::string NMD::CEIL_L_D(uint64 instruction)\n std::string NMD::CEIL_L_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -3427,7 +3427,7 @@ std::string NMD::CEIL_L_S(uint64 instruction)\n std::string NMD::CEIL_W_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -3449,7 +3449,7 @@ std::string NMD::CEIL_W_D(uint64 instruction)\n std::string NMD::CEIL_W_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -3515,7 +3515,7 @@ std::string NMD::CFC2(uint64 instruction)\n std::string NMD::CLASS_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -3537,7 +3537,7 @@ std::string NMD::CLASS_D(uint64 instruction)\n std::string NMD::CLASS_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -3603,7 +3603,7 @@ std::string NMD::CLZ(uint64 instruction)\n std::string NMD::CMP_AF_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3627,7 +3627,7 @@ std::string NMD::CMP_AF_D(uint64 instruction)\n std::string NMD::CMP_AF_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3651,7 +3651,7 @@ std::string NMD::CMP_AF_S(uint64 instruction)\n std::string NMD::CMP_EQ_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3697,7 +3697,7 @@ std::string NMD::CMP_EQ_PH(uint64 instruction)\n std::string NMD::CMP_EQ_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3721,7 +3721,7 @@ std::string NMD::CMP_EQ_S(uint64 instruction)\n std::string NMD::CMP_LE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3767,7 +3767,7 @@ std::string NMD::CMP_LE_PH(uint64 instruction)\n std::string NMD::CMP_LE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3791,7 +3791,7 @@ std::string NMD::CMP_LE_S(uint64 instruction)\n std::string NMD::CMP_LT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3837,7 +3837,7 @@ std::string NMD::CMP_LT_PH(uint64 instruction)\n std::string NMD::CMP_LT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3861,7 +3861,7 @@ std::string NMD::CMP_LT_S(uint64 instruction)\n std::string NMD::CMP_NE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3885,7 +3885,7 @@ std::string NMD::CMP_NE_D(uint64 instruction)\n std::string NMD::CMP_NE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3909,7 +3909,7 @@ std::string NMD::CMP_NE_S(uint64 instruction)\n std::string NMD::CMP_OR_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3933,7 +3933,7 @@ std::string NMD::CMP_OR_D(uint64 instruction)\n std::string NMD::CMP_OR_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3957,7 +3957,7 @@ std::string NMD::CMP_OR_S(uint64 instruction)\n std::string NMD::CMP_SAF_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -3981,7 +3981,7 @@ std::string NMD::CMP_SAF_D(uint64 instruction)\n std::string NMD::CMP_SAF_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4005,7 +4005,7 @@ std::string NMD::CMP_SAF_S(uint64 instruction)\n std::string NMD::CMP_SEQ_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4029,7 +4029,7 @@ std::string NMD::CMP_SEQ_D(uint64 instruction)\n std::string NMD::CMP_SEQ_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4053,7 +4053,7 @@ std::string NMD::CMP_SEQ_S(uint64 instruction)\n std::string NMD::CMP_SLE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4077,7 +4077,7 @@ std::string NMD::CMP_SLE_D(uint64 instruction)\n std::string NMD::CMP_SLE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4101,7 +4101,7 @@ std::string NMD::CMP_SLE_S(uint64 instruction)\n std::string NMD::CMP_SLT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4125,7 +4125,7 @@ std::string NMD::CMP_SLT_D(uint64 instruction)\n std::string NMD::CMP_SLT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4149,7 +4149,7 @@ std::string NMD::CMP_SLT_S(uint64 instruction)\n std::string NMD::CMP_SNE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4173,7 +4173,7 @@ std::string NMD::CMP_SNE_D(uint64 instruction)\n std::string NMD::CMP_SNE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4197,7 +4197,7 @@ std::string NMD::CMP_SNE_S(uint64 instruction)\n std::string NMD::CMP_SOR_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4221,7 +4221,7 @@ std::string NMD::CMP_SOR_D(uint64 instruction)\n std::string NMD::CMP_SOR_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4245,7 +4245,7 @@ std::string NMD::CMP_SOR_S(uint64 instruction)\n std::string NMD::CMP_SUEQ_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4269,7 +4269,7 @@ std::string NMD::CMP_SUEQ_D(uint64 instruction)\n std::string NMD::CMP_SUEQ_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4293,7 +4293,7 @@ std::string NMD::CMP_SUEQ_S(uint64 instruction)\n std::string NMD::CMP_SULE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4317,7 +4317,7 @@ std::string NMD::CMP_SULE_D(uint64 instruction)\n std::string NMD::CMP_SULE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4341,7 +4341,7 @@ std::string NMD::CMP_SULE_S(uint64 instruction)\n std::string NMD::CMP_SULT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4365,7 +4365,7 @@ std::string NMD::CMP_SULT_D(uint64 instruction)\n std::string NMD::CMP_SULT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4389,7 +4389,7 @@ std::string NMD::CMP_SULT_S(uint64 instruction)\n std::string NMD::CMP_SUN_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4413,7 +4413,7 @@ std::string NMD::CMP_SUN_D(uint64 instruction)\n std::string NMD::CMP_SUNE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4437,7 +4437,7 @@ std::string NMD::CMP_SUNE_D(uint64 instruction)\n std::string NMD::CMP_SUNE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4461,7 +4461,7 @@ std::string NMD::CMP_SUNE_S(uint64 instruction)\n std::string NMD::CMP_SUN_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4485,7 +4485,7 @@ std::string NMD::CMP_SUN_S(uint64 instruction)\n std::string NMD::CMP_UEQ_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4509,7 +4509,7 @@ std::string NMD::CMP_UEQ_D(uint64 instruction)\n std::string NMD::CMP_UEQ_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4533,7 +4533,7 @@ std::string NMD::CMP_UEQ_S(uint64 instruction)\n std::string NMD::CMP_ULE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4557,7 +4557,7 @@ std::string NMD::CMP_ULE_D(uint64 instruction)\n std::string NMD::CMP_ULE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4581,7 +4581,7 @@ std::string NMD::CMP_ULE_S(uint64 instruction)\n std::string NMD::CMP_ULT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4605,7 +4605,7 @@ std::string NMD::CMP_ULT_D(uint64 instruction)\n std::string NMD::CMP_ULT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4629,7 +4629,7 @@ std::string NMD::CMP_ULT_S(uint64 instruction)\n std::string NMD::CMP_UN_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4653,7 +4653,7 @@ std::string NMD::CMP_UN_D(uint64 instruction)\n std::string NMD::CMP_UNE_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4677,7 +4677,7 @@ std::string NMD::CMP_UNE_D(uint64 instruction)\n std::string NMD::CMP_UNE_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4701,7 +4701,7 @@ std::string NMD::CMP_UNE_S(uint64 instruction)\n std::string NMD::CMP_UN_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -4999,7 +4999,7 @@ std::string NMD::CTC2(uint64 instruction)\n std::string NMD::CVT_D_L(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5021,7 +5021,7 @@ std::string NMD::CVT_D_L(uint64 instruction)\n std::string NMD::CVT_D_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5043,7 +5043,7 @@ std::string NMD::CVT_D_S(uint64 instruction)\n std::string NMD::CVT_D_W(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5065,7 +5065,7 @@ std::string NMD::CVT_D_W(uint64 instruction)\n std::string NMD::CVT_L_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5087,7 +5087,7 @@ std::string NMD::CVT_L_D(uint64 instruction)\n std::string NMD::CVT_L_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5109,7 +5109,7 @@ std::string NMD::CVT_L_S(uint64 instruction)\n std::string NMD::CVT_S_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5131,7 +5131,7 @@ std::string NMD::CVT_S_D(uint64 instruction)\n std::string NMD::CVT_S_L(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5153,7 +5153,7 @@ std::string NMD::CVT_S_L(uint64 instruction)\n std::string NMD::CVT_S_PL(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5175,7 +5175,7 @@ std::string NMD::CVT_S_PL(uint64 instruction)\n std::string NMD::CVT_S_PU(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5197,7 +5197,7 @@ std::string NMD::CVT_S_PU(uint64 instruction)\n std::string NMD::CVT_S_W(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5219,7 +5219,7 @@ std::string NMD::CVT_S_W(uint64 instruction)\n std::string NMD::CVT_W_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5241,7 +5241,7 @@ std::string NMD::CVT_W_D(uint64 instruction)\n std::string NMD::CVT_W_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5697,7 +5697,7 @@ std::string NMD::DIV(uint64 instruction)\n std::string NMD::DIV_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -5721,7 +5721,7 @@ std::string NMD::DIV_D(uint64 instruction)\n std::string NMD::DIV_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -5841,7 +5841,7 @@ std::string NMD::DMFC0(uint64 instruction)\n std::string NMD::DMFC1(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string rt = GPR(copy(rt_value));\n std::string fs = FPR(copy(fs_value));\n@@ -5981,7 +5981,7 @@ std::string NMD::DMTC0(uint64 instruction)\n std::string NMD::DMTC1(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string rt = GPR(copy(rt_value));\n std::string fs = FPR(copy(fs_value));\n@@ -7478,7 +7478,7 @@ std::string NMD::EXTW(uint64 instruction)\n std::string NMD::FLOOR_L_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -7500,7 +7500,7 @@ std::string NMD::FLOOR_L_D(uint64 instruction)\n std::string NMD::FLOOR_L_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -7522,7 +7522,7 @@ std::string NMD::FLOOR_L_S(uint64 instruction)\n std::string NMD::FLOOR_W_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -7544,7 +7544,7 @@ std::string NMD::FLOOR_W_D(uint64 instruction)\n std::string NMD::FLOOR_W_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -9532,7 +9532,7 @@ std::string NMD::MADD_DSP_(uint64 instruction)\n std::string NMD::MADDF_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -9556,7 +9556,7 @@ std::string NMD::MADDF_D(uint64 instruction)\n std::string NMD::MADDF_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -9700,7 +9700,7 @@ std::string NMD::MAQ_SA_W_PHR(uint64 instruction)\n std::string NMD::MAX_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -9724,7 +9724,7 @@ std::string NMD::MAX_D(uint64 instruction)\n std::string NMD::MAX_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -9748,7 +9748,7 @@ std::string NMD::MAX_S(uint64 instruction)\n std::string NMD::MAXA_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -9772,7 +9772,7 @@ std::string NMD::MAXA_D(uint64 instruction)\n std::string NMD::MAXA_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -9820,7 +9820,7 @@ std::string NMD::MFC0(uint64 instruction)\n std::string NMD::MFC1(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string rt = GPR(copy(rt_value));\n std::string fs = FPR(copy(fs_value));\n@@ -9912,7 +9912,7 @@ std::string NMD::MFHC0(uint64 instruction)\n std::string NMD::MFHC1(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string rt = GPR(copy(rt_value));\n std::string fs = FPR(copy(fs_value));\n@@ -10076,7 +10076,7 @@ std::string NMD::MFTR(uint64 instruction)\n std::string NMD::MIN_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -10100,7 +10100,7 @@ std::string NMD::MIN_D(uint64 instruction)\n std::string NMD::MIN_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -10124,7 +10124,7 @@ std::string NMD::MIN_S(uint64 instruction)\n std::string NMD::MINA_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -10148,7 +10148,7 @@ std::string NMD::MINA_D(uint64 instruction)\n std::string NMD::MINA_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -10244,7 +10244,7 @@ std::string NMD::MODU(uint64 instruction)\n std::string NMD::MOV_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -10266,7 +10266,7 @@ std::string NMD::MOV_D(uint64 instruction)\n std::string NMD::MOV_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -10460,7 +10460,7 @@ std::string NMD::MSUB_DSP_(uint64 instruction)\n std::string NMD::MSUBF_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -10484,7 +10484,7 @@ std::string NMD::MSUBF_D(uint64 instruction)\n std::string NMD::MSUBF_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -10556,7 +10556,7 @@ std::string NMD::MTC0(uint64 instruction)\n std::string NMD::MTC1(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string rt = GPR(copy(rt_value));\n std::string fs = FPR(copy(fs_value));\n@@ -10648,7 +10648,7 @@ std::string NMD::MTHC0(uint64 instruction)\n std::string NMD::MTHC1(uint64 instruction)\n {\n uint64 rt_value = extract_rt_25_24_23_22_21(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string rt = GPR(copy(rt_value));\n std::string fs = FPR(copy(fs_value));\n@@ -10928,7 +10928,7 @@ std::string NMD::MUL_4X4_(uint64 instruction)\n std::string NMD::MUL_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -11000,7 +11000,7 @@ std::string NMD::MUL_S_PH(uint64 instruction)\n std::string NMD::MUL_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -11336,7 +11336,7 @@ std::string NMD::MULU(uint64 instruction)\n std::string NMD::NEG_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -11358,7 +11358,7 @@ std::string NMD::NEG_D(uint64 instruction)\n std::string NMD::NEG_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12196,7 +12196,7 @@ std::string NMD::RDPGPR(uint64 instruction)\n std::string NMD::RECIP_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12218,7 +12218,7 @@ std::string NMD::RECIP_D(uint64 instruction)\n std::string NMD::RECIP_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12418,7 +12418,7 @@ std::string NMD::RESTOREF(uint64 instruction)\n std::string NMD::RINT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12440,7 +12440,7 @@ std::string NMD::RINT_D(uint64 instruction)\n std::string NMD::RINT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12539,7 +12539,7 @@ std::string NMD::ROTX(uint64 instruction)\n std::string NMD::ROUND_L_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12561,7 +12561,7 @@ std::string NMD::ROUND_L_D(uint64 instruction)\n std::string NMD::ROUND_L_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12583,7 +12583,7 @@ std::string NMD::ROUND_L_S(uint64 instruction)\n std::string NMD::ROUND_W_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12605,7 +12605,7 @@ std::string NMD::ROUND_W_D(uint64 instruction)\n std::string NMD::ROUND_W_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12627,7 +12627,7 @@ std::string NMD::ROUND_W_S(uint64 instruction)\n std::string NMD::RSQRT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -12649,7 +12649,7 @@ std::string NMD::RSQRT_D(uint64 instruction)\n std::string NMD::RSQRT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -13416,7 +13416,7 @@ std::string NMD::SEH(uint64 instruction)\n std::string NMD::SEL_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -13440,7 +13440,7 @@ std::string NMD::SEL_D(uint64 instruction)\n std::string NMD::SEL_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -13464,7 +13464,7 @@ std::string NMD::SEL_S(uint64 instruction)\n std::string NMD::SELEQZ_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -13488,7 +13488,7 @@ std::string NMD::SELEQZ_D(uint64 instruction)\n std::string NMD::SELEQZ_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -13512,7 +13512,7 @@ std::string NMD::SELEQZ_S(uint64 instruction)\n std::string NMD::SELNEZ_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -13536,7 +13536,7 @@ std::string NMD::SELNEZ_D(uint64 instruction)\n std::string NMD::SELNEZ_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -14554,7 +14554,7 @@ std::string NMD::SPECIAL2(uint64 instruction)\n std::string NMD::SQRT_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -14576,7 +14576,7 @@ std::string NMD::SQRT_D(uint64 instruction)\n std::string NMD::SQRT_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -14742,7 +14742,7 @@ std::string NMD::SUB(uint64 instruction)\n std::string NMD::SUB_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -14766,7 +14766,7 @@ std::string NMD::SUB_D(uint64 instruction)\n std::string NMD::SUB_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n std::string fd = FPR(copy(fd_value));\n@@ -15944,7 +15944,7 @@ std::string NMD::TNE(uint64 instruction)\n std::string NMD::TRUNC_L_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -15966,7 +15966,7 @@ std::string NMD::TRUNC_L_D(uint64 instruction)\n std::string NMD::TRUNC_L_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -15988,7 +15988,7 @@ std::string NMD::TRUNC_L_S(uint64 instruction)\n std::string NMD::TRUNC_W_D(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\n@@ -16010,7 +16010,7 @@ std::string NMD::TRUNC_W_D(uint64 instruction)\n std::string NMD::TRUNC_W_S(uint64 instruction)\n {\n uint64 ft_value = extract_ft_20_19_18_17_16(instruction);\n- uint64 fs_value = extract_fs_15_14_13_12_11(instruction);\n+ uint64 fs_value = extract_fs_20_19_18_17_16(instruction);\n \n std::string ft = FPR(copy(ft_value));\n std::string fs = FPR(copy(fs_value));\ndiff --git a/disas/nanomips.h b/disas/nanomips.h\nindex d595092..fad70d2 100644\n--- a/disas/nanomips.h\n+++ b/disas/nanomips.h\n@@ -177,7 +177,7 @@ private:\n uint64 extract_eu_3_2_1_0(uint64 instruction);\n uint64 extract_eu_6_5_4_3_2_1_0(uint64 instruction);\n uint64 extract_fd_15_14_13_12_11(uint64 instruction);\n- uint64 extract_fs_15_14_13_12_11(uint64 instruction);\n+ uint64 extract_fs_20_19_18_17_16(uint64 instruction);\n uint64 extract_ft_15_14_13_12_11(uint64 instruction);\n uint64 extract_ft_20_19_18_17_16(uint64 instruction);\n uint64 extract_gp_2(uint64 instruction);\n", "prefixes": [ "PULL", "18/41" ] }