From patchwork Tue Feb 7 00:59:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 724832 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 3vHR0P523Gz9s2P for ; Tue, 7 Feb 2017 12:03:01 +1100 (AEDT) Received: from localhost ([::1]:51332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cauBP-00071U-95 for incoming@patchwork.ozlabs.org; Mon, 06 Feb 2017 20:02:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cau8v-00056f-5S for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cau8q-00068A-9P for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:25 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:64342) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cau8p-00067h-VS for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Me7fW-1cnb9h2YvO-00PtJF; Tue, 07 Feb 2017 01:59:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 7 Feb 2017 01:59:22 +0100 Message-Id: <20170207005930.28327-9-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170207005930.28327-1-laurent@vivier.eu> References: <20170207005930.28327-1-laurent@vivier.eu> X-Provags-ID: V03:K0:jNkrmYUFS9zXV8hSOhkTO3n1+7rmNg1ALy0OKIG+fdXZu0tFDLl Tb6iuGJlUYc0M0sCr+YZkrLSCNci+R2HL0g5KWOA2F9uO5MvS0GDtJTe/NMyGmMlwYAEqKO fIWaPTlo0CwmNZzaVhZR3R+B5r3VbI5FB2VVUNw/IqQwEWNQLm2Kvka77XYjEWe4kC3tukG CW943D4WpD3TjIeoxSFew== X-UI-Out-Filterresults: notjunk:1; V01:K0:cqauzoNeI+o=:w8qU8jzlzHSpVY72/f/xaD Sm5Jwu+gu9O/62YEb976YcIGQSi3sCHONYkofeFiRtcT83oznIJytYkILZcVySixsCnUi6wQy j3KJVtCnHG9vHyhmjrs+OYS6jMI5kpqdXfJFA8hcqa6UZ1HWhbvq6Ndftll5i4LIUB2ApnhD5 hWRU/4/WOJTk34iKuBFD7wbc1awMS6u13SURPIpjSXtNbRmeDrxghKfPTsMhE5Ys82P925Nef kItyTFSaSxVaQB7LUGLtg88faHxN/AF9CpE9tc4wILNvhIg2pd9Qkk5vok80tquLu7xiMG4v+ q+jZ/8X40Pv01QTG1ZrnUUsWxM0NLce2fe32Bs0wJPlwQtP0Q9czxD8jF39axPAQ35XOcVTe4 X9mNOXDgWb9MtmGDZyfDu0RLl6e2PquhWZYOloB/3xyih2cXgRW3Axhe4qxpl45YsdMVD19IO 8a5N5tREIsaas9VvyKVjfl98VOuVwRcCK5lxjUiTZSdZxPN8pNJGx/FDLoU4mbKG61sNpNjUr KEjh5hsurDMxvKl/CuR4FOmixGkPlcGZ8A2BcvuTLJMBc68dZnSzuoZNetOBG29JtH9Cu7qMM X4AAd20MpQQievXXNWBL8FXV+aa4XVwNsfj8t0PoOpeQhUot9193a34F72/W+UC7dNBuDBnnc lspAWVN5iRPET27mNJ17ki2t4n5Od87PSA7beXlfNxDWsnAALkRvq3TQ7BSbl9sM4Fl4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v3 08/16] 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 86fd833..4373ec5 100755 --- a/configure +++ b/configure @@ -5912,7 +5912,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 cff93dc..d93fad9 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -114,6 +114,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; @@ -142,6 +184,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. */ }