From nobody Sun May 5 12:49:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650214448188669.2162489367812; Sun, 17 Apr 2022 09:54:08 -0700 (PDT) Received: from localhost ([::1]:34904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ng8A2-0001Cm-TH for importer@patchew.org; Sun, 17 Apr 2022 12:54:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng87b-0005jQ-9P for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:35 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:43600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng87Z-00047Q-UL for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:35 -0400 Received: by mail-pg1-x52f.google.com with SMTP id u2so14832257pgq.10 for ; Sun, 17 Apr 2022 09:51:33 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id f3-20020a17090aa78300b001ca7dfab2e4sm10395396pjq.25.2022.04.17.09.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 09:51:32 -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=tgjr7uNGifmmfZHmH00wqonWc8uQdHdxbJEQboAm3jQ=; b=nyOpnfoZYQ9JFegwbIWxx3WKGQ28uYlqMJiSCElJ5d4HBBG+auVO+0L1w3JPPcOw2B pbR7DCSvebMk5oocxlezznvd3viTic6yyj0I61eDu966+xYLlNTa4tB5zSJ9vP0eiQjy m5EJdDeXuyU6UfHk4tJ0+Y7larOcPQICydIfUGWKdBeP4aA2mlz4JJwaI2WePMSolZ0R NEGzXJU+C9NQsJjYjo/2iDasyBHqGJUezGO6ZdDB0yDgEC8USrzIbvje/wrUhb9o/Ena /w9PlSK06D9NzQliyPrZ0x3MCocThWm8/8rDK9xHscKpGLIai/uKhCfBF5mAseE9EPd9 1VQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tgjr7uNGifmmfZHmH00wqonWc8uQdHdxbJEQboAm3jQ=; b=JkyM3pp4H/EmFuImPIO2coXWadb2rdd1Yd4ZP0+reJWOskIYRDbDy0FtIvEiVGrXNW Hqd3ajx9wkzt010LW67nXmnQHXlAzCLPY5o3osjB6HczoX2BLpoWiVxRzT8enB/Rv31d Qr4cS/OyFkeAewWdOI22xatsZ7c7x7Q7tZISjEqDBrc2k7uAIL5FqrpB+PlTlQ07I4pE T+SapN8xcdQKHKVcjwCJQcKdy4UEj2pOnkX0RUSFCvPxaZqUg7EeqnAnhBPq6WINNkmG 9MBMhhfN/noDGrBtariw0NATgrFO3UDa/eA9DAQGCAk7VX/RMdiJf19KthJWd96Vmn1M NHyQ== X-Gm-Message-State: AOAM532NvCY2hdxtXIR4xTvHhgTZz+UVWu1wws3TUubV+3fFXg/uea94 hSEqzYQSZORfCXOE2cRHGAHNVrMrhBwMQA== X-Google-Smtp-Source: ABdhPJwqW8Dxpdf2SsKa5inUdWC1PHqEkciJroh4ZRVC4eoDyAZ1nVEXIm71Qh5orNEn1ul2NYRnHw== X-Received: by 2002:a63:714e:0:b0:398:9bdc:e11a with SMTP id b14-20020a63714e000000b003989bdce11amr6720119pgn.572.1650214292549; Sun, 17 Apr 2022 09:51:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/4] target/rx: Put tb_flags into DisasContext Date: Sun, 17 Apr 2022 09:51:27 -0700 Message-Id: <20220417165130.695085-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417165130.695085-1-richard.henderson@linaro.org> References: <20220417165130.695085-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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: , Cc: i@yvt.jp, ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650214449898100001 Content-Type: text/plain; charset="utf-8" Copy tb->flags into ctx->tb_flags; we'll want to modify this value throughout the tb in future. Signed-off-by: Richard Henderson Reviewed-by: Yoshinori Sato --- target/rx/translate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/rx/translate.c b/target/rx/translate.c index 5db8f79a82..785cbd948e 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -32,6 +32,7 @@ typedef struct DisasContext { DisasContextBase base; CPURXState *env; uint32_t pc; + uint32_t tb_flags; } DisasContext; =20 typedef struct DisasCompare { @@ -231,7 +232,7 @@ static inline TCGv rx_load_source(DisasContext *ctx, TC= Gv mem, /* Processor mode check */ static int is_privileged(DisasContext *ctx, int is_exception) { - if (FIELD_EX32(ctx->base.tb->flags, PSW, PM)) { + if (FIELD_EX32(ctx->tb_flags, PSW, PM)) { if (is_exception) { gen_helper_raise_privilege_violation(cpu_env); } @@ -2292,6 +2293,7 @@ static void rx_tr_init_disas_context(DisasContextBase= *dcbase, CPUState *cs) CPURXState *env =3D cs->env_ptr; DisasContext *ctx =3D container_of(dcbase, DisasContext, base); ctx->env =3D env; + ctx->tb_flags =3D ctx->base.tb->flags; } =20 static void rx_tr_tb_start(DisasContextBase *dcbase, CPUState *cs) --=20 2.25.1 From nobody Sun May 5 12:49:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650214583141321.0418133419739; Sun, 17 Apr 2022 09:56:23 -0700 (PDT) Received: from localhost ([::1]:39082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ng8CE-000454-4I for importer@patchew.org; Sun, 17 Apr 2022 12:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng87c-0005k5-Eq for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:36 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:44863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng87a-00047U-MZ for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:36 -0400 Received: by mail-pl1-x631.google.com with SMTP id j8so10660201pll.11 for ; Sun, 17 Apr 2022 09:51:34 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id f3-20020a17090aa78300b001ca7dfab2e4sm10395396pjq.25.2022.04.17.09.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 09:51:33 -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=naR2eFj1gZQAaPBt5KmEgyX1GlThDsKfICGoukXVXDw=; b=AevFL9O3ff2ZVoT+xg9gRaIx4Y6nHbODJW+eHZKIyEIjq4bL84zkaCnbPl/DJ6PqC/ KiC3YgRpH2UIxNmhAi01E8gpbb21WvWYhD81nnVE0CBha6Oqr/w1mzjFfjJP6TUhlbjQ c6KaxMkXlsEDo+U6Ao7HZxGIwxdzDxBJp/8GNqNRlQVDNCnhbYfEE3QNZdkgmMnHw3bz 5+Xr7iAnmxUSiUbG2aP+n1dVFpUrtqqaqCf33VliECOSfsEet4mu8oWnzasd914jkJym Pua1EFhtVqnb8Peuycyf0HeMrzxts7IzqbU94wf43sx9uWZZUeN0FaH9MT9Ux7XzFFtD 3Xnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=naR2eFj1gZQAaPBt5KmEgyX1GlThDsKfICGoukXVXDw=; b=EpIshP0xUR5Qx0mRkrptCzZyZdNzTY+pjoAuMxEk0A/s0KKxvGrzdLqrBEeTO57/4U EYr6Kh9PRYuDRhpGYMifhMFog+9aiWTnx5hSj8/Yrx4oTFmDTQy2lhWn6gzrHVGUVFvP 7+vIkyTA1GrissbV6fIFpR9eJHFBGV+aE12j7xsyJRbJRJ7s7UOYrOsP9JxV98edfvv+ KMR/l3wNg/uy3QfN3IwrY0OHUeTrntl3MnX0FPT0YVm+bq09BmBMBd/rRvl35aum37ky PrAWxVfmruZkpfLXYqtOI0mZcHH+S/4aDr/UDVflIp/eZQN968K7Zmq8+ZgvmqYtGXVC gOcw== X-Gm-Message-State: AOAM531EO/fWRHvIL3HOoyGa5SeKZ61v+dmmLo0PC26E3hq/XWbqnQug PePKjANcjX/rjnBEdDjLAVA/2Z7ulfW6Sw== X-Google-Smtp-Source: ABdhPJw9mcyFOzpc7dDXFIZB4yf9YB1GmC4mDuK20zPLNVLiOWOwfY2bDO2h7JPpfpjPtdGKWB5MIQ== X-Received: by 2002:a17:902:ccd1:b0:154:359:7e17 with SMTP id z17-20020a170902ccd100b0015403597e17mr7718430ple.42.1650214293404; Sun, 17 Apr 2022 09:51:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/4] target/rx: Store PSW.U in tb->flags Date: Sun, 17 Apr 2022 09:51:28 -0700 Message-Id: <20220417165130.695085-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417165130.695085-1-richard.henderson@linaro.org> References: <20220417165130.695085-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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: , Cc: i@yvt.jp, ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650214584686100001 Content-Type: text/plain; charset="utf-8" With this, we don't need movcond to determine which stack pointer is current. Signed-off-by: Richard Henderson Reviewed-by: Yoshinori Sato --- target/rx/cpu.h | 1 + target/rx/translate.c | 42 +++++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/target/rx/cpu.h b/target/rx/cpu.h index b4abd90ccd..5e285401e8 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -148,6 +148,7 @@ static inline void cpu_get_tb_cpu_state(CPURXState *env= , target_ulong *pc, *pc =3D env->pc; *cs_base =3D 0; *flags =3D FIELD_DP32(0, PSW, PM, env->psw_pm); + *flags =3D FIELD_DP32(*flags, PSW, U, env->psw_u); } =20 static inline int cpu_mmu_index(CPURXState *env, bool ifetch) diff --git a/target/rx/translate.c b/target/rx/translate.c index 785cbd948e..586342eae7 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -311,9 +311,8 @@ static void psw_cond(DisasCompare *dc, uint32_t cond) } } =20 -static void move_from_cr(TCGv ret, int cr, uint32_t pc) +static void move_from_cr(DisasContext *ctx, TCGv ret, int cr, uint32_t pc) { - TCGv z =3D tcg_const_i32(0); switch (cr) { case 0: /* PSW */ gen_helper_pack_psw(ret, cpu_env); @@ -322,8 +321,11 @@ static void move_from_cr(TCGv ret, int cr, uint32_t pc) tcg_gen_movi_i32(ret, pc); break; case 2: /* USP */ - tcg_gen_movcond_i32(TCG_COND_NE, ret, - cpu_psw_u, z, cpu_sp, cpu_usp); + if (FIELD_EX32(ctx->tb_flags, PSW, U)) { + tcg_gen_mov_i32(ret, cpu_sp); + } else { + tcg_gen_mov_i32(ret, cpu_usp); + } break; case 3: /* FPSW */ tcg_gen_mov_i32(ret, cpu_fpsw); @@ -335,8 +337,11 @@ static void move_from_cr(TCGv ret, int cr, uint32_t pc) tcg_gen_mov_i32(ret, cpu_bpc); break; case 10: /* ISP */ - tcg_gen_movcond_i32(TCG_COND_EQ, ret, - cpu_psw_u, z, cpu_sp, cpu_isp); + if (FIELD_EX32(ctx->tb_flags, PSW, U)) { + tcg_gen_mov_i32(ret, cpu_isp); + } else { + tcg_gen_mov_i32(ret, cpu_sp); + } break; case 11: /* FINTV */ tcg_gen_mov_i32(ret, cpu_fintv); @@ -350,28 +355,27 @@ static void move_from_cr(TCGv ret, int cr, uint32_t p= c) tcg_gen_movi_i32(ret, 0); break; } - tcg_temp_free(z); } =20 static void move_to_cr(DisasContext *ctx, TCGv val, int cr) { - TCGv z; if (cr >=3D 8 && !is_privileged(ctx, 0)) { /* Some control registers can only be written in privileged mode. = */ qemu_log_mask(LOG_GUEST_ERROR, "disallow control register write %s", rx_crname(cr)); return; } - z =3D tcg_const_i32(0); switch (cr) { case 0: /* PSW */ gen_helper_set_psw(cpu_env, val); break; /* case 1: to PC not supported */ case 2: /* USP */ - tcg_gen_mov_i32(cpu_usp, val); - tcg_gen_movcond_i32(TCG_COND_NE, cpu_sp, - cpu_psw_u, z, cpu_usp, cpu_sp); + if (FIELD_EX32(ctx->tb_flags, PSW, U)) { + tcg_gen_mov_i32(cpu_sp, val); + } else { + tcg_gen_mov_i32(cpu_usp, val); + } break; case 3: /* FPSW */ gen_helper_set_fpsw(cpu_env, val); @@ -383,10 +387,11 @@ static void move_to_cr(DisasContext *ctx, TCGv val, i= nt cr) tcg_gen_mov_i32(cpu_bpc, val); break; case 10: /* ISP */ - tcg_gen_mov_i32(cpu_isp, val); - /* if PSW.U is 0, copy isp to r0 */ - tcg_gen_movcond_i32(TCG_COND_EQ, cpu_sp, - cpu_psw_u, z, cpu_isp, cpu_sp); + if (FIELD_EX32(ctx->tb_flags, PSW, U)) { + tcg_gen_mov_i32(cpu_isp, val); + } else { + tcg_gen_mov_i32(cpu_sp, val); + } break; case 11: /* FINTV */ tcg_gen_mov_i32(cpu_fintv, val); @@ -399,7 +404,6 @@ static void move_to_cr(DisasContext *ctx, TCGv val, int= cr) "Unimplement control register %d", cr); break; } - tcg_temp_free(z); } =20 static void push(TCGv val) @@ -683,7 +687,7 @@ static bool trans_PUSHC(DisasContext *ctx, arg_PUSHC *a) { TCGv val; val =3D tcg_temp_new(); - move_from_cr(val, a->cr, ctx->pc); + move_from_cr(ctx, val, a->cr, ctx->pc); push(val); tcg_temp_free(val); return true; @@ -2221,7 +2225,7 @@ static bool trans_MVTC_r(DisasContext *ctx, arg_MVTC_= r *a) /* mvfc rs, rd */ static bool trans_MVFC(DisasContext *ctx, arg_MVFC *a) { - move_from_cr(cpu_regs[a->rd], a->cr, ctx->pc); + move_from_cr(ctx, cpu_regs[a->rd], a->cr, ctx->pc); return true; } =20 --=20 2.25.1 From nobody Sun May 5 12:49:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650214390996536.320349770886; Sun, 17 Apr 2022 09:53:10 -0700 (PDT) Received: from localhost ([::1]:60644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ng897-0007wf-Kb for importer@patchew.org; Sun, 17 Apr 2022 12:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng87d-0005ly-6c for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:37 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:40526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng87b-00047f-LN for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:36 -0400 Received: by mail-pg1-x531.google.com with SMTP id h5so14830162pgc.7 for ; Sun, 17 Apr 2022 09:51:35 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id f3-20020a17090aa78300b001ca7dfab2e4sm10395396pjq.25.2022.04.17.09.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 09:51:34 -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=y9MtiwfVU2+Ka70tD6sa92Ok0UqszU+BuonBx4zVuJs=; b=Qi4ULHIs11KiG/vhANwNgBS/2v57Wbkkk5AUcepdZKVkpMLwkF5OoaF+XVw6OvFJwL mo7iRH0sAMUizaD6L4i4ieRARkoTnrl5/c3wAaZTYmPE+GrT0jNuzPiGjT18sGZrGlX6 9wGyKz8Vf0Btl4v4pIX7OBQXCtRWhrmkH+3xlZAHeXh5VvOLHQQTDW0UF27wRJ9HJSKw FFmtk6dBuTbawKCcbDXoTNVhNXQMnM3XSdUl9x0kyWxYeLD+fgAPrM81cW4+DbLLK4uK MnblAaenKjV87BMqOfLDi8vm7hueq1o0ifWkL7IY5zf3KGzwm0J6svgkDX5X2cV4L/ON LpqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y9MtiwfVU2+Ka70tD6sa92Ok0UqszU+BuonBx4zVuJs=; b=TiJoSTAr7nhpT8m1gUOZwvGU3yD5Fwvwmul/Y+8UOXK53pthSeNcRSPyWjUsS8dpTm bs+G3kqy7oJyYab4jR4H/492IG/RuVbQ//2QtQrEW8fG7gy/w3morbogxiFBodyLBPNw swoyC4izr7TSyDLEGkkCa7KOZjJ8IRov1elYXhT16mPGHdDuMOobzCopDBL6rwJ7U4vK lEku89vQiKBivjQ5q/HscnG44k1l1zSgHsKbUhcJH7ZG+SSCm07PYlPQrsG5q+uhfLi0 o+OvJzDcWH71WJAhDuvMWtdcdcNnAlj4LEibfR5iDOumb6AREAnHinOMpAqxuSlJ+p5P uYNA== X-Gm-Message-State: AOAM530oPFFSL/YDqKvCVste1hPoXWs8HKE2RRkdPCyhGuZ67FqT0yIl k658oEXjCpxf3ak2/FVyV3a7A7MjVd9Ohg== X-Google-Smtp-Source: ABdhPJxviOryIxk1xyM8kpLW6hdKSLqhy8RgQwMaFZDBOz91AHcpPWYXYUdMW9+Z7RJMPmLJIBRsmw== X-Received: by 2002:a63:4564:0:b0:39d:93f7:7959 with SMTP id u36-20020a634564000000b0039d93f77959mr6828754pgk.492.1650214294391; Sun, 17 Apr 2022 09:51:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/4] target/rx: Move DISAS_UPDATE check for write to PSW Date: Sun, 17 Apr 2022 09:51:29 -0700 Message-Id: <20220417165130.695085-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417165130.695085-1-richard.henderson@linaro.org> References: <20220417165130.695085-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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: , Cc: i@yvt.jp, ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650214391612100001 Content-Type: text/plain; charset="utf-8" Have one check in move_to_cr instead of one in each function that calls move_to_cr. Signed-off-by: Richard Henderson Reviewed-by: Yoshinori Sato --- target/rx/translate.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/target/rx/translate.c b/target/rx/translate.c index 586342eae7..d8b9ef635c 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -368,6 +368,10 @@ static void move_to_cr(DisasContext *ctx, TCGv val, in= t cr) switch (cr) { case 0: /* PSW */ gen_helper_set_psw(cpu_env, val); + if (is_privileged(ctx, 0)) { + /* PSW.{I,U} may be updated here. exit TB. */ + ctx->base.is_jmp =3D DISAS_UPDATE; + } break; /* case 1: to PC not supported */ case 2: /* USP */ @@ -631,10 +635,6 @@ static bool trans_POPC(DisasContext *ctx, arg_POPC *a) val =3D tcg_temp_new(); pop(val); move_to_cr(ctx, val, a->cr); - if (a->cr =3D=3D 0 && is_privileged(ctx, 0)) { - /* PSW.I may be updated here. exit TB. */ - ctx->base.is_jmp =3D DISAS_UPDATE; - } tcg_temp_free(val); return true; } @@ -2205,9 +2205,6 @@ static bool trans_MVTC_i(DisasContext *ctx, arg_MVTC_= i *a) =20 imm =3D tcg_const_i32(a->imm); move_to_cr(ctx, imm, a->cr); - if (a->cr =3D=3D 0 && is_privileged(ctx, 0)) { - ctx->base.is_jmp =3D DISAS_UPDATE; - } tcg_temp_free(imm); return true; } @@ -2216,9 +2213,6 @@ static bool trans_MVTC_i(DisasContext *ctx, arg_MVTC_= i *a) static bool trans_MVTC_r(DisasContext *ctx, arg_MVTC_r *a) { move_to_cr(ctx, cpu_regs[a->rs], a->cr); - if (a->cr =3D=3D 0 && is_privileged(ctx, 0)) { - ctx->base.is_jmp =3D DISAS_UPDATE; - } return true; } =20 --=20 2.25.1 From nobody Sun May 5 12:49:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165021452161599.1713685684606; Sun, 17 Apr 2022 09:55:21 -0700 (PDT) Received: from localhost ([::1]:36668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ng8BE-0002Nz-Ll for importer@patchew.org; Sun, 17 Apr 2022 12:55:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng87d-0005nI-TX for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:37 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:35687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng87c-00047q-HH for qemu-devel@nongnu.org; Sun, 17 Apr 2022 12:51:37 -0400 Received: by mail-pg1-x52c.google.com with SMTP id k62so8769965pgd.2 for ; Sun, 17 Apr 2022 09:51:36 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id f3-20020a17090aa78300b001ca7dfab2e4sm10395396pjq.25.2022.04.17.09.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 09:51:34 -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=S4DT9edElY61TApLAOMYde3rWycIWqIECbzuIdmTEx4=; b=dNjt8l1/DJOBKeNwjnS6wDfjnSdDr1bIsd4qhsCBIwSWYwi+bE37g0OH3DZC+PMTI5 Fp/i2/vATC0blUZ4tPGZD/o+XneO6ejetAfmNNDMoUcNZPTUHCSOQBiTOdawFTcJJG9J yzhJ3zVjllMtxbl2Yzkr3FHg5iokvlvTomBhrq91StfmbzX2bECKmpOaAZrkQT0mzfcn 9FUqivyGooATyq9UnieX4vA76dicrwhLz9MwirLnxSC3lzv7LgvTa+yP8KQgek3+cUSR e6P5g2kaOXEfamF/6BJ7aGdraxFucZlbwVQQWPGxsqYaz3PB4UzJwjjzJyB8QcXTcO2a l0Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S4DT9edElY61TApLAOMYde3rWycIWqIECbzuIdmTEx4=; b=paT7O48TrUjyD83QKhW6RHHClXWrb5eu52Hz0PYkJYObmrHDSBqdKiOHucGpgjqgJh utR+xpol44VBy4QDMQNeFO7b+CZrhdH3JbnlRav83Jnk/mJ9gRgVnGpSKm7dF1Fr+4Ql QNMSKvSBM7j35XJZiYbY/+GMtUWjtD3EsRLLdY3FXXMQh/6cM7NOLYlYldk502GF3mN7 z5L0nCQY6j/32/8A++le1WKVAqJwZJcPzDjix/5Q90r+NXv/etitjaSdW0m6JpwvSksO b/6X8AxfZBqdi371x1FSkoO2N/Q9aU9XS4tIK/ji6hngCBR1FuJx5CAG558x2QgHC4lS /+iw== X-Gm-Message-State: AOAM5301XiA79wxS6Yjqx7vmw9Z2tSLIYg4MPdRQVaj9qqJPBOQ6lxId AE2BuB8xKGorqkKjRasOus1mu26EthLHJA== X-Google-Smtp-Source: ABdhPJxI1yZ7VJJ9Ny+yw56MzRpJnVoIOoxVvWX6/m3PZeubnr5uxEtDqneONexEKuG/2sGSGeD1AQ== X-Received: by 2002:a63:5163:0:b0:3a9:4e90:6d3d with SMTP id r35-20020a635163000000b003a94e906d3dmr3218013pgl.48.1650214295270; Sun, 17 Apr 2022 09:51:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/4] target/rx: Swap stack pointers on clrpsw/setpsw instruction Date: Sun, 17 Apr 2022 09:51:30 -0700 Message-Id: <20220417165130.695085-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417165130.695085-1-richard.henderson@linaro.org> References: <20220417165130.695085-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52c.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: , Cc: i@yvt.jp, ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650214522238100001 Content-Type: text/plain; charset="utf-8" We properly perform this swap in helper_set_psw for MVTC, but we missed doing so for the CLRPSW/SETPSW of the U bit. Reported-by: Tomoaki Kawada Signed-off-by: Richard Henderson Reviewed-by: Yoshinori Sato --- target/rx/translate.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/rx/translate.c b/target/rx/translate.c index d8b9ef635c..b34f238790 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -2165,7 +2165,12 @@ static inline void clrsetpsw(DisasContext *ctx, int = cb, int val) ctx->base.is_jmp =3D DISAS_UPDATE; break; case PSW_U: - tcg_gen_movi_i32(cpu_psw_u, val); + if (FIELD_EX32(ctx->tb_flags, PSW, U) !=3D val) { + ctx->tb_flags =3D FIELD_DP32(ctx->tb_flags, PSW, U, val); + tcg_gen_movi_i32(cpu_psw_u, val); + tcg_gen_mov_i32(val ? cpu_isp : cpu_usp, cpu_sp); + tcg_gen_mov_i32(cpu_sp, val ? cpu_usp : cpu_isp); + } break; default: qemu_log_mask(LOG_GUEST_ERROR, "Invalid distination %d", cb); --=20 2.25.1