From patchwork Tue Apr 14 20:06:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185449 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp1840265ilf; Tue, 14 Apr 2020 13:16:33 -0700 (PDT) X-Google-Smtp-Source: APiQypJIV/GC3QVJByYjyt/rPct0YEfbmUi5cehNypjWYXH4ecyTNrIBsA6XHmC8irH98MVKqjtj X-Received: by 2002:a37:a603:: with SMTP id p3mr22283767qke.109.1586895392987; Tue, 14 Apr 2020 13:16:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586895392; cv=none; d=google.com; s=arc-20160816; b=Mk4bsocCauElOGEbZgZBvqXQ1bCSWlJyFQAQuHQV3UOd2HPfaNYThpNpnuBlhNOrIu eLsAJJt8XY8+/6kDG5sxrDCkl+LwaCyR24ll8s7jdfEPBAwBe3xHDLFHtI6ZwjkdQq6f Bg0F6+GjqOSVzEgJFBqPfU0LoVuzKV6Saasv4MNpGiJIxLszxueld1ooR6tIbRiYGhYF I59bUyms3e63msspdJb1dFIqBA9bxMHod9vfsswSSdWzkTqJZOmvpIpHXQmsyjBaSn/h IscmbYzZaKqXAIHdOzpJNIB2W/Ww65EHRf18NKOIMnz29GXQyk8iKekEhea19f0odN8f 1/fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=U0GHkMxjV1uSRYh2+mG4n9m1cHTJmvyky0OeonmCsaU=; b=qCSp7zCxLQlcUQCmB2NQ4eicxZlHNJPcko6Q8l34h2DFFpcpo126vpfmkZORv2XCUl A4nur8T+JF+0pgkU4Z0JN7iz4LZ/A7UwkIiC19+QLgdhuLVaoxp0B7z1ZfXFJqaWDoze brMqZ4qtaBZ5KovHUY3M6eG/bd4NlrFYMaKa0geLIQv0527vZaD5abD0hAaa1b2AyFq2 Y3bBYEV3gHzvMgJlnJwlJqNb4y0UsTfp5LJpKgxW7mCXjzhm9da3gP3INVmeUR/Ag0Gd Ux0Jb9ZfspNjDG6UnvGAU6pfRZGGDF01IlNdITwQ2QcDav+ZIcBdXwW8dl+VfF6pxVny ZyyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zDyVX+eG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o2si2812028qkm.81.2020.04.14.13.16.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Apr 2020 13:16:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zDyVX+eG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORyy-0004AW-Db for patch@linaro.org; Tue, 14 Apr 2020 16:16:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45913) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORyi-00040S-Lm for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:16:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jORyh-0001iV-BM for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:16:16 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jORyh-0001hw-4e for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:16:15 -0400 Received: by mail-wm1-x342.google.com with SMTP id a81so15773847wmf.5 for ; Tue, 14 Apr 2020 13:16:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0GHkMxjV1uSRYh2+mG4n9m1cHTJmvyky0OeonmCsaU=; b=zDyVX+eGLidywceNh4TJT/ZYZU5Sl8GDbcntFEUGG5+KT3G5Rp02Ky9cQbxUpfbefN MQq8fa1MP/TzuzOq3BesyNCGzQIhS1w01JPNnmjJZ/gaYLiYfTrDiDdrK0zEwNjNzbKb UWLiqqrX9WVcYop2mp08FcL3LqKt04r69IWfcx+5UyhTWHbU1PSdLKNBg5cV58rW5N6B lZiInQtKv7errpITUoT5XmBZwzKMx+hVVn1pQMCzYjD4ephmZUvxx6tTy6ZBbWWA/d+b GyB3HSD+M4CHp9CyN9p5hIUpNRTjp1d5mBC63geazmVR/BvS0Vb+v3pJh4yHWRKz4Air nnmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U0GHkMxjV1uSRYh2+mG4n9m1cHTJmvyky0OeonmCsaU=; b=UYOR36MEIJvFMh20UINTjdzggLfCzNc2Z+7P7gpyrfkB03o7TevlTjbID1KSEgkzjE IVbN+7bGd4OadXLRmshO4IT5YS464YwoG5FiMQdWzVxYulI6sNJBP3psOg8YWQ4H/HhW JPIykLsLoAssmttOwsYMAFipNRdn5twRct2nq24wlhBlOgzVxM+998PQraQshT5Pi0gw QCNnVd4rCqoTQLnIYzhX2PXhuAVU88nv1N2kDif+SVZFQSd0Q7P3MJtg00gcytR0jsKI prxI6NmbyK9ZkvFMym07DPlFdPxwA6Q5RYIwm7XbSUxp3lc369NLq4WNGYR64hREL5Wk 88Pg== X-Gm-Message-State: AGi0PubOnOG75oH9iKQRsIGqzOTCZabA10n2/VgFgC9EdhllundIqlkI +fVcvg21OK3SQ4FrBEBmnhdoYs64EUA= X-Received: by 2002:a1c:808c:: with SMTP id b134mr1587510wmd.131.1586895374113; Tue, 14 Apr 2020 13:16:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w12sm5778068wrk.56.2020.04.14.13.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 13:16:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 09FA11FF9D; Tue, 14 Apr 2020 21:06:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/17] target/m68k: hack around the FPU register support (HACK!) Date: Tue, 14 Apr 2020 21:06:29 +0100 Message-Id: <20200414200631.12799-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414200631.12799-1-alex.bennee@linaro.org> References: <20200414200631.12799-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Attempting to attach to the gdbstub causes GDB to complain: warning: Register "fp0" has an unsupported size (80 bits) warning: Register "fp1" has an unsupported size (80 bits) warning: Register "fp2" has an unsupported size (80 bits) warning: Register "fp3" has an unsupported size (80 bits) warning: Register "fp4" has an unsupported size (80 bits) warning: Register "fp5" has an unsupported size (80 bits) warning: Register "fp6" has an unsupported size (80 bits) warning: Register "fp7" has an unsupported size (80 bits) Remote 'g' packet reply is too long (expected 148 bytes, got 164 bytes): 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000$ 00000000000000000000408009f000000000800003407fffffffffffffffffff7fffffffffffffffffff7fffffffffffffffffff7fffffffffffffffffff7fffffffffffffffffff7fffffffffffffffffff7fffffff$ fffffffffff7fffffffffffffffffff000000000000000000000000 and then subsequently fail. The root problem seems to be this is an undefined size register for the target description. There does exist a floatformats_m68881_ext in GDB but setting "m68881_ext" also fails as the only "weird" tdesc types gdb seems to understand are: { "arm_fpa_ext", TDESC_TYPE_ARM_FPA_EXT }, { "i387_ext", TDESC_TYPE_I387_EXT } So present the register as a i386_ext as some sort of hack. The values are garbage but at least we can continue to connect. Perhaps we should just delete the code because I don't think this ever worked with upstream tools. Signed-off-by: Alex Bennée Cc: Laurent Vivier --- target/m68k/helper.c | 11 +++++------ gdb-xml/m68k-fp.xml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 14 deletions(-) -- 2.20.1 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 79b0b10ea9b..80069adb8cc 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -109,9 +109,8 @@ static int cf_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n) static int m68k_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n) { if (n < 8) { - int len = gdb_get_reg16(mem_buf, env->fregs[n].l.upper); - len += gdb_get_reg16(mem_buf, 0); - len += gdb_get_reg64(mem_buf, env->fregs[n].l.lower); + int len = gdb_get_reg64(mem_buf, cpu_to_le64(env->fregs[n].l.lower)); + len += gdb_get_reg16(mem_buf, cpu_to_le16(env->fregs[n].l.upper)); return len; } switch (n) { @@ -128,9 +127,9 @@ static int m68k_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n) 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; + env->fregs[n].l.lower = le64_to_cpu(* (uint64_t *) mem_buf); + env->fregs[n].l.upper = le16_to_cpu(* (uint16_t *) (mem_buf + 8)); + return 10; } switch (n) { case 8: /* fpcontrol */ diff --git a/gdb-xml/m68k-fp.xml b/gdb-xml/m68k-fp.xml index 64290d16306..8eb55af2860 100644 --- a/gdb-xml/m68k-fp.xml +++ b/gdb-xml/m68k-fp.xml @@ -6,14 +6,14 @@ notice and this notice are preserved. --> - - - - - - - - + + + + + + + + ,