From nobody Sat May 18 08:51:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714002357; cv=none; d=zohomail.com; s=zohoarc; b=jVdMFFIrqH4RSLFN4E05+zklGSqApTDROZTtSr4v3HTe5wIsSYp7pZq/D8WOD7/BmMNHBxLFKuHJa6wtBgSawKm+tZKmoovoN/L27CXNne0DXb/aiaEFcVAU/ac3n1dZC1vd5ehtETEZbt/qLPI8rbah/YHxM0lGYxgAaTt4Qkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714002357; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=UcNiArx2YUV5oHwUywv/QvdvtoymVGfjzxZPBIu3NNw=; b=ejuyz1Dy3JbJEgv6b4HhhwPqifZLYXWuKuOy4Ot0oyfR+YD7qo3DQUswHE8XPjrNbisDX9jCS9gQz2ohncF1Rn29FOcB/RpqTiTRTpds45GrE+pRxEy5B4evL1Xx5T2MJEIRhV46pB43/wfgOduEPka5TmImiv1EKdWovacXa+Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714002357126961.0593397700703; Wed, 24 Apr 2024 16:45:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzmIU-000114-Lw; Wed, 24 Apr 2024 19:45:07 -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 1rzmIL-0000xr-Oi for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:44:57 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzmIJ-00028Y-KF for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:44:57 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6ed32341906so481284b3a.1 for ; Wed, 24 Apr 2024 16:44:52 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001e49428f327sm12531642plf.176.2024.04.24.16.44.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714002291; x=1714607091; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UcNiArx2YUV5oHwUywv/QvdvtoymVGfjzxZPBIu3NNw=; b=fFFJUdcqDuP4IdkIj6OWsLwIPzKvfeuL3V5TFiK+TBEI1aD19iVeo+KFXTO1HVBvgi n4KAp1x1xJTgqZNdX3xWyDlTT6iR8w9gW7OPh5Wzj6KGPgQVDMMasXf+rv8jc6r1sZUc 9Goyy9aBkv8WpB7EqLuf2xQousydXSaRktoK7I2wqXm06YfdMmh1ZVtPqhWR42qNGdzZ IFGJKzH68aBWK9tI380nW9IgMqnW7cuKSDtqVlZ/DNaUIoRVZx3wqN1dKtYDrSsET4yy oNynTPHWrGUt+VD3UV2/9jTWus2C0kyVahhtQazgxuYISuzt9bN2sOF+yUL3dCw8UQsi IkWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714002291; x=1714607091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UcNiArx2YUV5oHwUywv/QvdvtoymVGfjzxZPBIu3NNw=; b=msQ9Pv93J6claiU/fkFibx8HAaa63kVoI1jYuMO10MFm5uZ6YybniD88lDSVsuQq4Q o45mkwO68ZVMfTWl+ZF+cSqmZs5NWE15fnEn1emteEFsVRjxrUgAE5ZS6OWrgWZ14Rmz gAE83MElIsLgAchJeVVgQInfaiwDynpnnp/fKHdRb/t7B6BZHZdK3lWm+vRtaAjt+90g 5kv9jrTCj10wgxSbCBjgjDTAVyfYqFpmsvTP3ZG77vYePkpjnuWwKVSgvn5AxurwsUUG a3LbYPkGaQ6Zs+bzVW+uq09hM5xsWByBFEqZQeAtukKoKDhL7/N9KzA7XJYRGKfLIFrw 7DVA== X-Gm-Message-State: AOJu0Yxs1pLJIyh8I71UrPwh4ywGVGpOrMXZfcwlaipnPEBweqvhnp6Y 2UfohijQ0PZ4CLEZoM6TCuxAPzlSLOlZtLaP4+a/DvzWj5Z5TyS491SmX9krepdds4rL0GMFUy4 Q X-Google-Smtp-Source: AGHT+IEZRMbG+VqLiqglq6UFXjYojLIwOeg+Z6s4NTNFR85IiDiKl05rtLcKStEKAU+wzUgsNJGykw== X-Received: by 2002:a05:6a20:3c91:b0:1a3:dc33:2e47 with SMTP id b17-20020a056a203c9100b001a3dc332e47mr4934910pzj.4.1714002291402; Wed, 24 Apr 2024 16:44:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/5] target/alpha: Use cpu_env in preference to ALPHA_CPU Date: Wed, 24 Apr 2024 16:44:32 -0700 Message-Id: <20240424234436.995410-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424234436.995410-1-richard.henderson@linaro.org> References: <20240424234436.995410-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714002357325100005 Content-Type: text/plain; charset="utf-8" ALPHA_CPU has a dynamic object type assert, which is unnecessary considering that these are all class hooks. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/cpu.c | 15 ++++++--------- target/alpha/helper.c | 8 ++++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 05f9ee41e9..f98d022671 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -28,25 +28,22 @@ =20 static void alpha_cpu_set_pc(CPUState *cs, vaddr value) { - AlphaCPU *cpu =3D ALPHA_CPU(cs); - - cpu->env.pc =3D value; + CPUAlphaState *env =3D cpu_env(cs); + env->pc =3D value; } =20 static vaddr alpha_cpu_get_pc(CPUState *cs) { - AlphaCPU *cpu =3D ALPHA_CPU(cs); - - return cpu->env.pc; + CPUAlphaState *env =3D cpu_env(cs); + return env->pc; } =20 static void alpha_restore_state_to_opc(CPUState *cs, const TranslationBlock *tb, const uint64_t *data) { - AlphaCPU *cpu =3D ALPHA_CPU(cs); - - cpu->env.pc =3D data[0]; + CPUAlphaState *env =3D cpu_env(cs); + env->pc =3D data[0]; } =20 static bool alpha_cpu_has_work(CPUState *cs) diff --git a/target/alpha/helper.c b/target/alpha/helper.c index d6d4353edd..c5e4958f8b 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -124,7 +124,7 @@ void alpha_cpu_record_sigsegv(CPUState *cs, vaddr addre= ss, MMUAccessType access_type, bool maperr, uintptr_t retaddr) { - AlphaCPU *cpu =3D ALPHA_CPU(cs); + CPUAlphaState *env =3D cpu_env(cs); target_ulong mmcsr, cause; =20 /* Assuming !maperr, infer the missing protection. */ @@ -155,9 +155,9 @@ void alpha_cpu_record_sigsegv(CPUState *cs, vaddr addre= ss, } =20 /* Record the arguments that PALcode would give to the kernel. */ - cpu->env.trap_arg0 =3D address; - cpu->env.trap_arg1 =3D mmcsr; - cpu->env.trap_arg2 =3D cause; + env->trap_arg0 =3D address; + env->trap_arg1 =3D mmcsr; + env->trap_arg2 =3D cause; } #else /* Returns the OSF/1 entMM failure indication, or -1 on success. */ --=20 2.34.1 From nobody Sat May 18 08:51:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714002353; cv=none; d=zohomail.com; s=zohoarc; b=gw9fWiZs3GTNYF0ZDSv0o8Zu/WTrDHt6oUmoK+Hf60FzvJ56uKMeiIVDhIKVvRBm6aNPecPxo6wu3OP1za59cHJELxPugt6881RSBmfGW7Ia9KRnvjwJnniOftcuJ1yIgVXmOEhVJkV4VqiGZnstewoiHoPiY6yIQMpJqzxSdx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714002353; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xp7F1dpl/yWtxNJPPz/02BB7DaGLCNxpN0PiR1H7/z0=; b=ZkVxSjMrrGIpU8Thj7q0nmC0B7udyBQ/tpHRS+TyvVjheySUCp63DHAuY14yvvOA9aMY8cPA305BIZvIN5nl2eSekvFEyV9m9y7GERMJufBtbHNmjIr3JjlEtzMjzUQDg+boMP4O295OF6BQ0eQqqWrOhyRx7plf7ck3rhlC/y4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171400235330026.15210817621255; Wed, 24 Apr 2024 16:45:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzmIU-000113-Ku; Wed, 24 Apr 2024 19:45:06 -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 1rzmIL-0000xw-TD for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:44:57 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzmIJ-00028c-Kh for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:44:57 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2ab791bce6fso353442a91.1 for ; Wed, 24 Apr 2024 16:44:53 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001e49428f327sm12531642plf.176.2024.04.24.16.44.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714002292; x=1714607092; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xp7F1dpl/yWtxNJPPz/02BB7DaGLCNxpN0PiR1H7/z0=; b=RL+q2jVcPpK1DZ0QCjDMPQWq5B/GyoLqGgj4sodzK4KLEcgolf9Bwz7lmdTqzWrqsR cr09ubcOALFGJZvkhRQQO0VjwpFGqCJPR7Yly6Y8CW8w1xiaD6zv7yaTHRKubXD2+4WJ ohWFzLsroVvYOg684DFoyPQ9FhXd4VPqk1fs5LZYJbj/nCQAU4lkws2Y0ArZaVVBuU92 U3/IVxCbV3hJc5Pz5gQX6nh4gl//7IJLA88EjBOY/m3FKi3VIcTUKTGpJTEj2mmY5YTF 6miu47Q9YteWRQyH4ORVk5Q6zUWciMQkct5tIxEmZNTFlgTvk2Ntx4RHCOvZJ4mfCJ1u xRdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714002292; x=1714607092; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xp7F1dpl/yWtxNJPPz/02BB7DaGLCNxpN0PiR1H7/z0=; b=D4boA0bsjrgJxgCAEP6giCADwhAjeA22rHUP5jFnN32UjUKfrco0Jnkxy3Q4c11eik 9xR8cmOaSuSzohZM24NRs3u+fpguoIrzbEwaZlyTfmkQnqXV+7WFHiS0Yh+IiO5HvDTd DIqVYO4pavtqpkmc/ybqouIiVGhpJzZr5mqQZt5wsQsxFhN6zEMMkV7NSgxlKvSmhvCj aZpb7cCuXMjgN01/xDJ274bxvyCu9GxdRi4GdZBer2LOeFONGjBJ83UN8t5uqoWirn5q AMHJPYRFLCbW6xaJqu2qoNpyZextRpW0tH8xOsKmLYMIwpuEsCej2GCaeJM0jt14NzJy ycdw== X-Gm-Message-State: AOJu0Yz3mpKH8BRR+2XylJnb9XW+Sdu9xryNEkY4FbUf99gMHZPICTSQ 6x61+p8GxqKYiTELv6dfSyPOIK+QZ8ajmy88MWbTxUrfiEQKX0bHOQmz92GrBnnbfP7dcq5UxvA d X-Google-Smtp-Source: AGHT+IGHyAVgaOhMzh6RO0QMnw0+1t7p1Vd1R5NCPNx4Mk6Wbb7oScOzESs9/owxLAXHv7bFzCiwPA== X-Received: by 2002:a17:90a:ee8f:b0:2aa:5c79:853c with SMTP id i15-20020a17090aee8f00b002aa5c79853cmr4241096pjz.21.1714002292302; Wed, 24 Apr 2024 16:44:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/5] target/alpha: Hoist branch shift to initial decode Date: Wed, 24 Apr 2024 16:44:33 -0700 Message-Id: <20240424234436.995410-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424234436.995410-1-richard.henderson@linaro.org> References: <20240424234436.995410-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714002355467100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index a97cd54f0c..52c2e6248b 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -432,7 +432,7 @@ static bool use_goto_tb(DisasContext *ctx, uint64_t des= t) =20 static DisasJumpType gen_bdirect(DisasContext *ctx, int ra, int32_t disp) { - uint64_t dest =3D ctx->base.pc_next + (disp << 2); + uint64_t dest =3D ctx->base.pc_next + disp; =20 if (ra !=3D 31) { tcg_gen_movi_i64(ctx->ir[ra], ctx->base.pc_next); @@ -455,7 +455,7 @@ static DisasJumpType gen_bdirect(DisasContext *ctx, int= ra, int32_t disp) static DisasJumpType gen_bcond_internal(DisasContext *ctx, TCGCond cond, TCGv cmp, uint64_t imm, int32_t di= sp) { - uint64_t dest =3D ctx->base.pc_next + (disp << 2); + uint64_t dest =3D ctx->base.pc_next + disp; TCGLabel *lab_true =3D gen_new_label(); =20 if (use_goto_tb(ctx, dest)) { @@ -1382,7 +1382,7 @@ static DisasJumpType translate_one(DisasContext *ctx,= uint32_t insn) real_islit =3D islit =3D extract32(insn, 12, 1); lit =3D extract32(insn, 13, 8); =20 - disp21 =3D sextract32(insn, 0, 21); + disp21 =3D sextract32(insn, 0, 21) * 4; disp16 =3D sextract32(insn, 0, 16); disp12 =3D sextract32(insn, 0, 12); =20 --=20 2.34.1 From nobody Sat May 18 08:51:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714002386; cv=none; d=zohomail.com; s=zohoarc; b=ciJBjw9l6YF63sBp01VJfBwVr1aO8sXe5lBUsKbNj5AKUaJEVLYsaobWDFxBrKoZ1PMn1kbdHmTclQELE+DC9SWYTOJY3gxh/zdxRoCiejys01kZYj50m3oan9KJp2M0OSlc9CPOzblrtiH/+JN6DboYaVMZGAZC8XOmIdrQTpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714002386; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=R088D4z5RrGC3ENBq7NdeJMAQG6+Qk8mMWqAtHkj3hU=; b=D5n1aJURBRavmQqasEajrLX8kuNjOa9MWjK65HGovdDrlIXtgyRD+UoSlKMwGSzGiLyNf0nQh5sEK3sXnH8s5RJ0htX1MgZm0Fz6+oFyeorpvD9G8RILH22am2DCwWmr9R0WWeK427Fz7ExX1qETQJPRhTFWz8hFN135nPpGvwk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714002386764460.4318692874567; Wed, 24 Apr 2024 16:46:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzmIO-0000zK-1s; Wed, 24 Apr 2024 19:45:00 -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 1rzmIL-0000xu-Pm for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:44:57 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzmIJ-00028k-KW for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:44:57 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1eab699fcddso765565ad.0 for ; Wed, 24 Apr 2024 16:44:54 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001e49428f327sm12531642plf.176.2024.04.24.16.44.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714002293; x=1714607093; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=R088D4z5RrGC3ENBq7NdeJMAQG6+Qk8mMWqAtHkj3hU=; b=NGmBAZjW2nAX4QNreICv7m5oY0gQdJzr6eS6ToqBk+4lRnF4wgat2JZLzrpxI+doV4 UdxNSK1/cPhCI6i7xXD/r/zsixI5nBfOAOfb7Rt5XIfH4/ulFsPaOBgxa4zm8brb/0jA k2RIdwD1C8QR9hXUeanOtHC+GNgFM2YS9qofiRngMbRlaGXGQMQYJSt97bkcvscqhELg kb5jCqg5yNri/Yv/kW3fZgMJWvlJcHAQp5w5n/mNOr7lyWFRdGZj3hplC3bsBCSsjh2Y LUrSHiTm7JFVjDzs5MnPetL0DZPcZ7nbue+tQt2IfyILOssDxWfnojEdyz1G/gSW88f2 HfoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714002293; x=1714607093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R088D4z5RrGC3ENBq7NdeJMAQG6+Qk8mMWqAtHkj3hU=; b=bMlOC2vlG482IjmEEVJSKJgF69Rm1UUCo4RwxL0IceGD17FM2LjSEMKAFocZeq/hCS 5inyUCcwoRG7ZRSXFUnk0ns6dL1as4+gAk5EsugrWbzqf/9/LhQlKQQEalpsC2VKbxuR XDS+/QxA63Ys/PH915sCGHN8sW+pizdn5eLWH+Zw4+pF1n8e6W1cl5sSq/b4QCtxeKSC +w+9wNxprBDHx4rdXrkeg5sv9vVG27FbN6hWtC4N2DUqQ1AqoQ4e9IntEvFVPBvvaQgK q1bmCT2dZcgg0nemhqqIk7PeBxc/+dCr850hQp8grLcLtU8s5HsUIPRdV9l+RqZCT7Dn XMzw== X-Gm-Message-State: AOJu0YyheD+Zv0KPWD32McAAa5GxCuu46U1YmJKq1WmTTAogs+z16YxN XeQql/usI/Sx84KY3R3XzmUz1MwvdB9xUuY950bKF0+n/+RDN/JhzIhjGcYNyxPSgDWpWum00Wh Y X-Google-Smtp-Source: AGHT+IE5fLefTAfStSB0uh2BPVXjTi+X4ott54bWjNztPhXBQ+T2WHGnmhz0qaGRRIcyaJCRGEILiw== X-Received: by 2002:a17:902:e848:b0:1e2:7fb2:b08 with SMTP id t8-20020a170902e84800b001e27fb20b08mr4856036plg.43.1714002293636; Wed, 24 Apr 2024 16:44:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/5] target/alpha: Split out gen_goto_tb Date: Wed, 24 Apr 2024 16:44:34 -0700 Message-Id: <20240424234436.995410-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424234436.995410-1-richard.henderson@linaro.org> References: <20240424234436.995410-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714002387600100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/alpha/translate.c | 61 ++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 52c2e6248b..c1a55e5153 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -425,60 +425,45 @@ static DisasJumpType gen_store_conditional(DisasConte= xt *ctx, int ra, int rb, return DISAS_NEXT; } =20 -static bool use_goto_tb(DisasContext *ctx, uint64_t dest) +static void gen_goto_tb(DisasContext *ctx, int idx, int32_t disp) { - return translator_use_goto_tb(&ctx->base, dest); + uint64_t dest =3D ctx->base.pc_next + disp; + + if (translator_use_goto_tb(&ctx->base, dest)) { + tcg_gen_goto_tb(idx); + tcg_gen_movi_i64(cpu_pc, dest); + tcg_gen_exit_tb(ctx->base.tb, idx); + } else { + tcg_gen_movi_i64(cpu_pc, dest); + tcg_gen_lookup_and_goto_ptr(); + } } =20 static DisasJumpType gen_bdirect(DisasContext *ctx, int ra, int32_t disp) { - uint64_t dest =3D ctx->base.pc_next + disp; - if (ra !=3D 31) { tcg_gen_movi_i64(ctx->ir[ra], ctx->base.pc_next); } =20 /* Notice branch-to-next; used to initialize RA with the PC. */ if (disp =3D=3D 0) { - return 0; - } else if (use_goto_tb(ctx, dest)) { - tcg_gen_goto_tb(0); - tcg_gen_movi_i64(cpu_pc, dest); - tcg_gen_exit_tb(ctx->base.tb, 0); - return DISAS_NORETURN; - } else { - tcg_gen_movi_i64(cpu_pc, dest); - return DISAS_PC_UPDATED; + return DISAS_NEXT; } + gen_goto_tb(ctx, 0, disp); + return DISAS_NORETURN; } =20 static DisasJumpType gen_bcond_internal(DisasContext *ctx, TCGCond cond, TCGv cmp, uint64_t imm, int32_t di= sp) { - uint64_t dest =3D ctx->base.pc_next + disp; TCGLabel *lab_true =3D gen_new_label(); =20 - if (use_goto_tb(ctx, dest)) { - tcg_gen_brcondi_i64(cond, cmp, imm, lab_true); + tcg_gen_brcondi_i64(cond, cmp, imm, lab_true); + gen_goto_tb(ctx, 0, 0); + gen_set_label(lab_true); + gen_goto_tb(ctx, 1, disp); =20 - tcg_gen_goto_tb(0); - tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); - tcg_gen_exit_tb(ctx->base.tb, 0); - - gen_set_label(lab_true); - tcg_gen_goto_tb(1); - tcg_gen_movi_i64(cpu_pc, dest); - tcg_gen_exit_tb(ctx->base.tb, 1); - - return DISAS_NORETURN; - } else { - TCGv_i64 i =3D tcg_constant_i64(imm); - TCGv_i64 d =3D tcg_constant_i64(dest); - TCGv_i64 p =3D tcg_constant_i64(ctx->base.pc_next); - - tcg_gen_movcond_i64(cond, cpu_pc, cmp, i, d, p); - return DISAS_PC_UPDATED; - } + return DISAS_NORETURN; } =20 static DisasJumpType gen_bcond(DisasContext *ctx, TCGCond cond, int ra, @@ -2920,12 +2905,8 @@ static void alpha_tr_tb_stop(DisasContextBase *dcbas= e, CPUState *cpu) case DISAS_NORETURN: break; case DISAS_TOO_MANY: - if (use_goto_tb(ctx, ctx->base.pc_next)) { - tcg_gen_goto_tb(0); - tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); - tcg_gen_exit_tb(ctx->base.tb, 0); - } - /* FALLTHRU */ + gen_goto_tb(ctx, 0, 0); + break; case DISAS_PC_STALE: tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); /* FALLTHRU */ --=20 2.34.1 From nobody Sat May 18 08:51:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714002408; cv=none; d=zohomail.com; s=zohoarc; b=BKD/8W18EGzb9mw6+Dec+CET8qXDC954x7OWSE/jIEWwVYsmSoU8uWBav68mAZwZAI+VOvu/fgdBSZ5bqVNW+OEWPUlweT8i+Qcl1alpuqfQpY9h8P2eK19R7eOroNtGR9SlYvUE7HJGnLTEOdwGQwSF3AgpGFRVzVc9Ow/yj8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714002408; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=JlF9yvG1tLc13jMw+Ez3fV/BsqlR5r0EuFKx522bnZo=; b=CTk7PMhtBEm455sii6JIFrYBjXTlk3ZFpaEi9AHKd7NNtTFYH2DrLTpytu8VZR8XXmHZF2R8vLh7tFiXPL7pSlFIetUrWuoaVHgC+ME8cb6BIiCItXT6QExKSPp4TMxr9sV9GDtdsl/6erA6QOPVjmZdIoh9XAWS5F2fxmXuvS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714002408001526.854649336585; Wed, 24 Apr 2024 16:46:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzmJA-000182-NY; Wed, 24 Apr 2024 19:45:48 -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 1rzmIe-00013I-HR for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:45:22 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzmIS-0002AS-R3 for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:45:09 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e411e339b8so3245605ad.3 for ; Wed, 24 Apr 2024 16:45:03 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001e49428f327sm12531642plf.176.2024.04.24.16.44.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714002303; x=1714607103; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JlF9yvG1tLc13jMw+Ez3fV/BsqlR5r0EuFKx522bnZo=; b=Xf4Jx93BGQgaFgNC/2KdpdvncCH8K2VWWRnLThuKSUsp8jrijtqb5abO6g0FWdUecn yn1PG5HdMI+9IGZxOrz3883zXh7tUN0rlfAYzyZxxWWXRWbgeBQ6NIEOeOK6yWzU8cWs E4d2l3g7pC5DkTMXTRbmntayJ+StbHhE9oq1/RrvzuQmNAg5FA5l4vohbNIZ5MyilgDM SUipHFXPI0GfAyJ67D+qYtfDhMLEehQt5xODcPQtAD52/nzP69eA1yuFsY1V3ooY+kda qiz8yoFfbU/nxdbrM3/3Hw8xLQ501Ql94ZHynI5upp7NwmhcQqv9kcenPcevNxabxxEp q+Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714002303; x=1714607103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JlF9yvG1tLc13jMw+Ez3fV/BsqlR5r0EuFKx522bnZo=; b=AL3tsF2NhyTQYuP5EOe4W+DSkNVR7uPkx+L0ITLR+SapMDD/CoZ8RA84iz+r1AjtA8 UBxt1LeKnuWKX2Xe3KtbAY++eKken/hVkC75SdhoqlX1CSOeZxDkCR55haFd4KMdGErg tmD1TKf/J2JxddizPA+BbCKS33yrlBEEQ8FO4X09rZYLPZRQpz6wF4Tl0XKgj2Jzdkpc o1WF7RCkublggV8ISbtOYWOs7K/oXE+QwibxceKUhK0u6251SVrS+8yKcA+zvVvGAWln wzNY4DHrWrrU4pNzrgz9mOg9k40Ss1ZXyVpvnYo/2nzxfPVRtxaeCyyypkz9zg6wOjlJ DAhQ== X-Gm-Message-State: AOJu0YzAvPoEr8wOALjPyEj/gBfYih9ggxe6YqubrtaIkbDU7PyYdENh 02IZgOm9ibS+temZjrvyd3kdldS0poVntn9zYpcZ8FNEEdkTjZOnZ5sNunhFicFp6IeC6b8DBky d X-Google-Smtp-Source: AGHT+IFCvRXg8dHDLiD1M+vNfxcUv15yZDg6K9YTTm84+xR8pv7OsZzhnrvTmZcJb4TyhlXDxowtGw== X-Received: by 2002:a17:903:22ca:b0:1e7:b6f4:2d75 with SMTP id y10-20020a17090322ca00b001e7b6f42d75mr5699216plg.6.1714002302734; Wed, 24 Apr 2024 16:45:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/5] target/alpha: Split out gen_pc_disp Date: Wed, 24 Apr 2024 16:44:35 -0700 Message-Id: <20240424234436.995410-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424234436.995410-1-richard.henderson@linaro.org> References: <20240424234436.995410-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714002409541100003 Content-Type: text/plain; charset="utf-8" Prepare for pcrel by not modifying cpu_pc before use, in the case of JSR. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/translate.c | 41 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index c1a55e5153..86402d96d5 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -252,6 +252,11 @@ static void st_flag_byte(TCGv val, unsigned shift) tcg_gen_st8_i64(val, tcg_env, get_flag_ofs(shift)); } =20 +static void gen_pc_disp(DisasContext *ctx, TCGv dest, int32_t disp) +{ + tcg_gen_movi_i64(dest, ctx->base.pc_next + disp); +} + static void gen_excp_1(int exception, int error_code) { TCGv_i32 tmp1, tmp2; @@ -263,7 +268,7 @@ static void gen_excp_1(int exception, int error_code) =20 static DisasJumpType gen_excp(DisasContext *ctx, int exception, int error_= code) { - tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); + gen_pc_disp(ctx, cpu_pc, 0); gen_excp_1(exception, error_code); return DISAS_NORETURN; } @@ -427,14 +432,12 @@ static DisasJumpType gen_store_conditional(DisasConte= xt *ctx, int ra, int rb, =20 static void gen_goto_tb(DisasContext *ctx, int idx, int32_t disp) { - uint64_t dest =3D ctx->base.pc_next + disp; - - if (translator_use_goto_tb(&ctx->base, dest)) { + if (translator_use_goto_tb(&ctx->base, ctx->base.pc_next + disp)) { tcg_gen_goto_tb(idx); - tcg_gen_movi_i64(cpu_pc, dest); + gen_pc_disp(ctx, cpu_pc, disp); tcg_gen_exit_tb(ctx->base.tb, idx); } else { - tcg_gen_movi_i64(cpu_pc, dest); + gen_pc_disp(ctx, cpu_pc, disp); tcg_gen_lookup_and_goto_ptr(); } } @@ -442,7 +445,7 @@ static void gen_goto_tb(DisasContext *ctx, int idx, int= 32_t disp) static DisasJumpType gen_bdirect(DisasContext *ctx, int ra, int32_t disp) { if (ra !=3D 31) { - tcg_gen_movi_i64(ctx->ir[ra], ctx->base.pc_next); + gen_pc_disp(ctx, ctx->ir[ra], 0); } =20 /* Notice branch-to-next; used to initialize RA with the PC. */ @@ -1091,7 +1094,7 @@ static DisasJumpType gen_call_pal(DisasContext *ctx, = int palcode) } =20 /* Allow interrupts to be recognized right away. */ - tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); + gen_pc_disp(ctx, cpu_pc, 0); return DISAS_PC_UPDATED_NOCHAIN; =20 case 0x36: @@ -1138,19 +1141,17 @@ static DisasJumpType gen_call_pal(DisasContext *ctx= , int palcode) #else { TCGv tmp =3D tcg_temp_new(); - uint64_t exc_addr =3D ctx->base.pc_next; - uint64_t entry =3D ctx->palbr; + uint64_t entry; =20 + gen_pc_disp(ctx, tmp, 0); if (ctx->tbflags & ENV_FLAG_PAL_MODE) { - exc_addr |=3D 1; + tcg_gen_ori_i64(tmp, tmp, 1); } else { - tcg_gen_movi_i64(tmp, 1); - st_flag_byte(tmp, ENV_FLAG_PAL_SHIFT); + st_flag_byte(tcg_constant_i64(1), ENV_FLAG_PAL_SHIFT); } - - tcg_gen_movi_i64(tmp, exc_addr); tcg_gen_st_i64(tmp, tcg_env, offsetof(CPUAlphaState, exc_addr)); =20 + entry =3D ctx->palbr; entry +=3D (palcode & 0x80 ? 0x2000 + (palcode - 0x80) * 64 : 0x1000 + palcode * 64); @@ -2344,9 +2345,13 @@ static DisasJumpType translate_one(DisasContext *ctx= , uint32_t insn) /* JMP, JSR, RET, JSR_COROUTINE. These only differ by the branch prediction stack action, which of course we don't implement. */ vb =3D load_gpr(ctx, rb); - tcg_gen_andi_i64(cpu_pc, vb, ~3); if (ra !=3D 31) { - tcg_gen_movi_i64(ctx->ir[ra], ctx->base.pc_next); + tmp =3D tcg_temp_new(); + tcg_gen_andi_i64(tmp, vb, ~3); + gen_pc_disp(ctx, ctx->ir[ra], 0); + tcg_gen_mov_i64(cpu_pc, tmp); + } else { + tcg_gen_andi_i64(cpu_pc, vb, ~3); } ret =3D DISAS_PC_UPDATED; break; @@ -2908,7 +2913,7 @@ static void alpha_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cpu) gen_goto_tb(ctx, 0, 0); break; case DISAS_PC_STALE: - tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); + gen_pc_disp(ctx, cpu_pc, 0); /* FALLTHRU */ case DISAS_PC_UPDATED: tcg_gen_lookup_and_goto_ptr(); --=20 2.34.1 From nobody Sat May 18 08:51:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714002386; cv=none; d=zohomail.com; s=zohoarc; b=FdfMPchX4m4jf1Vb4wxTEN+8jvk2Mjr/7TkhMrut4RbzVhQB1J1KoRizwKZftwiZsbCcvN3/Pz3JVTHihWGDZiiF8FiE7rDfoBRzCf+OVqxROQhSTdaalFKu4/xuxtKkpNp3AZC1+pVjtQTZLSy5TWlNdimptzv4XNk3Mzpg0i8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714002386; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=+fYxFDEu9QUatBFkfchgNydxoYm4Cqsftsf9cDR/W3Q=; b=RMDG3qIeZHMF5X4v5aA6jeMY+pYJ+G/s1JPLxdm6bM3KyhnPiYBQnQiUVZcOZF6Pj2amq2bJY7JAOVco22zqV/EezAYjLMPnY/7xS35c3YD9NKB/wDYAbik8gahCOUW6YFdatW/Jiey824ZnFG6j4FEnH1LarPbznJY3oOUqtk8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714002386568759.8923141927189; Wed, 24 Apr 2024 16:46:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzmJF-0001Cx-GU; Wed, 24 Apr 2024 19:45:53 -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 1rzmIi-00013b-Or for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:45:30 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzmIc-0002Lm-Tx for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:45:19 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-60275a82611so333889a12.1 for ; Wed, 24 Apr 2024 16:45:10 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001e49428f327sm12531642plf.176.2024.04.24.16.45.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714002309; x=1714607109; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+fYxFDEu9QUatBFkfchgNydxoYm4Cqsftsf9cDR/W3Q=; b=FjsID58iMBMDQywYxdXLmc/KZGgJRNP8mgU08ELBM7d0nTxoraNnV8d4MApqvqCiJ4 wO+wMacBUxnK4j3i+0qeqSScT0KxjZMFhl6zT2mgKR6uY+5vUF5mjr0klRIt0E+3BSbu sy55kp6+SuAg3N5/vkOxl4BqAkPUoS6WLLd+fzpuapcU3ZkxIGLn6ORpfITazHNrTAB+ in81g5IiUOh4h7aLl+B1u1pWjAN1EOmD7MSSw8H9moLR1gV3PPtY2SK7EZQhVtBx/bqQ k1SKjd4uic+0b9S0Fxug+V29C71GixcQdju20CHiE8kKuWUSxvLvtQYITYF6yVUVuJXk H4dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714002309; x=1714607109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+fYxFDEu9QUatBFkfchgNydxoYm4Cqsftsf9cDR/W3Q=; b=agb+7a/uzTG8SRYIk8c3ziHJuvipixcwAWjat2YwA31kYyCNmPF7UX7/mWJ85l6scJ j6gwv0SbqsdrEQu2bET2muEH7clWQPKJJ3M/q4fgva4QsZbTwAtKMcbWXitFBdhu06VL advHdZrzCaT8hqaz8WPlTNpKpM8jZu1PYT8IcXweDHQSUpbp98z25NsP+fQdiPk9fKvO oKTaJ+RsUUKk8EyNoejGuEHxYWHi/rug+m6KFFf6XSW8ze+bFWQfKaWVrS0q2L0+j+AS gH9A4vPz3BZMmq3bLBSXVkLWjuotLF3gU0rAKdaRLQHK+jbJYlmbenhZDSlWoGZVwTcV iogA== X-Gm-Message-State: AOJu0YxImD1puW55LQ+wXQUXLnB99+iXwAUk3cMXXNmPuoBE0McEZ0cq AJ/lSevC/fUeMTSm6xsyik3b2+2+V5MFGEwdQGQx3vcUavLgQHF1vBEaXZPTZGpnQP9mYXeOGp2 4 X-Google-Smtp-Source: AGHT+IGlLpX4y0na5L9tS6NUAMaruOj166H7Vdy5qsdhsz4SyZ7GBm8vIsNjQbeULUrqsGqyqRmtrA== X-Received: by 2002:a05:6a20:9193:b0:1a7:7cae:24dc with SMTP id v19-20020a056a20919300b001a77cae24dcmr4858663pzd.5.1714002309294; Wed, 24 Apr 2024 16:45:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/5] target/alpha: Implement CF_PCREL Date: Wed, 24 Apr 2024 16:44:36 -0700 Message-Id: <20240424234436.995410-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424234436.995410-1-richard.henderson@linaro.org> References: <20240424234436.995410-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714002387614100004 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/alpha/cpu.c | 23 ++++++++++++++++++++++- target/alpha/translate.c | 29 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index f98d022671..0e2fbcb397 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -38,12 +38,27 @@ static vaddr alpha_cpu_get_pc(CPUState *cs) return env->pc; } =20 +static void alpha_cpu_synchronize_from_tb(CPUState *cs, + const TranslationBlock *tb) +{ + /* The program counter is always up to date with CF_PCREL. */ + if (!(tb_cflags(tb) & CF_PCREL)) { + CPUAlphaState *env =3D cpu_env(cs); + env->pc =3D tb->pc; + } +} + static void alpha_restore_state_to_opc(CPUState *cs, const TranslationBlock *tb, const uint64_t *data) { CPUAlphaState *env =3D cpu_env(cs); - env->pc =3D data[0]; + + if (tb_cflags(tb) & CF_PCREL) { + env->pc =3D (env->pc & TARGET_PAGE_MASK) | data[0]; + } else { + env->pc =3D data[0]; + } } =20 static bool alpha_cpu_has_work(CPUState *cs) @@ -78,6 +93,11 @@ static void alpha_cpu_realizefn(DeviceState *dev, Error = **errp) AlphaCPUClass *acc =3D ALPHA_CPU_GET_CLASS(dev); Error *local_err =3D NULL; =20 +#ifndef CONFIG_USER_ONLY + /* Use pc-relative instructions in system-mode */ + cs->tcg_cflags |=3D CF_PCREL; +#endif + cpu_exec_realizefn(cs, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); @@ -190,6 +210,7 @@ static const struct SysemuCPUOps alpha_sysemu_ops =3D { =20 static const TCGCPUOps alpha_tcg_ops =3D { .initialize =3D alpha_translate_init, + .synchronize_from_tb =3D alpha_cpu_synchronize_from_tb, .restore_state_to_opc =3D alpha_restore_state_to_opc, =20 #ifdef CONFIG_USER_ONLY diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 86402d96d5..db847e7a23 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -54,6 +54,9 @@ struct DisasContext { uint32_t tbflags; int mem_idx; =20 + /* True if generating pc-relative code. */ + bool pcrel; + /* implver and amask values for this CPU. */ int implver; int amask; @@ -254,7 +257,12 @@ static void st_flag_byte(TCGv val, unsigned shift) =20 static void gen_pc_disp(DisasContext *ctx, TCGv dest, int32_t disp) { - tcg_gen_movi_i64(dest, ctx->base.pc_next + disp); + uint64_t addr =3D ctx->base.pc_next + disp; + if (ctx->pcrel) { + tcg_gen_addi_i64(dest, cpu_pc, addr - ctx->base.pc_first); + } else { + tcg_gen_movi_i64(dest, addr); + } } =20 static void gen_excp_1(int exception, int error_code) @@ -433,8 +441,14 @@ static DisasJumpType gen_store_conditional(DisasContex= t *ctx, int ra, int rb, static void gen_goto_tb(DisasContext *ctx, int idx, int32_t disp) { if (translator_use_goto_tb(&ctx->base, ctx->base.pc_next + disp)) { - tcg_gen_goto_tb(idx); - gen_pc_disp(ctx, cpu_pc, disp); + /* With PCREL, PC must always be up-to-date. */ + if (ctx->pcrel) { + gen_pc_disp(ctx, cpu_pc, disp); + tcg_gen_goto_tb(idx); + } else { + tcg_gen_goto_tb(idx); + gen_pc_disp(ctx, cpu_pc, disp); + } tcg_gen_exit_tb(ctx->base.tb, idx); } else { gen_pc_disp(ctx, cpu_pc, disp); @@ -2852,6 +2866,7 @@ static void alpha_tr_init_disas_context(DisasContextB= ase *dcbase, CPUState *cpu) =20 ctx->tbflags =3D ctx->base.tb->flags; ctx->mem_idx =3D alpha_env_mmu_index(env); + ctx->pcrel =3D ctx->base.tb->cflags & CF_PCREL; ctx->implver =3D env->implver; ctx->amask =3D env->amask; =20 @@ -2887,7 +2902,13 @@ static void alpha_tr_tb_start(DisasContextBase *db, = CPUState *cpu) =20 static void alpha_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) { - tcg_gen_insn_start(dcbase->pc_next); + DisasContext *ctx =3D container_of(dcbase, DisasContext, base); + + if (ctx->pcrel) { + tcg_gen_insn_start(dcbase->pc_next & ~TARGET_PAGE_MASK); + } else { + tcg_gen_insn_start(dcbase->pc_next); + } } =20 static void alpha_tr_translate_insn(DisasContextBase *dcbase, CPUState *cp= u) --=20 2.34.1