{"id":1019124,"url":"http://patchwork.ozlabs.org/api/patches/1019124/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-18-git-send-email-aleksandar.markovic@rt-rk.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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-18-git-send-email-aleksandar.markovic@rt-rk.com>","list_archive_url":null,"date":"2018-12-28T09:25:24","name":"[PULL,17/41] disas: nanoMIPS: Fix an FP-related misnomer 1","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9c99d2e3385a7a9684838941277037acb9dcd9db","submitter":{"id":68635,"url":"http://patchwork.ozlabs.org/api/people/68635/?format=json","name":"Aleksandar Markovic","email":"aleksandar.markovic@rt-rk.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-18-git-send-email-aleksandar.markovic@rt-rk.com/mbox/","series":[{"id":83742,"url":"http://patchwork.ozlabs.org/api/series/83742/?format=json","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/1019124/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1019124/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=209.51.188.17; helo=listsout.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 listsout.gnu.org (listsout.gnu.org [209.51.188.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 43R2BK1jZTz9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 28 Dec 2018 20:55:04 +1100 (AEDT)","from localhost ([127.0.0.1]:57985 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 1gcor8-0005fW-8B\n\tfor incoming@patchwork.ozlabs.org; Fri, 28 Dec 2018 04:55:02 -0500","from eggs.gnu.org ([208.118.235.92]:52333)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gconA-00082c-4u\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:51:04 -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-0003Iv-1w\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:23 -0500","from mx2.rt-rk.com ([89.216.37.149]:49263 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-00036O-Br\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:10 -0500","from localhost (localhost [127.0.0.1])\n\tby mail.rt-rk.com (Postfix) with ESMTP id AAB391A212C;\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 707EF1A1DAE;\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:24 +0100","Message-Id":"<1545989148-13582-18-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 17/41] disas: nanoMIPS: Fix an FP-related\n\tmisnomer 1","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_fd_10_9_8_7_6(uint64 instruction) to\nNMD::extract_fd_15_14_13_12_11(uint64 instruction).\n\nReviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>\nSigned-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>\n---\n disas/nanomips.cpp | 142 ++++++++++++++++++++++++++---------------------------\n disas/nanomips.h   |   2 +-\n 2 files changed, 72 insertions(+), 72 deletions(-)","diff":"diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp\nindex 281d8d9..bff1900 100644\n--- a/disas/nanomips.cpp\n+++ b/disas/nanomips.cpp\n@@ -1446,7 +1446,7 @@ uint64 NMD::extract_u_3_8__s2(uint64 instruction)\n }\n \n \n-uint64 NMD::extract_fd_10_9_8_7_6(uint64 instruction)\n+uint64 NMD::extract_fd_15_14_13_12_11(uint64 instruction)\n {\n     uint64 value = 0;\n     value |= extract_bits(instruction, 11, 5);\n@@ -1757,7 +1757,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string ft = FPR(copy(ft_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -1782,7 +1782,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string ft = FPR(copy(ft_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3604,7 +3604,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3628,7 +3628,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3652,7 +3652,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3698,7 +3698,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3722,7 +3722,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3768,7 +3768,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3792,7 +3792,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3838,7 +3838,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3862,7 +3862,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3886,7 +3886,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3910,7 +3910,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3934,7 +3934,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3958,7 +3958,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -3982,7 +3982,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4006,7 +4006,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4030,7 +4030,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4054,7 +4054,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4078,7 +4078,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4102,7 +4102,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4126,7 +4126,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4150,7 +4150,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4174,7 +4174,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4198,7 +4198,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4222,7 +4222,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4246,7 +4246,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4270,7 +4270,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4294,7 +4294,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4318,7 +4318,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4342,7 +4342,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4366,7 +4366,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4390,7 +4390,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4414,7 +4414,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4438,7 +4438,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4462,7 +4462,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4486,7 +4486,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4510,7 +4510,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4534,7 +4534,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4558,7 +4558,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4582,7 +4582,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4606,7 +4606,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4630,7 +4630,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4654,7 +4654,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4678,7 +4678,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -4702,7 +4702,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -5698,7 +5698,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -5722,7 +5722,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -9533,7 +9533,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -9557,7 +9557,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -9701,7 +9701,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -9725,7 +9725,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -9749,7 +9749,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -9773,7 +9773,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10077,7 +10077,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10101,7 +10101,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10125,7 +10125,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10149,7 +10149,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10461,7 +10461,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10485,7 +10485,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -10929,7 +10929,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -11001,7 +11001,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -13417,7 +13417,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -13441,7 +13441,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -13465,7 +13465,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -13489,7 +13489,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -13513,7 +13513,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -13537,7 +13537,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -14743,7 +14743,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\n@@ -14767,7 +14767,7 @@ 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 fd_value = extract_fd_10_9_8_7_6(instruction);\n+    uint64 fd_value = extract_fd_15_14_13_12_11(instruction);\n \n     std::string fd = FPR(copy(fd_value));\n     std::string fs = FPR(copy(fs_value));\ndiff --git a/disas/nanomips.h b/disas/nanomips.h\nindex d3722f6..d595092 100644\n--- a/disas/nanomips.h\n+++ b/disas/nanomips.h\n@@ -176,7 +176,7 @@ private:\n     uint64 extract_ct_25_24_23_22_21(uint64 instruction);\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_10_9_8_7_6(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_ft_15_14_13_12_11(uint64 instruction);\n     uint64 extract_ft_20_19_18_17_16(uint64 instruction);\n","prefixes":["PULL","17/41"]}