From patchwork Tue Jun 20 20:51:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 778471 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 3wsg5t4v2Xz9s5L for ; Wed, 21 Jun 2017 06:52:50 +1000 (AEST) Received: from localhost ([::1]:50609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNQ8m-0008BR-Ag for incoming@patchwork.ozlabs.org; Tue, 20 Jun 2017 16:52:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNQ81-0008AK-Qk for qemu-devel@nongnu.org; Tue, 20 Jun 2017 16:52:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNQ80-0004EG-1h for qemu-devel@nongnu.org; Tue, 20 Jun 2017 16:52:01 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:55301) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNQ7z-0004DN-Lw for qemu-devel@nongnu.org; Tue, 20 Jun 2017 16:51:59 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M7sMi-1djMmW3oLA-00vPGP; Tue, 20 Jun 2017 22:51:29 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 20 Jun 2017 22:51:19 +0200 Message-Id: <20170620205121.26515-5-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170620205121.26515-1-laurent@vivier.eu> References: <20170620205121.26515-1-laurent@vivier.eu> X-Provags-ID: V03:K0:yB5c3kAqPXb9cmnT26FoZRA6EqtYCnnzwTtj6z7zn42GJmJIBZQ NaUrUInO/glUsCXZTkR+FD/T6AKb2hb6AiwsUGcksL1qjkMRk7anWem0uLD9L34mxw1dWlV 3i3iuBuIT/Q/Q1ej0GLOipfSORevnVBdP4rV16Xg1ZvVOf46XTtyoq3uRwPcTTZL+Z11FnV U6KTCOiZk0Qi6OxwEdT0g== X-UI-Out-Filterresults: notjunk:1; V01:K0:93jVBLM+ipg=:ilLfF1fXTtF7rXiIeRdhIL 8olDlcmPFuvK6pxx3TdYVwXz2obKb+ptH2SU7knCvBwAviVMfYEkD/W+W0EJJNBJQzi4ZK9Z9 qz2EqxZSg73AMHGVgNHI6+6YGAN+AszjPkvNMX65Y42Y1Jq/5owvtt9YTkznMq/PaNUt/9CgD NXMvReq0L0eCIwcqKkCO0nJKj/xojw4N62mMTXeCMiGqRqYDm0Aw2HhHkB4f+Qmt7nnOn5HQl dM95AMH4/H9l3DkwXWnLoMGuNRndTi4pwW0riqH59SGJfrNQJP5kRQ3CWqhz7CYCIgEyABPOL +lBEv2sabR3xLkFy4MzfTCsPRsPDzBQKZJotN+4Xt+0d86kjCjfZeiDroAuikNYhkDeE0xkQp erGhAcdp+GUwvhGWcN5Vp6MrnIUU19EI5hRK3ppwzJQpiSRO/PzvK3uzvBWDWsUoEthNl+gaB RKndw5AmlUdWGBQE5VCectrQn2TSPbV1TZ7nff2AgowazNT/lw92k05M0dqr9OtbtYOXwOfS3 iawwQFTxBOrlbzTtpCnZheva0Cqmr9cJ/dPU+X3SI2PR8IiNBvty+phQPQyiaIlnfYmkPatLt h6Ln+i2AiJikh92IQwe3A8C0aQ6Sc+Pt+rbhYx1Ct0z/s9UpbuGIfH5B3EGjxE6lxAF3jatDs sobVJem2TSm83y6r7dOfI23gdKDJ7j2VjIg9oU9p1miSlTbe7uq61RUTBPNY6bXHDvuU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v5 4/6] 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: Thomas Huth , Riku Voipio , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 db0798d..4df871c 100755 --- a/configure +++ b/configure @@ -6066,7 +6066,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. */ }