From nobody Sun Nov 16 07:41:08 2025 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599064808; cv=none; d=zohomail.com; s=zohoarc; b=ZBXdOrwM1Lk/k+am0qiJeAu7Heq7+x2thNT25TSh2dIId5vlykxWqMWUZV3MDTX/vRX8Nrc5MNXPBjUGc6HPrXa/xodXCsUpJDREyuKIyMLPmDOpbc53yfL4b5zu1FL67VoZiFSvWY6PHL/tedqjNUyWlK5wlwVCSfV+kbd8a18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599064808; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eLcSoqsf7NIliRe9V1n6YrDvFXnEu6vUNh8IjxNercQ=; b=KrHUgcO7yCEPqmI3zOiYQNf+yRXv8ca5JEKcZ3E1DM31x6GCIYB+eU/LS5abRz9GkWeu75ymieFIeI2QyT2duW8EAnN8l+DJQarFNSm7gvAiSIuFn/sm2rrMT8oLhDnHudLvTZsYfT80+ZotUF72tNge5ICeSWOdaD1+mkYWKwM= 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+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15990648084839.793848386175796; Wed, 2 Sep 2020 09:40:08 -0700 (PDT) Received: from localhost ([::1]:41364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVnr-0006dw-0B for importer@patchew.org; Wed, 02 Sep 2020 12:40:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDVk2-0000Br-Nf for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:36:10 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:45118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDVjy-00056a-JI for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:36:10 -0400 Received: by mail-pg1-x544.google.com with SMTP id 67so2796432pgd.12 for ; Wed, 02 Sep 2020 09:36:06 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id b6sm4955441pjz.33.2020.09.02.09.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 09:36:04 -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=eLcSoqsf7NIliRe9V1n6YrDvFXnEu6vUNh8IjxNercQ=; b=G4QDFMg4bwPi1sOi+6Zx5Rbq4sbOIntw9R3imeJAxdKfH9jeCUnesYCzf878O1u//M CNK2zwA5wQCCxU7cCNglvWxi3L4j73ujfuZIt1WtWqYc1dcBKCvIKcQ7Y/oxBh9ktdTZ 1U7cEQUTwD2MYbDnqK9Xv8v/kFQ1/qxN9jtZh0F4Y3ah+F36OY76hQeXUgYWHxDqJexT IpplV1CWYvxqWENYHzp/moIxjcWiNtzzBUa8l9Y9WKBeQkfbIW/ODAmU18Hc2PLC/IBB +oJU7Ntr0NNTYY2s+k9tkHVyCBJyuCqhyc25uPYObuLlkxM+jSrC6HNLQ5BObZ7X0SfF WfiQ== 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=eLcSoqsf7NIliRe9V1n6YrDvFXnEu6vUNh8IjxNercQ=; b=MMkcuDdCVby/8mww7RNByrTBTy8yyj2fvPlxyn/aa2cR0EQVy4mWLgfyz0Rn4cVhg8 Rk4z5AdNfkG7CIfnwBVocnTnQLWWy448YVz0vXuCfP7VL77DmP1HkvjQjw9qyK8xQgmH +8mhQN9LWmbIL/i0NC3W2oUfYxV3KRVIu39DB9SjQWQBL7y2KSeRYpQtJz0jV24zdQBi DXk/Ifl6Q6lDwSbbWLTXOa8/ddcFy30Jylo93HVSc7GB+wNZ7TJ2wrYosGAYVNFdQpdA 12ZADfC2EJwAg/fue0mnXFkQue5a+9rqu1jNYzmCvMDu0ljjzLvsE4N5GVgGqyOTiDN/ wxVQ== X-Gm-Message-State: AOAM530MUaDG7kRGbuJ5Ej+kh/IP3wk/jTCt3fQxEGubNYY1gROeISBL JKS60iVJvNoIMIrYFWSDWzc4zHEY3yBLww== X-Google-Smtp-Source: ABdhPJz2wjAKnLT5NEtAmAVozVkNU1H75JT0AGTtJNQyTMNZMUBQ3yjn1ZFJYAEDvvbyp1UV0bgpzg== X-Received: by 2002:a63:1a51:: with SMTP id a17mr2460068pgm.309.1599064564795; Wed, 02 Sep 2020 09:36:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/7] target/microblaze: Replace cpustate_changed with DISAS_EXIT_NEXT Date: Wed, 2 Sep 2020 09:35:55 -0700 Message-Id: <20200902163559.1077728-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200902163559.1077728-1-richard.henderson@linaro.org> References: <20200902163559.1077728-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::544; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: edgar.iglesias@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Rather than look for the combination of DISAS_NEXT with a separate variable, go ahead and set is_jmp to the desired state. Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/microblaze/translate.c | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 0733728794..9c52448c06 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -70,7 +70,6 @@ typedef struct DisasContext { =20 /* Decoder. */ uint32_t ext_imm; - unsigned int cpustate_changed; unsigned int tb_flags; unsigned int tb_flags_to_set; int mem_index; @@ -1255,7 +1254,7 @@ static bool trans_mbar(DisasContext *dc, arg_mbar *ar= g) * * Therefore, choose to end the TB always. */ - dc->cpustate_changed =3D 1; + dc->base.is_jmp =3D DISAS_EXIT_NEXT; return true; } =20 @@ -1307,19 +1306,6 @@ static void msr_read(DisasContext *dc, TCGv_i32 d) tcg_temp_free_i32(t); } =20 -#ifndef CONFIG_USER_ONLY -static void msr_write(DisasContext *dc, TCGv_i32 v) -{ - dc->cpustate_changed =3D 1; - - /* Install MSR_C. */ - tcg_gen_extract_i32(cpu_msr_c, v, 2, 1); - - /* Clear MSR_C and MSR_CC; MSR_PVR is not writable, and is always clea= r. */ - tcg_gen_andi_i32(cpu_msr, v, ~(MSR_C | MSR_CC | MSR_PVR)); -} -#endif - static bool do_msrclrset(DisasContext *dc, arg_type_msr *arg, bool set) { uint32_t imm =3D arg->imm; @@ -1352,7 +1338,7 @@ static bool do_msrclrset(DisasContext *dc, arg_type_m= sr *arg, bool set) } else { tcg_gen_andi_i32(cpu_msr, cpu_msr, ~imm); } - dc->cpustate_changed =3D 1; + dc->base.is_jmp =3D DISAS_EXIT_NEXT; } return true; } @@ -1385,7 +1371,13 @@ static bool trans_mts(DisasContext *dc, arg_mts *arg) TCGv_i32 src =3D reg_for_read(dc, arg->ra); switch (arg->rs) { case SR_MSR: - msr_write(dc, src); + /* Install MSR_C. */ + tcg_gen_extract_i32(cpu_msr_c, src, 2, 1); + /* + * Clear MSR_C and MSR_CC; + * MSR_PVR is not writable, and is always clear. + */ + tcg_gen_andi_i32(cpu_msr, src, ~(MSR_C | MSR_CC | MSR_PVR)); break; case SR_FSR: tcg_gen_st_i32(src, cpu_env, offsetof(CPUMBState, fsr)); @@ -1417,7 +1409,7 @@ static bool trans_mts(DisasContext *dc, arg_mts *arg) qemu_log_mask(LOG_GUEST_ERROR, "Invalid mts reg 0x%x\n", arg->rs); return true; } - dc->cpustate_changed =3D 1; + dc->base.is_jmp =3D DISAS_EXIT_NEXT; return true; #endif } @@ -1629,7 +1621,6 @@ static void mb_tr_init_disas_context(DisasContextBase= *dcb, CPUState *cs) =20 dc->cpu =3D cpu; dc->tb_flags =3D dc->base.tb->flags; - dc->cpustate_changed =3D 0; dc->ext_imm =3D dc->base.tb->cs_base; dc->r0 =3D NULL; dc->r0_set =3D false; @@ -1714,11 +1705,6 @@ static void mb_tr_translate_insn(DisasContextBase *d= cb, CPUState *cs) } dc->base.is_jmp =3D DISAS_JUMP; } - - /* Force an exit if the per-tb cpu state has changed. */ - if (dc->base.is_jmp =3D=3D DISAS_NEXT && dc->cpustate_changed) { - dc->base.is_jmp =3D DISAS_EXIT_NEXT; - } } =20 static void mb_tr_tb_stop(DisasContextBase *dcb, CPUState *cs) --=20 2.25.1