From patchwork Sun Jun 11 23:16:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 774396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wmBlT4Nmbz9rxm for ; Mon, 12 Jun 2017 09:17:57 +1000 (AEST) Received: from localhost ([::1]:35435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKC7H-00029z-5G for incoming@patchwork.ozlabs.org; Sun, 11 Jun 2017 19:17:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKC6a-00023K-CI for qemu-devel@nongnu.org; Sun, 11 Jun 2017 19:17:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKC6X-00082N-8T for qemu-devel@nongnu.org; Sun, 11 Jun 2017 19:17:12 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:64202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dKC6W-000822-SN for qemu-devel@nongnu.org; Sun, 11 Jun 2017 19:17:09 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LuHH1-1e1Bg03sH9-011lU0; Mon, 12 Jun 2017 01:16:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 01:16:32 +0200 Message-Id: <20170611231633.32582-7-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170611231633.32582-1-laurent@vivier.eu> References: <20170611231633.32582-1-laurent@vivier.eu> X-Provags-ID: V03:K0:VkB7OVznY6xyJ+oSbR16wkwOWETAaPQO/FdvX3YyszeXkWeDTi/ Jsm3PvBUecjLpntkpV1UauRz9AeYLiDCzx3FPDB8s4LxJqLmxguJzwTkUhgV21h81S7bSlH XBb6a1SGWbJ2PbWhCifqusXWW80Q+rXlN7H5bx0E0nEu046qN+3zjVFZ0dTkkMC9vLRN8ZY UbZ4eKXMqDXgO/+HBfRmA== X-UI-Out-Filterresults: notjunk:1; V01:K0:iGeK4dM1GnU=:61tgOnl9vxF7kzkZMtjSir 5SEtTzgOPHKaXd6Le5j4H8DmMTc3N2OrH9By1jzfvF6WL7QLmHJmPpdCnNC9VoB5RkZK9c4wd oXqUzK2bc/BdDdBJsLqjVZqf7CuxoH8Htl83xTMKraFJfIOCF52SHrbCzKJo7xBhxFhX9SG3y uh9bXu3Yk+K6BYykyqW6fAfwL0ASdXl1OHLRqhEIi5bZiTE0MZhEuavsYGoTX3zxzX71qRBDt UR3dbqZKbSX9izfHoxL8U/oG3qWZTn6JHTKFUcm8RTE6nPkHCQ1wJO5SF3ter6TsZPC49wB+O PPALm1EeUNSVTYoaAZUmTq7/F3uZHge3796KpPs1VWhaEsz0pEZ9EJYj6ma/HjtYdPcxgsN27 1Zh2pZjhZdSTKpNpFtACDrq7KyBqMk76zh4SOuIH8Jk2iV1EJHUZWbxyl0lGBqPom5Xd1N398 m9C/9G33Hd3PIKW6rbCoI/BhhWdqjE6TSikUB8KCgHwCz5vknyFx5Xd0aO69g5LoatNb85Bc/ 8jevFwqTykMdNmQphkuR5rhHbUQLt+FfgbN6nqf/BE7ddcBhpCUcOggnOq9BpbNaWzpi8Omwz N/gu35ykCBe73F/lDUdb3zBcH607iaw7zM/CCxJzJ58ktq+Lplj7bPTdm1dhLx99Gte3SmkO8 cQ/ns3Iyda44480I0kyTbIZxx/MGY4RpdyiYIVD3KKFBUmAjTQD/+KL5d0tg7UiE00Ac= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH v4 6/7] target-m68k: define 96bit FP registers for gdb on 680x0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- configure | 2 +- gdb-xml/m68k-fp.xml | 21 +++++++++++++++++++++ target/m68k/helper.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 gdb-xml/m68k-fp.xml diff --git a/configure b/configure index 13e040d..37af69b 100755 --- a/configure +++ b/configure @@ -6056,7 +6056,7 @@ case "$target_name" in ;; m68k) bflt="yes" - gdb_xml_files="cf-core.xml cf-fp.xml" + gdb_xml_files="cf-core.xml cf-fp.xml m68k-fp.xml" ;; microblaze|microblazeel) TARGET_ARCH=microblaze diff --git a/gdb-xml/m68k-fp.xml b/gdb-xml/m68k-fp.xml new file mode 100644 index 0000000..64290d1 --- /dev/null +++ b/gdb-xml/m68k-fp.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + , + + diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 8bfc881..f2de6b5 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -102,6 +102,48 @@ static int cf_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n) return 0; } +static int m68k_fpu_gdb_get_reg(CPUM68KState *env, uint8_t *mem_buf, int n) +{ + if (n < 8) { + stw_be_p(mem_buf, env->fregs[n].l.upper); + memset(mem_buf + 2, 0, 2); + stq_be_p(mem_buf + 4, env->fregs[n].l.lower); + return 12; + } + switch (n) { + case 8: /* fpcontrol */ + stl_be_p(mem_buf, env->fpcr); + return 4; + case 9: /* fpstatus */ + stl_be_p(mem_buf, env->fpsr); + return 4; + case 10: /* fpiar, not implemented */ + memset(mem_buf, 0, 4); + return 4; + } + return 0; +} + +static int m68k_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n) +{ + if (n < 8) { + env->fregs[n].l.upper = lduw_be_p(mem_buf); + env->fregs[n].l.lower = ldq_be_p(mem_buf + 4); + return 12; + } + switch (n) { + case 8: /* fpcontrol */ + env->fpcr = ldl_p(mem_buf); + return 4; + case 9: /* fpstatus */ + env->fpsr = ldl_p(mem_buf); + return 4; + case 10: /* fpiar, not implemented */ + return 4; + } + return 0; +} + M68kCPU *cpu_m68k_init(const char *cpu_model) { M68kCPU *cpu; @@ -130,6 +172,9 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) if (m68k_feature(env, M68K_FEATURE_CF_FPU)) { gdb_register_coprocessor(cs, cf_fpu_gdb_get_reg, cf_fpu_gdb_set_reg, 11, "cf-fp.xml", 18); + } else if (m68k_feature(env, M68K_FEATURE_FPU)) { + gdb_register_coprocessor(cs, m68k_fpu_gdb_get_reg, + m68k_fpu_gdb_set_reg, 11, "m68k-fp.xml", 18); } /* TODO: Add [E]MAC registers. */ }