From patchwork Wed May 6 12:05:22 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: 186251 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp2051722ill; Wed, 6 May 2020 05:08:17 -0700 (PDT) X-Google-Smtp-Source: APiQypLZk+OjjhOcRl7nGP0EfX8i+4DrDzAR9h9YpcpGrqV9UCQT58chOSdYmpqqS5pKQUh72clI X-Received: by 2002:a37:a0d5:: with SMTP id j204mr8346116qke.128.1588766897025; Wed, 06 May 2020 05:08:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588766897; cv=none; d=google.com; s=arc-20160816; b=yWbbEQTgL0dASEjzD6Ax3kdZCz+RhHDRR5dyBb3P5pkarCbG70T7eCKU9qZCRfXSZT 3HmHmHvWcU4QJf+yk7i+inFbQYRc+ZiEyzgo9yatgQ+junBqBNpdbnKUiZNcZixsJ5aQ /LlkuqP8w8kHfuwBatPDjvrGRJkgaN3nhgdXy7IPnp5v1HvCPuPf0KupPIe4sBk/wsSM C3KGpp04Phe4lPhl15KQbW3FbIrPkFZI7uowDbxTIS4zGyORAxe73209JC82e3RbGorC A8A2SEsgaaqcwuWDBjpdR3tCFaHZefjNDWbvSkcRMpD5KcGBovLTkAGOayccBO0iw3wd Emyg== 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=iv5aExKuZFmBZpEOYjyI0CnqRcGLI8UlOxisphwDQLk=; b=AiNN6qtStPhv4Xv4ac4L8L35tmDKMGjAWh++ZesMNwuJY9CD7DYJ4ns7gE9sJ+ZCc9 v6bMp3gKmVTGMysUu3Ul2+yTBj+aIB/PNqP3/Q05Hk6lVKz3d4iNg9TJCeLxyM+y+fv6 zG71KyCSww90OMz5tPX3DBhLufbdSb9yPVD1M11vI/+ZHUzpWSJ4Ph79dxgyeZ3uLGO7 vObA6Prvss1bWFqgRi34A0yjC13UuLNXwM/TBXZVJFHoLimmEyEg7HY1SOtfDyDsQrh5 O5jswPWW/LnBF3conn+51bpU/6i6l1zn2tqqiUkC0cesPAU/LSCDXYY0i1fg9BbKpaVg bEqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Qa0KaZfF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::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. [2001:470:142::17]) by mx.google.com with ESMTPS id 63si649734qki.15.2020.05.06.05.08.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 May 2020 05:08:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Qa0KaZfF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::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]:35480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWIqW-0002co-Gh for patch@linaro.org; Wed, 06 May 2020 08:08:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWIo5-0006DO-1C for qemu-devel@nongnu.org; Wed, 06 May 2020 08:05:45 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:52246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWIo4-0000hT-21 for qemu-devel@nongnu.org; Wed, 06 May 2020 08:05:44 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 188so2308924wmc.2 for ; Wed, 06 May 2020 05:05:43 -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=iv5aExKuZFmBZpEOYjyI0CnqRcGLI8UlOxisphwDQLk=; b=Qa0KaZfFFnqCAdKJx1tyhgNKiK/Y/N610jkiWqKQSaa/M+WlqoyWOo5rPTJgGM5qnD m/HgE8rJCL4KmbabY/OeFiFVT1F3sclG3qUQWg/fTYo1SxH6G4H1FU93DkARRPI2RAsf r1HC7YfJMRs9GH/8ECobuG9f3WfHIQiDznKbSRJLpb8pzdo0ZmhRyUNPG3uRFowEAHz5 FS/TdJu8daJVRGtmkLI5FUgZdvo4WKl2xZzi8JhnNY8OB7ZCSWOl9uwqUGiU/1fZ9Ada 2+cNdSLlruI7IIS21vkgYkwH38B0Gh1qWwmc9nOTqkuKlkp7C5uPvvr7oz+x9Rbsw5sV Gujg== 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=iv5aExKuZFmBZpEOYjyI0CnqRcGLI8UlOxisphwDQLk=; b=qBTm9UnW8nNDt3rMjv6J1lwwEY+Cqj+fcFimLDueMZTmjSaa5gjY+6CEIs5RzpFNkt DkkSGBFuCUdSR/ia2COsbqcvg8lSrx2XYYUbOs0C+KUA3cf/mtBr0DdDm0TAVMWv3gj0 lcRfWGj6H6RyM3geJQ948WYPrvnJY3TAMAjUgtKqzJN4Tjw46JnogtKvwZu6qyNf4Gue BzTtxzRUhT+z/qSIRw84X6YFnt2bqD6GxJHH2DuappDQKY9BWNZj3wLp+yTFJHxtEmnN WKK6hw0G0IJdBg3rWluDWQJYuT/5udZnayZDVyD2rf8sBr47VQc6x+jb06gDqFbzpyGF lCmw== X-Gm-Message-State: AGi0PuayQpb1jM3v0MTrt+lBNxivBNYcubcszJAC6WUiU9azm8fKZspm xZTg6UMm2lOO+4MZ2halEIR4XQ== X-Received: by 2002:a1c:f312:: with SMTP id q18mr3967871wmq.175.1588766742586; Wed, 06 May 2020 05:05:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l5sm2610859wmi.22.2020.05.06.05.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 05:05:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 513D41FF93; Wed, 6 May 2020 13:05:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/14] gdbstub: Introduce gdb_get_float64() to get 64-bit float registers Date: Wed, 6 May 2020 13:05:22 +0100 Message-Id: <20200506120529.18974-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506120529.18974-1-alex.bennee@linaro.org> References: <20200506120529.18974-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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?= , qemu-devel@nongnu.org, Laurent Vivier , "open list:PowerPC TCG CPUs" , =?utf-8?q?Alex_Benn=C3=A9e?= , David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé When converted to use GByteArray in commits 462474d760c and a010bdbe719, the call to stfq_p() was removed. This call serialize a float. Since we now use a GByteArray, we can not use stfq_p() directly. Introduce the gdb_get_float64() helper to load a float64 register. Fixes: 462474d760c ("target/m68k: use gdb_get_reg helpers") Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20200414163853.12164-3-philmd@redhat.com> Message-Id: <20200430190122.4592-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 20e10726929..4a2b8e30893 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -134,6 +134,17 @@ static inline int gdb_get_float32(GByteArray *array, float32 val) return sizeof(buf); } + +static inline int gdb_get_float64(GByteArray *array, float64 val) +{ + uint8_t buf[sizeof(CPU_DoubleU)]; + + stfq_p(buf, val); + g_byte_array_append(array, buf, sizeof(buf)); + + return sizeof(buf); +} + static inline int gdb_get_zeroes(GByteArray *array, size_t len) { guint oldlen = array->len; diff --git a/target/m68k/helper.c b/target/m68k/helper.c index cad40838956..79b0b10ea9b 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -72,7 +72,8 @@ static int cf_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n) { if (n < 8) { float_status s; - return gdb_get_reg64(mem_buf, floatx80_to_float64(env->fregs[n].d, &s)); + return gdb_get_float64(mem_buf, + floatx80_to_float64(env->fregs[n].d, &s)); } switch (n) { case 8: /* fpcontrol */ diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c index eb362dd9aec..5c11c88b2a8 100644 --- a/target/ppc/gdbstub.c +++ b/target/ppc/gdbstub.c @@ -130,7 +130,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, GByteArray *buf, int n) gdb_get_regl(buf, env->gpr[n]); } else if (n < 64) { /* fprs */ - gdb_get_reg64(buf, *cpu_fpr_ptr(env, n - 32)); + gdb_get_float64(buf, *cpu_fpr_ptr(env, n - 32)); } else { switch (n) { case 64: @@ -184,7 +184,7 @@ int ppc_cpu_gdb_read_register_apple(CPUState *cs, GByteArray *buf, int n) gdb_get_reg64(buf, env->gpr[n]); } else if (n < 64) { /* fprs */ - gdb_get_reg64(buf, *cpu_fpr_ptr(env, n - 32)); + gdb_get_float64(buf, *cpu_fpr_ptr(env, n - 32)); } else if (n < 96) { /* Altivec */ gdb_get_reg64(buf, n - 64); diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index fd763e588ec..2b6e832c4c3 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -9881,7 +9881,7 @@ static int gdb_get_float_reg(CPUPPCState *env, GByteArray *buf, int n) { uint8_t *mem_buf; if (n < 32) { - gdb_get_reg64(buf, *cpu_fpr_ptr(env, n)); + gdb_get_float64(buf, *cpu_fpr_ptr(env, n)); mem_buf = gdb_get_reg_ptr(buf, 8); ppc_maybe_bswap_register(env, mem_buf, 8); return 8;