From patchwork Mon Jun 21 09:58:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 464496 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2419770jao; Mon, 21 Jun 2021 03:19:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwb7Yq3yvK0N60MVwmgHQYeSrJ/F3M9uKZybiYXz56Z4YTD6jhhRkXR0KjKXpwUBGXcTktj X-Received: by 2002:ab0:45f2:: with SMTP id u105mr21334412uau.63.1624270796277; Mon, 21 Jun 2021 03:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624270796; cv=none; d=google.com; s=arc-20160816; b=bpXcO521phEJS4s5ZXupl8atEZwi+bMdlvTSPjP95KwHY5A6xLaU9WSJ5+dz2Q2mht Ziq080xsPt38eDUtCd3R3TtNJ6HC20mexNI5IQobanR7RdsVdAOJ2tW/Tk6sH40Wf6J3 PnmBwkAY2xuzSPn1jQcxPNb4zdKb+52VJjMz/zTjBBrPw24/JES3t971xiwmUVdtCPF0 re4l+JByLd6uqKh6Ze7UAPeqZntXPmqIYfBAg6KJjeTPOOq8csxzaEzvYdkM3zkMJZWu pcO2SG5wBVX0yreE6bgss0R0EXSqZK2h5xQh7C1Ck7QnGLkhdLJss0hj2z7Z6YM+2uAX YvhQ== 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=F6CQy/ENjwvM51SS09QvRT/FiVfQj7za8ueXpvOsLhE=; b=DtrLNUPnFgszGGgdXnV15Fv7Nxc/whXneEDfM2+hgHbVQa0VU+lnYOMrMAMh1Dy/XO BNrDMq+Z1x1F65P+UJHPrVAG1jC3g+IDzkGVD5FnE/CyeXkFyLDzmhMUHqWD8sUby7Kc /7O2+qHh33dbcgI00J8TlU1pJcgZDDh75n9k79oKzMidPTIUhutGBvrr76jSJYoTo6Rx NIOmjYwIoAKnZLTNUop4l9PnYAFN6o/BQvV95TPTer0ufgpSXr9MuTFWCxHwvarAnL5+ FzPmBb4UuABbX0uCP+y0KcGGEDhQAhWQLak88DBKunwAzXixJ0erzcaGCOqwyvonsoAT oPkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=idsXF0Qt; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g1si9408234vsq.208.2021.06.21.03.19.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 03:19:56 -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=@redhat.com header.s=mimecast20190719 header.b=idsXF0Qt; 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=redhat.com Received: from localhost ([::1]:40088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvH23-000282-Ir for patch@linaro.org; Mon, 21 Jun 2021 06:19:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvGj0-0008H5-B9 for qemu-devel@nongnu.org; Mon, 21 Jun 2021 06:00:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvGiw-0007Kr-4a for qemu-devel@nongnu.org; Mon, 21 Jun 2021 06:00:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624269609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F6CQy/ENjwvM51SS09QvRT/FiVfQj7za8ueXpvOsLhE=; b=idsXF0QtqY5Xgo0TRW841jhRjaW9yXl4K+7FSJAHTUw7VoI82Wm6dYvGxo8Lr796mbkkH+ C058iP1tkV/VdqGJrXIi1OElJSA5mD4gbWSKXW39YbzYT8VzwR7lKREX1cuCd67HbznK5y 0KNA38s8n3gfAeN6zeLzm4edpmMSJJ0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-8bQim-uLMCSQKv8owNLjaA-1; Mon, 21 Jun 2021 06:00:05 -0400 X-MC-Unique: 8bQim-uLMCSQKv8owNLjaA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8D945100CEC3; Mon, 21 Jun 2021 10:00:03 +0000 (UTC) Received: from gondolin.fritz.box (ovpn-113-141.ams2.redhat.com [10.36.113.141]) by smtp.corp.redhat.com (Postfix) with ESMTP id B00575D740; Mon, 21 Jun 2021 09:59:58 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Subject: [PULL 31/37] target/s390x: Improve s390_cpu_dump_state vs cc_op Date: Mon, 21 Jun 2021 11:58:36 +0200 Message-Id: <20210621095842.335162-32-cohuck@redhat.com> In-Reply-To: <20210621095842.335162-1-cohuck@redhat.com> References: <20210621095842.335162-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.299, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: ruixin.bao@ibm.com, "jonathan . albrecht" , David Hildenbrand , Cornelia Huck , Richard Henderson , qemu-devel@nongnu.org, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Use s390_cpu_get_psw_mask so that we print the correct architectural value of psw.mask. Do not print cc_op unless tcg_enabled. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Tested-by: jonathan.albrecht Tested-by: Message-Id: <20210615030744.1252385-4-richard.henderson@linaro.org> Signed-off-by: Cornelia Huck --- target/s390x/helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.31.1 diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 559fc3573fe3..1445b74451f4 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -338,12 +338,14 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags) CPUS390XState *env = &cpu->env; int i; - if (env->cc_op > 3) { - qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %15s\n", - env->psw.mask, env->psw.addr, cc_name(env->cc_op)); + qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64, + s390_cpu_get_psw_mask(env), env->psw.addr); + if (!tcg_enabled()) { + qemu_fprintf(f, "\n"); + } else if (env->cc_op > 3) { + qemu_fprintf(f, " cc %15s\n", cc_name(env->cc_op)); } else { - qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %02x\n", - env->psw.mask, env->psw.addr, env->cc_op); + qemu_fprintf(f, " cc %02x\n", env->cc_op); } for (i = 0; i < 16; i++) {