From patchwork Tue Sep 6 10:17:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 603009 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp4424978mae; Tue, 6 Sep 2022 04:10:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR6t4cNcOMTDcyj6x+M/7WYa6J8Am6j8j2VFCRe7LJ6pFuc40Yk1ksFDYJEguK3Wbf69AD8G X-Received: by 2002:a05:620a:16d4:b0:6bc:4df0:2118 with SMTP id a20-20020a05620a16d400b006bc4df02118mr33485147qkn.574.1662462619324; Tue, 06 Sep 2022 04:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662462619; cv=none; d=google.com; s=arc-20160816; b=n3TXODPvvu/Zg+WR080d06TFrNm/mPmkxiQUVhhKRmPB/RVwQijMD1roM7iGSzzymb fUzra3AOzqdt0oIS/NO2u7JFcUSGj3oL4JASWCEg1lPz8D7R+E5v08/rGbIortVg+8q1 KvzqKXGW0KyW841gnSRW0zUYjLtJGq3Y+0Vlvl4Qv9dxgCKg+lzBKIn+n3F2gEDz7V1R DZeQ58UQ8CRxxLMqu8faUJc0kxV3fU1R9bjQ0VGjOPZXq0S40/iX7p8fPOAtlJJbC/nt 8CUn1ktSQFf8ASi2Ahx3bWa1PG3ScP1c1rcVD83DrREalILZDCMAe+kZE9v70zj6hQWx sgSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=l53fuZSqZ64troLpcyrB8sNDjaLJEzEZPxt99U3wokI=; b=w8O3bb6QMaoxpGZN5mtDPsxeAsSsWHo3kzLhtTVikh9aU5ey2nZV1KFTtdwiKRo06B IbJPFdoJpwE7vKUvnkuxL3YfLGHGhpvHOzJL0j5N6qzrd6+ZAPIDpFbcH5x5l2xlGabD ikWCFiKnADRb+6M7XIvRZAoIqqGGB7f04FeZoTSNBZP9YbJtw7+xMFM/P2m8OoemaIbn MCGlH4dMVHIdDxJML/2qygNtva5JE10C7ZyZaAb2Ppqe/FVNL/5tLopOPff86NTG5BIP CQmGf1L0wvcuj2BULb2wKru6PcUT/VS2gUtN1m+09/6hNmPubKcNtkk60H780fMiTJ3B WWgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EeCV5cfl; 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=pass (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 d19-20020ac85ad3000000b00342f98e0886si8297803qtd.418.2022.09.06.04.10.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Sep 2022 04:10:19 -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=pass header.i=@linaro.org header.s=google header.b=EeCV5cfl; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVWTC-0004jC-Tq for patch@linaro.org; Tue, 06 Sep 2022 07:10:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVVeZ-0003K6-2b for qemu-devel@nongnu.org; Tue, 06 Sep 2022 06:17:59 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVVeX-0005Cx-7w for qemu-devel@nongnu.org; Tue, 06 Sep 2022 06:17:58 -0400 Received: by mail-wr1-x431.google.com with SMTP id b16so14691331wru.7 for ; Tue, 06 Sep 2022 03:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=l53fuZSqZ64troLpcyrB8sNDjaLJEzEZPxt99U3wokI=; b=EeCV5cflzzv8hLEeYXMgMB4UhDE0WjAOjzDBBkQ4GKCu5R0hwle5dfttoZx08tmsaA cMjetI66jr4BFahkH9iCF3SBvJZdEftaY78eTYKtk9FLKiJy/Ova3JtVhpN9D2Rx+5+i rG1mraupl3AgCvBx03zyMZCi1cdUXgqhDDwax3G4XYYBwJEbMlt3+bDs6EFxNiudxC2x nF81lVs0xGwHYm7A/weZsCVLuB8tppJnlh3ztgWWSpuHD77KIvVrdIJDhI2s5PygAIlv Ls7dkWoQUlMHfDs6cA0LXNYsP1BJ1jbFD9a1TiVx/aKd3xrUbk/oAjg/hhOwOj+XLl+E J/Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=l53fuZSqZ64troLpcyrB8sNDjaLJEzEZPxt99U3wokI=; b=yPe2ogZNebSxw/LxZ0ggOVyzICErcNVpCkUQHGi6csy8euxpsHCoGmIguyuJaX5J1A M3woV9NYOqZ+8GwlDtwPsDZlgv+GRQ/LbkJ6j5C3ESK9c1OdQQbm+KrXknZovWoIVjAi 2AquplEv6Go9NIS2QnMBQk/vK9GfZcQS1doM3JF6dtl36bdOVZC0filC4eWMnVB+j6P/ zqpKU7RfD58DUxt2atnTSuyw/GMBtfEud8H/oYjaDMjuFtUnU5yxVQmKNnL3uFWOAYqs 2WJIu5tqE/4ZGQ5B4F6Mh7W2jUmmh2IhWF5mThLF/5A4oe5qtSzTLSU/T4o3hEClbTmU aArg== X-Gm-Message-State: ACgBeo1qPBhfIPyBzzyjvJtaEN0vXMPYM74qY09r2E3KRW+Zc2WnxUtB X0LZRWLvDunpi7WfxXx4IlqbK20LFxaLBdsQ X-Received: by 2002:a05:6000:144e:b0:225:36c6:50a5 with SMTP id v14-20020a056000144e00b0022536c650a5mr25402228wrx.543.1662459475744; Tue, 06 Sep 2022 03:17:55 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:a5c0:5a80:ba98:3a71:8524:e0b1]) by smtp.gmail.com with ESMTPSA id y16-20020a05600c365000b003a62bc1735asm14094361wmq.9.2022.09.06.03.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 03:17:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org Subject: [PATCH v1 07/26] target/s390x: Remove pc argument to pc_to_link_into Date: Tue, 6 Sep 2022 11:17:28 +0100 Message-Id: <20220906101747.344559-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220906101747.344559-1-richard.henderson@linaro.org> References: <20220906101747.344559-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x431.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" All callers pass s->pc_tmp. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/s390x/tcg/translate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 47a9d87416..7c98a72ddd 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -174,8 +174,10 @@ static void gen_psw_addr_disp(DisasContext *s, TCGv_i64 dest, int64_t disp) tcg_gen_movi_i64(dest, s->base.pc_next + disp); } -static void pc_to_link_info(TCGv_i64 out, DisasContext *s, uint64_t pc) +static void pc_to_link_info(TCGv_i64 out, DisasContext *s) { + uint64_t pc = s->pc_tmp; + if (s->base.tb->flags & FLAG_MASK_32) { if (s->base.tb->flags & FLAG_MASK_64) { tcg_gen_movi_i64(out, pc); @@ -1534,7 +1536,7 @@ static DisasJumpType op_ni(DisasContext *s, DisasOps *o) static DisasJumpType op_bas(DisasContext *s, DisasOps *o) { - pc_to_link_info(o->out, s, s->pc_tmp); + pc_to_link_info(o->out, s); if (o->in2) { tcg_gen_mov_i64(psw_addr, o->in2); per_branch(s, false); @@ -1549,7 +1551,7 @@ static void save_link_info(DisasContext *s, DisasOps *o) TCGv_i64 t; if (s->base.tb->flags & (FLAG_MASK_32 | FLAG_MASK_64)) { - pc_to_link_info(o->out, s, s->pc_tmp); + pc_to_link_info(o->out, s); return; } gen_op_calc_cc(s); @@ -1579,7 +1581,7 @@ static DisasJumpType op_bal(DisasContext *s, DisasOps *o) static DisasJumpType op_basi(DisasContext *s, DisasOps *o) { - pc_to_link_info(o->out, s, s->pc_tmp); + pc_to_link_info(o->out, s); return help_goto_direct(s, (int64_t)get_field(s, i2) * 2); }