From patchwork Fri May 18 21:57:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 136379 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1767242lji; Fri, 18 May 2018 15:04:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZogH5IyAvgYhC61nkq4Qd0c9JUSW0ltl1EWZdTmi1RoluPh+l9zU+BFiNcr/qa7DCzMURPn X-Received: by 2002:ac8:36d:: with SMTP id w45-v6mr11187587qtg.149.1526681045682; Fri, 18 May 2018 15:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526681045; cv=none; d=google.com; s=arc-20160816; b=ahMidFdZKeK0L8cRbQ3Zy5FWEHynj0PNVIuG2u9nMT5MdHM6Mh5Qb6AAR4CEKCrKsQ 1ILnHRlosYqFoVFkJGQsbMFifDE9bkqbyWzYb05x+XYjicX69WM930W9I2MwT99PhOUh FVUlIOuwJlW1V0FbPVHDcOUPzY1MVmVYhnNi3la/kvXL6gfndr3zLkyc2LxjFLCWWb9z tETA1Gd38i22KV6+FEbpATTE1ThLeSuFxBkE86UKj41BHFuJy6G9KNEF9SjCd8rZbZL+ Yg8j+OCz/z0A5fnXZlsg/r5sOAM/qTqPGPAziQAwm5E+qMnprjWDGno0wDQxiEqwQjei dH7g== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=7hGW8vpnqWdMjjxasbxw2llw0JJWisaRtTCKXIWJxv4=; b=SJevgPtI9zcowI5qA2pxTfdJTDQFcbBhMiC6xX5pYUBiaxlZkrvLScUSE8NajmdZoW L/A69CqcJMoO3N5dBKZ2E+2PDZqZG+Mp2CfVz1Itu3apsW0KrOSaAvifXFu1inYCzreC KJtsr20zMz8VOv7zzOwZndf/wiEFHrB6RdOywu2z8d5e5L0AcHD+CCRO5i5VvFhvvqqx UGaNpUPZTRtN5QWOMDS319aFM9CSm6xNCncaERdkCyVRrvHdPBV2iui76GKQxrjc1YOh lvFv89OuVSFNr5t8KkodLjZ4LWpnwYQjpGl+gGED5SCuY9rSjHx5muOO4SQ4/CFPsUub UjfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LFw10Goi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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:4830:134:3::11]) by mx.google.com with ESMTPS id v89-v6si4029151qte.69.2018.05.18.15.04.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 May 2018 15:04:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LFw10Goi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:41025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJnTp-0005qp-77 for patch@linaro.org; Fri, 18 May 2018 18:04:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJnNi-0000H4-Pz for qemu-devel@nongnu.org; Fri, 18 May 2018 17:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJnNh-0003YU-Os for qemu-devel@nongnu.org; Fri, 18 May 2018 17:57:46 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:46842) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJnNh-0003YF-J0 for qemu-devel@nongnu.org; Fri, 18 May 2018 17:57:45 -0400 Received: by mail-pl0-x242.google.com with SMTP id 30-v6so5293553pld.13 for ; Fri, 18 May 2018 14:57:45 -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; bh=7hGW8vpnqWdMjjxasbxw2llw0JJWisaRtTCKXIWJxv4=; b=LFw10GoijB2/y4dVURoKSY5HOJMpY57i/iOno4nD3+3KIXnGnyp4UhWumijSPaT+zz +t4ReABRFJfa/Vho0q184j1/FOxxZMAd67ktYvXhZC+Q9u0/WrX+DSotDWGQf6Cr5ugQ HDbUwgWiUnWEJvdVZJsKo0qEhCojIe7R2ecss= 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; bh=7hGW8vpnqWdMjjxasbxw2llw0JJWisaRtTCKXIWJxv4=; b=QLi7OMKd0UUy6VJfW76AMrThAnqj4C+iUSUFuipkTdxZ0+nPBlqHKQV8P0ajasXRsL bOuEXP/5dNpEHXoYPe8rXYPbs88aUVvtMeaJU0H6rkePt2xDDyPEjRcy+zIr1mYlS3iU tYS/jK423CHxGFEkAJRSJq7GTXG8/WEv0duaK0181z1UX0YJhDf2ECeABNhaI63hdTT0 iOwKoKvCB6P68wH4Qrr9iyZvRuZL3L8WQwmUSBh3telfYVql0QPo8RNwaElEKRw2poVe svgZU+xb3DhfzW9AI9Z7qZpzCs96NBEDYNVzyfC8aaFSSFc1NfX5wyVJ6hKZY9MaOjkR k64w== X-Gm-Message-State: ALKqPwf9V552xnU87jM8dkOaAbn8oNLBjNBFzEVUfPHiNCH85roxQaqe yD4GQyVrqL/GeLPPY0CZf5o8hBTEFAw= X-Received: by 2002:a17:902:42a3:: with SMTP id h32-v6mr11240189pld.72.1526680664218; Fri, 18 May 2018 14:57:44 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id h8-v6sm10780814pgq.56.2018.05.18.14.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 14:57:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 18 May 2018 14:57:31 -0700 Message-Id: <20180518215734.18833-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518215734.18833-1-richard.henderson@linaro.org> References: <20180518215734.18833-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PULL 5/8] target/s390x: Honor CPU_DUMP_FPU 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: peter.maydell@linaro.org, Alexander Graf Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Also do not dump both "fpu" and "vector" registers as the former overlaps the latter. Cc: Alexander Graf Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/helper.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.17.0 diff --git a/target/s390x/helper.c b/target/s390x/helper.c index e8548f340a..fd5791f134 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -327,21 +327,22 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, } } - for (i = 0; i < 16; i++) { - cpu_fprintf(f, "F%02d=%016" PRIx64, i, get_freg(env, i)->ll); - if ((i % 4) == 3) { - cpu_fprintf(f, "\n"); + if (flags & CPU_DUMP_FPU) { + if (s390_has_feat(S390_FEAT_VECTOR)) { + for (i = 0; i < 32; i++) { + cpu_fprintf(f, "V%02d=%016" PRIx64 "%016" PRIx64 "%c", + i, env->vregs[i][0].ll, env->vregs[i][1].ll, + i % 2 ? '\n' : ' '); + } } else { - cpu_fprintf(f, " "); + for (i = 0; i < 16; i++) { + cpu_fprintf(f, "F%02d=%016" PRIx64 "%c", + i, get_freg(env, i)->ll, + (i % 4) == 3 ? '\n' : ' '); + } } } - for (i = 0; i < 32; i++) { - cpu_fprintf(f, "V%02d=%016" PRIx64 "%016" PRIx64, i, - env->vregs[i][0].ll, env->vregs[i][1].ll); - cpu_fprintf(f, (i % 2) ? "\n" : " "); - } - #ifndef CONFIG_USER_ONLY for (i = 0; i < 16; i++) { cpu_fprintf(f, "C%02d=%016" PRIx64, i, env->cregs[i]);