From patchwork Mon Jan 30 18:16:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 721657 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 3vByMk6QL3z9s3s for ; Tue, 31 Jan 2017 05:19:14 +1100 (AEDT) Received: from localhost ([::1]:34340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYGXo-0004Hw-3U for incoming@patchwork.ozlabs.org; Mon, 30 Jan 2017 13:19:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYGWD-00037s-Ew for qemu-devel@nongnu.org; Mon, 30 Jan 2017 13:17:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYGW9-0002Bk-DR for qemu-devel@nongnu.org; Mon, 30 Jan 2017 13:17:33 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:63035) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cYGW9-0002BR-1D for qemu-devel@nongnu.org; Mon, 30 Jan 2017 13:17:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LgNts-1cB5Nn3V9Y-00nklO; Mon, 30 Jan 2017 19:16:44 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 30 Jan 2017 19:16:26 +0100 Message-Id: <20170130181634.13934-9-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170130181634.13934-1-laurent@vivier.eu> References: <20170130181634.13934-1-laurent@vivier.eu> X-Provags-ID: V03:K0:rBwYG61I/zjpK4eHCWUO+vKrq3v1AvykBWgh4K+CeoePLLwCCka hBtNUlrGxYTcwBN8xIpgc5MElqbe5HvThTfTuWkZAvTh+9aGKaga6CypZnP6qIkttX4yNH2 SPwng+etUye7cRyUuCnxmp5hsw/EyJFbNugB4kSq146gt42ahAL3HNwewYcIBn4rkdZf/9l 602X47eLquQomLih/E0Dg== X-UI-Out-Filterresults: notjunk:1; V01:K0:xfaY2M+Kz0Q=:WxUBSl/2ideMME3Srfl0CV iV6UldKK+aO/QtVyJrnZLM9AHxetwhWXHNoPFlD/bB9cIOfxy8f7qjR58gqPTSzgGflGybBfQ 9EbrnKTpnPYgILuHogiiuPfKvRPafSnhJeti6g/mUNOlb7c5o7lu1Qsx44asExVQRaWV69qDQ GyQK/ds2g6VbLGo53LTb9erKvOvCjRqJC0anqb7AQH0hYVfBoBqlxrx52jIWM/fAUNVp2k0+O Ya4wBGRfR51dFMf6bZ5HbfMbijnF86pwqYf932Uik6CyZfIxBXHHu55/Lil2XoSsWIx82RqnQ 3OdFEiGz7DpnBHJqfqft9yzLjsuHjXeapnhptkqP8bhZzBnOspfrH2ijatNc8ReVJGHl2tKBb Mu6aEWK2k5zYxGkXu1qw+BzrY13yw8pS0Vc+MshuU1hi79sf+KODMAqDQgizXJacOdkSpa1oZ XasxX6StOcW4b62plk/epSJgIU5/m0D4QP7rqEjxKkOb7/8s2hU/2aB22AAv5gxO6FUQwmtIA VQLHstQ2cABlDbYaAlQvxszlhco18FVt0AOtDMNNzm5HeM1L9vdeIpnN72LMmLAbl1o9FimaM E/yQQJ0S5IqKy+UVaNwGoYKzqIyuIXgEn++Cado+VA6EWHIPFnJQEjKJRIH2iDh6zWI0zOymW 3yGGv6ejufeRs5olNciy67G7OKOX5UqRzPL8xNf3HB75LWhvCx7U2Z9H9bsC3HAYE05k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH v2 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 --- 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. */ }