From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36F95C2B9F4 for ; Tue, 15 Jun 2021 03:10:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F35F46140C for ; Tue, 15 Jun 2021 03:10:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F35F46140C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lszTU-0002fb-5x for qemu-devel@archiver.kernel.org; Mon, 14 Jun 2021 23:10:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lszQf-0004ew-Jw for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:54 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:45654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lszQd-0008A3-OP for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:53 -0400 Received: by mail-pj1-x1031.google.com with SMTP id z3-20020a17090a3983b029016bc232e40bso1317647pjb.4 for ; Mon, 14 Jun 2021 20:07:51 -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=rxs30+5uAa9OunefGQHMVoUkynnQ1zCC+uwySj1YTHA=; b=ph5NFs73tU0nzEs0hJ/7pO/9mjO6LIuUWtE1RCTv/zJCYwvpAhZZIxQSRNqB+48UZ2 rrZK2lyOP4LDJ4PYtElI03nDZ3fBPi8oi0PdbToreQ850PlrGq3JVuVM316SuM7zuKIR 2Qkaa+zakDiIvuPBwB8xe0taZYSavcHrb4dKYMsmH2fA/6hUUQvuoA9utFCENvIK9Wby 8ls08GqQrEysKm178TqUegnDAIPNmg8xgJ2m1dZ4aMF1giTYdMzko5HRyK2zFEB2MEgh hz8krDUpLx+ljY7hcXsstuw3iOYZOaTWFl0R+BWSvTiFTnCRdNCHzrcwO03CbADy9+jE pKjg== 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=rxs30+5uAa9OunefGQHMVoUkynnQ1zCC+uwySj1YTHA=; b=ZH1l14ubL3E+6C1M4SLFyoCPz8dn95LMehYjW64eCmbLiGTJ/HUOb8NsbwrJEm7iSR VoX3dZThGCcDAFTKm0+uhuxIa4bsBcqtkG/rK+75qa987iECeG4s0O6RJFOfymU5Z4HF dBLR2KMGviiucnqlDuU5kF4l2DYCgXZvHQ3B9isPtybjt2R3oquj9MXIfDRnnplxrDHI aEIpqxvjQPmZSaXdYOaARlRe3qkE3gnpvqM1TwrseBKxI3u+OfW7TUeC8TGqI3Aw/rbt SYkg7Yv/9CMKV653LGfEYTxV7eCH6VmtmvrvL3v9NY3gbdmyCgTaMh23ntjxHrnfQajI IRqw== X-Gm-Message-State: AOAM53128ndbJgLm5W2CG8IDgdaSliWBt7Cmf37o5LG3jZ6EPThGFvlA BKXlwUWJ4c6d2ynDkjPtK6Z704kYK6sXZA== X-Google-Smtp-Source: ABdhPJx1Hq1l9idtVeZCEJ6SwZstKx3iWCEI0QPugaOfQ3J7Jcz6I/Cjevz2v3rEXYgLAPpyoOKIrg== X-Received: by 2002:a17:902:d3c3:b029:101:af83:cb1f with SMTP id w3-20020a170902d3c3b0290101af83cb1fmr2207550plb.80.1623726470520; Mon, 14 Jun 2021 20:07:50 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id w71sm7554666pfc.164.2021.06.14.20.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 20:07:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/5] target/s390x: Use s390_cpu_{set_psw, get_psw_mask} in gdbstub Date: Mon, 14 Jun 2021 20:07:43 -0700 Message-Id: <20210615030744.1252385-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615030744.1252385-1-richard.henderson@linaro.org> References: <20210615030744.1252385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com 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_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@linux.vnet.ibm.com, cohuck@redhat.com, qemu-s390x@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" No change in behaviour, as gdbstub was correctly written to install and extract the cc value. Signed-off-by: Richard Henderson --- target/s390x/gdbstub.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c index d6fce5ff1e..5b4e38a13b 100644 --- a/target/s390x/gdbstub.c +++ b/target/s390x/gdbstub.c @@ -31,18 +31,10 @@ int s390_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) { S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = &cpu->env; - uint64_t val; - int cc_op; switch (n) { case S390_PSWM_REGNUM: - if (tcg_enabled()) { - cc_op = calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, - env->cc_vr); - val = deposit64(env->psw.mask, 44, 2, cc_op); - return gdb_get_regl(mem_buf, val); - } - return gdb_get_regl(mem_buf, env->psw.mask); + return gdb_get_regl(mem_buf, s390_cpu_get_psw_mask(env)); case S390_PSWA_REGNUM: return gdb_get_regl(mem_buf, env->psw.addr); case S390_R0_REGNUM ... S390_R15_REGNUM: @@ -59,10 +51,7 @@ int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) switch (n) { case S390_PSWM_REGNUM: - env->psw.mask = tmpl; - if (tcg_enabled()) { - env->cc_op = extract64(tmpl, 44, 2); - } + s390_cpu_set_psw(env, tmpl, env->psw.addr); break; case S390_PSWA_REGNUM: env->psw.addr = tmpl; -- 2.25.1