From patchwork Mon May 13 07:46:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 796511 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp1883484wra; Mon, 13 May 2024 00:49:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMHvA2uskwxKY4t3aQI2hTlsUyFRkf7aSRd16WBMTCS1qi2XwDlS6EDxlISVUuPOaMo6U6Oa6MTCYnrn6vJ9aQ X-Google-Smtp-Source: AGHT+IFPF8Ah87RPpMvmJynH6s/xkvl8WvlJpI+uqlCsysXBSAxuUPMABMbMR5ASbjeZtIquS7ia X-Received: by 2002:a05:622a:1906:b0:43a:f262:ec6e with SMTP id d75a77b69052e-43dfdb4dea0mr101493351cf.32.1715586585922; Mon, 13 May 2024 00:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715586585; cv=none; d=google.com; s=arc-20160816; b=hLwIE5qNHlBItQ02JW9E7pang9MsuhHmqOzMeRaL5d6uAIDZ9PohqJ/fk0zKik9rY/ JVSyygGdX6aKL2e4oiNS++NXPeOLzzdesa1ulfB9uG2GjTEue7wdYTbCs0MBPMMqbJs6 1FuXrRRnguvxIqXrlIIobYBTSJ16HJTg4KzHtsJ5d8AixA+CzkUkmpdb87/BAoBmpqDu 4jn8FOiUMXQYOdL+TZyjLBqGZQWlE7SbEWSGzM31aKak4kZciUmTicCGOJ+D1sK5Z9MG wftf+r/V72UNgG2R4YhRTfwteSrEwGwjxdbJU1XHo9VypXI7530is1QwW/nJ8cNAy3Km nLPg== 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=ZeHTNmgl5VcWCzWyaGiTmj8h8z3iRV8Wt7l8INt8uKM=; fh=f2WZoDMBYjCKWIIOoPI+rQtxlv4fmOm4u+dLdQLqpOk=; b=xUZ1VUvOE4XeIgn08TxOm6IkVwCPQlYJvoYFzgDj3EhCsnjNIoMU1ysMQV4zBJ67aw 2NJlC1CCo2wbnw5fZOvvdQCNjuqBd8oLRxzRvPFZAh0beEJmNfrjhX8uzTgUOVW6v84L 1w3mXZ9AG1ZSsFpslnXKI78suzNbOej1Rf2qHOry6sW9aC1rXviDMDvAHn1IZvPPA03p aSpxZ7HyU3XGy6/GNMcE6py4J9x5ZZQibCzA+N87d4gs65JPKX5reWx+EY3kBOzdO7YD bbHeSy+qvjcsof+ubfPlwhXUJYYF7dl9nQ4AkkUDnZ3Rge6VAijVgk1ETJeP5nMxjERf 674A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r6vcA7G6; 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 d75a77b69052e-43df566f87asi92695161cf.321.2024.05.13.00.49.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 May 2024 00:49:45 -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=r6vcA7G6; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6QPR-0002uI-EW; Mon, 13 May 2024 03:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6QPE-0002nB-2g for qemu-devel@nongnu.org; Mon, 13 May 2024 03:47:33 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6QPC-0001Lm-7M for qemu-devel@nongnu.org; Mon, 13 May 2024 03:47:31 -0400 Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2e0a34b2899so60308591fa.3 for ; Mon, 13 May 2024 00:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715586448; x=1716191248; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZeHTNmgl5VcWCzWyaGiTmj8h8z3iRV8Wt7l8INt8uKM=; b=r6vcA7G6u3edbGuZGtbaoutRGLTVSkuh2yhOV8PqR8OULVM4XCOrVZ81Lx/n1UOtUX ZVFUHxHBfii73bnVdNEX+vXe7Q/ZDYYbjjpUpnv8JGSxClo26S41EvXPPXJ+i1JXqqVE 5HcMwIx1xKRTjETfB463DKQgH9plC3pFklJX+XLXE3F8n7YPxN3Q9JKJwK3w/BKZpVCJ wHarEZDyaQjvAo8yHNLLVl0dDpbS57WRlNNk5DqkNPfgomoFVjQp22KL2jS+VMEihMmc mQiEkkhrP9u0+aV76uC10PVoW9olvBMEtoi+nSZwiLjZMpqmvmw3LhOxcph/Cr6hrYV8 akRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586448; x=1716191248; 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:message-id:reply-to; bh=ZeHTNmgl5VcWCzWyaGiTmj8h8z3iRV8Wt7l8INt8uKM=; b=WcWQBpk5g9QHOG/omRBu8ZvOjYwL623o8rBHcEBl1gzbwF4FhN7BrNyEYbmAu7lW5g uYfPJ/riNkfacMvbztkMZdEemXeP41hFg5kM2Iw9EyZw4ksy1h0Mx6So5vKWvfbK5uH+ bxoIdTThstX2uiJicz6lrDhT/WcXlv8b9aFgQbD43K+OxnEnYY209XXHjIynoPzqDM9C N+i/f9VjfHcppQ4m8u0lBgYJPZqyxpFfylqvoxhDLHPFRwhB9fGScWfPdLCi0NLkTp/g x+id7xJpsp5NesRplxus/+apSGUCaHF0jUBQKNi1tAUHQ33Y6QTFZmDNCFzdRCF8eyhe N/bQ== X-Gm-Message-State: AOJu0Yyn7xey0C/MoKZPa1i3K9oJoKb8oK+LSEcLzR1nryXZ+NNgquh5 dvWsHL9tJuc2zoODvryWihIjMoGE5MZ+81CrwLXGABnlN8g8A8f09rLDuNiiUlWifhvod94sgXr SMiY= X-Received: by 2002:a2e:7d09:0:b0:2e2:1647:f671 with SMTP id 38308e7fff4ca-2e5205c817emr75141601fa.47.1715586448686; Mon, 13 May 2024 00:47:28 -0700 (PDT) Received: from stoup.. (12.red-213-97-13.staticip.rima-tde.net. [213.97.13.12]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9318sm148204765e9.30.2024.05.13.00.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:47:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: deller@gmx.de Subject: [PATCH v2 13/45] target/hppa: Add space arguments to install_iaq_entries Date: Mon, 13 May 2024 09:46:45 +0200 Message-Id: <20240513074717.130949-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240513074717.130949-1-richard.henderson@linaro.org> References: <20240513074717.130949-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=richard.henderson@linaro.org; helo=mail-lj1-x231.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.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-bounces+patch=linaro.org@nongnu.org Move space assighments to a central location. Signed-off-by: Richard Henderson Reviewed-by: Helge Deller --- target/hppa/translate.c | 58 +++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index d24220c60f..05383dcd04 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -624,8 +624,9 @@ static void copy_iaoq_entry(DisasContext *ctx, TCGv_i64 dest, } } -static void install_iaq_entries(DisasContext *ctx, uint64_t bi, TCGv_i64 bv, - uint64_t ni, TCGv_i64 nv) +static void install_iaq_entries(DisasContext *ctx, + uint64_t bi, TCGv_i64 bv, TCGv_i64 bs, + uint64_t ni, TCGv_i64 nv, TCGv_i64 ns) { copy_iaoq_entry(ctx, cpu_iaoq_f, bi, bv); @@ -639,6 +640,12 @@ static void install_iaq_entries(DisasContext *ctx, uint64_t bi, TCGv_i64 bv, tcg_gen_andi_i64(cpu_iaoq_b, cpu_iaoq_b, gva_offset_mask(ctx->tb_flags)); } + if (bs) { + tcg_gen_mov_i64(cpu_iasq_f, bs); + } + if (ns || bs) { + tcg_gen_mov_i64(cpu_iasq_b, ns ? ns : bs); + } } static void install_link(DisasContext *ctx, unsigned link, bool with_sr0) @@ -670,7 +677,8 @@ static void gen_excp_1(int exception) static void gen_excp(DisasContext *ctx, int exception) { - install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); + install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, NULL, + ctx->iaoq_b, cpu_iaoq_b, NULL); nullify_save(ctx); gen_excp_1(exception); ctx->base.is_jmp = DISAS_NORETURN; @@ -724,10 +732,11 @@ static void gen_goto_tb(DisasContext *ctx, int which, { if (use_goto_tb(ctx, b, n)) { tcg_gen_goto_tb(which); - install_iaq_entries(ctx, b, NULL, n, NULL); + install_iaq_entries(ctx, b, NULL, NULL, n, NULL, NULL); tcg_gen_exit_tb(ctx->base.tb, which); } else { - install_iaq_entries(ctx, b, cpu_iaoq_b, n, ctx->iaoq_n_var); + install_iaq_entries(ctx, b, cpu_iaoq_b, ctx->iasq_b, + n, ctx->iaoq_n_var, ctx->iasq_n); tcg_gen_lookup_and_goto_ptr(); } } @@ -1916,7 +1925,7 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest, install_link(ctx, link, false); if (is_n) { if (use_nullify_skip(ctx)) { - install_iaq_entries(ctx, -1, next, -1, NULL); + install_iaq_entries(ctx, -1, next, NULL, -1, NULL, NULL); nullify_set(ctx, 0); ctx->base.is_jmp = DISAS_IAQ_N_UPDATED; return true; @@ -1935,10 +1944,11 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest, install_link(ctx, link, false); if (is_n && use_nullify_skip(ctx)) { - install_iaq_entries(ctx, -1, next, -1, NULL); + install_iaq_entries(ctx, -1, next, NULL, -1, NULL, NULL); nullify_set(ctx, 0); } else { - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, next); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + -1, next, NULL); nullify_set(ctx, is_n); } @@ -2026,7 +2036,7 @@ static void do_page_zero(DisasContext *ctx) tcg_gen_st_i64(cpu_gr[26], tcg_env, offsetof(CPUHPPAState, cr[27])); tmp = tcg_temp_new_i64(); tcg_gen_ori_i64(tmp, cpu_gr[31], 3); - install_iaq_entries(ctx, -1, tmp, -1, NULL); + install_iaq_entries(ctx, -1, tmp, NULL, -1, NULL, NULL); ctx->base.is_jmp = DISAS_IAQ_N_UPDATED; break; @@ -2770,8 +2780,8 @@ static bool trans_or(DisasContext *ctx, arg_rrr_cf_d *a) nullify_over(ctx); /* Advance the instruction queue. */ - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, - ctx->iaoq_n, ctx->iaoq_n_var); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + ctx->iaoq_n, ctx->iaoq_n_var, ctx->iasq_n); nullify_set(ctx, 0); /* Tell the qemu main loop to halt until this cpu has work. */ @@ -3921,16 +3931,11 @@ static bool trans_be(DisasContext *ctx, arg_be *a) load_spr(ctx, new_spc, a->sp); install_link(ctx, a->l, true); if (a->n && use_nullify_skip(ctx)) { - install_iaq_entries(ctx, -1, tmp, -1, NULL); - tcg_gen_mov_i64(cpu_iasq_f, new_spc); - tcg_gen_mov_i64(cpu_iasq_b, new_spc); + install_iaq_entries(ctx, -1, tmp, new_spc, -1, NULL, new_spc); nullify_set(ctx, 0); } else { - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, tmp); - if (ctx->iasq_b) { - tcg_gen_mov_i64(cpu_iasq_f, ctx->iasq_b); - } - tcg_gen_mov_i64(cpu_iasq_b, new_spc); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + -1, tmp, new_spc); nullify_set(ctx, a->n); } tcg_gen_lookup_and_goto_ptr(); @@ -4041,11 +4046,8 @@ static bool trans_bve(DisasContext *ctx, arg_bve *a) dest = do_ibranch_priv(ctx, dest); install_link(ctx, a->l, false); - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, dest); - if (ctx->iasq_b) { - tcg_gen_mov_i64(cpu_iasq_f, ctx->iasq_b); - } - tcg_gen_mov_i64(cpu_iasq_b, space_select(ctx, 0, dest)); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + -1, dest, space_select(ctx, 0, dest)); nullify_set(ctx, a->n); tcg_gen_lookup_and_goto_ptr(); ctx->base.is_jmp = DISAS_NORETURN; @@ -4781,13 +4783,7 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) } /* FALLTHRU */ case DISAS_IAQ_N_STALE_EXIT: - install_iaq_entries(ctx, fi, fv, bi, bv); - if (fs) { - tcg_gen_mov_i64(cpu_iasq_f, fs); - } - if (bs) { - tcg_gen_mov_i64(cpu_iasq_b, bs); - } + install_iaq_entries(ctx, fi, fv, fs, bi, bv, bs); nullify_save(ctx); if (is_jmp == DISAS_IAQ_N_STALE_EXIT) { tcg_gen_exit_tb(NULL, 0);