From patchwork Wed Jun 21 21:00:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 779117 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 3wtHJW70Jhz9s2s for ; Thu, 22 Jun 2017 07:04:11 +1000 (AEST) Received: from localhost ([::1]:55953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNmnJ-000434-El for incoming@patchwork.ozlabs.org; Wed, 21 Jun 2017 17:04:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNmkE-0001ju-2y for qemu-devel@nongnu.org; Wed, 21 Jun 2017 17:00:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNmkA-0006SF-6u for qemu-devel@nongnu.org; Wed, 21 Jun 2017 17:00:58 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:63525) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNmk9-0006Rc-Rc for qemu-devel@nongnu.org; Wed, 21 Jun 2017 17:00:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Mf0KP-1d8ZHW45QP-00OTk6; Wed, 21 Jun 2017 23:00:52 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 21 Jun 2017 23:00:46 +0200 Message-Id: <20170621210047.24083-5-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170621210047.24083-1-laurent@vivier.eu> References: <20170621210047.24083-1-laurent@vivier.eu> X-Provags-ID: V03:K0:HjOU6p3y62WI6v4fh2ZoaZXyzAmsYbOjwW2Rhieb7IZ1+bgal2W 0Zgc1MM1eP0c5KTZRACAPr4z2L2Fa0g/YY5aNaJbNITTgEyJ0Iio91mBBOQIBxe3EsHoiV3 EoK53jWMNbbm1vf71ulhjVxV7pjwn6F9P1+jMG1FGbv4AdJbFMpLgRUyG2WrqnFcz9TJPVv rKlz77LUzpivBOT70LY7g== X-UI-Out-Filterresults: notjunk:1; V01:K0:OUNr/UwXv6A=:N4VWmm2N4IwAGxrDWskJsf 7EuYjZniJcEIdqSsSM22ZGr5uoQrR84XEB1xS+UAZhGvBpBJRVR70w49YJbKPR67sTMGlojEO Gt9vuLqwIRvX05PuYvKsMv0jPpUg/OBPPj84Zhwpc3SVdTsMRB/vuqqcNFTBY7s6KhuxbmRpQ Edn2/I9gJVSttdm+9TiO1DzpjobfQNwC7ik/GvZmi35Zb1Vjw4NEBL37EkA5ennZVctNbQRVy J/kNN4yGJBh9xN3ocy8ybPvzXu8Wer17FnukOs+2X6192od9iKN4iPWPnSl2G7bGXf0p7ZQKy wXMmUCxaGdWwVrwZhrXeu5olJ5hZLuDyvYxK131O1CYzG6S2kORPGaDnBzRlWMCBSwTRz+vy5 9MXYxRnrsomabsMaI5TCtWULo57Gss9keLT6/PUXXR7kXezhx+Cni0YrvNrAMTnxGXkrI9tcU mltHkp4bYG6A8q+rjhCPV7hseukTAa7h7ZPOske9m256ZIUlBUbmGHH/qQD45kD0vGy6kv+SP yHYKQKpeBIY6LW+5sB/Oi75CZiARP1sBZf75A7eIW5tg8hOYAFEHB6YPU0KTas4CxywEwyOFD 4A3V4gzmvR2LABoSLjeUT8Z6Nb+5G83Hpy+1sIM7zDiKM1b/Q8bxp2jZrsYX9UN8SSzuop2Nd petPUKAMLasfg2tuqOTMPZaWhCppUxGk07KTKYzsxdzO/GMvaYO5gFr8IwFk3zUehxtU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 4/5] 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20170620205121.26515-5-laurent@vivier.eu> --- 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 ff0f8b9..bd0d9db 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. */ }