From patchwork Tue Aug 25 20:59:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248298 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6447:0:0:0:0 with SMTP id l7csp7640ejn; Tue, 25 Aug 2020 14:20:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOHV2PZ/jqTlnj6VGnFyWvPyN5KZ0GXHVnr+6q6y/cjjd4M4uAw8ljPsxZby5JQjNz+4uj X-Received: by 2002:a25:cbc3:: with SMTP id b186mr18832215ybg.36.1598390449910; Tue, 25 Aug 2020 14:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598390449; cv=none; d=google.com; s=arc-20160816; b=IRLiTkBXbtsj80Vrfvz/M6EgDrqGNrs2KYebuTJijd0V8Mf0V+mWgmymnAhANgcWeS 742fuCyVi7Ru62JnW9ILu80FqJL6c0JC7qZKMzm1Vb43AL5ETfR5dTJU+yeSfwitwqrQ tL5VnoaxC55Ji/b6wiMYzfu4c/xuv7vbRnUraI38T9Ty4ocfp1tfjAw95NpvlR62sBbs /SMrn92COHf/dS78IWreXLo5UKy84NzpzJ58fGuOrzXvubPQtj0GVtB/yDPFx7fK2k5z +jneTLxcCECweeaeYlPHfpup+VOEWDQLghcta1j5yQKod8ItJdiIkwSV7Xp4UE7SmcC5 xBow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=lr71+uB2rqlQWi1mZS+Omspl/b6K02nPk8zKl55dRRU=; b=K/A4S980URIAkqbsPtpg3MErq/+d4RU3eZa+VcE8xTmXHpz9ORjdnzpTteuPcscAVj NSzA+KldS0XQvBLd+5aCz/O/NtRV8ph4oipNOj1B7WicGu16wYLfyicDU61fK0ICNHEb GL7Rj6i1D/TuZgL17IdR9OoHsEv2n0xADuzPr/2ghpHoM7/9ltGXbyHi6GMYuqlBJZq3 3mU5K7GxQMNVDBjz3Pv0koNXAhdmpzr6yYacFx891HHUwt3hiaLgbl8agnt27MSmXjhP QaA9/aaC/sCZkWOilq9f1BM0e5YF+pXb3Yg/2P/FQXXQ9UvMD81ykHAyXRNjnr3mwKtn PXQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xJwhO4Gk; 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 b3si38473ybr.323.2020.08.25.14.20.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Aug 2020 14:20:49 -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=xJwhO4Gk; 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]:35064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAgN7-0005rx-33 for patch@linaro.org; Tue, 25 Aug 2020 17:20:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAg3t-0008Sx-U7 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:00:57 -0400 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:51218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAg3r-0001ym-W3 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:00:57 -0400 Received: by mail-pj1-x1042.google.com with SMTP id ds1so127720pjb.1 for ; Tue, 25 Aug 2020 14:00:55 -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=lr71+uB2rqlQWi1mZS+Omspl/b6K02nPk8zKl55dRRU=; b=xJwhO4GkFEIATLuB40u5lM7hIblRgfF2xH+g39N9MOv4qzLRNC1VSzJFU5snBvfZPO 8piLzuBeOwlB4uxhCMZBnV67tVpc0NhvPAsyStYU6eBpm2fWm7IaybIsz6iZsCO5IhQD jZo0UHcp2CTmRjLRbTcr+VUX2Zx9303xYJqjbOVW2yFz7bZ2PLZgLscDiBbJx9TrMNk6 Lzw7dp2gXSLBiZJ/JujiqDZHI4IVPwPG7j8gLLbr+7FUzBCR1twaVDziTzuPknw0r7Su YAOrwkFfZqm0KxwlM06TZSdXW9MxPo1ba3HCxNpb7HiKUcvDXhc57Gna+nOLFTDDSyur aSfQ== 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=lr71+uB2rqlQWi1mZS+Omspl/b6K02nPk8zKl55dRRU=; b=RfmdvJ2D+pkM6qBon/e8CNILbWnzcfdxOcyEjAuQqTyslo6AydMJF2NypQvkGYNB4t fpqhH+jm6CSnAD9JahvUZVeqCiX0DmkRpmt6mFUZoEOc60vlTO82dSnDiTRxBjtikhB3 28fnIsd8We9EYk4xPoMqjrGXeZVuucyDmHNISWyG0EIz+LVHwN6npz47fAT9zvyatk14 P7e0/W6HQzUXCh0k3uuGhK4SgiHq+XVjzOsX9+1uqoXS4GVuIaOZh0+TA08HcpuJo0/J Qmeilmi7IGtQdrA031YC4ts/O84ikuBVrloT3iypRm3sjodZ78+7CGhPk0zG3+xYPY+A 8nsQ== X-Gm-Message-State: AOAM530sY8tJ114D2fVgpUt/y1HiEh8xPr9zjysdg6hImdlSJ23sXNi5 pKwPOYRxRJscZos7VwmB7EYsk2zoFidfUg== X-Received: by 2002:a17:90a:d510:: with SMTP id t16mr3293775pju.210.1598389254287; Tue, 25 Aug 2020 14:00:54 -0700 (PDT) Received: from localhost.localdomain (h216-228-167-147.bendor.dedicated.static.tds.net. [216.228.167.147]) by smtp.gmail.com with ESMTPSA id k4sm16074pgr.87.2020.08.25.14.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 14:00:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 50/77] target/microblaze: Replace MSR_EE_FLAG with MSR_EE Date: Tue, 25 Aug 2020 13:59:23 -0700 Message-Id: <20200825205950.730499-51-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825205950.730499-1-richard.henderson@linaro.org> References: <20200825205950.730499-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1042; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1042.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@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There's no reason to define MSR_EE_FLAG; we can just use the original MSR_EE define. Document the other flags copied into tb_flags with iflag to reserve those bits. Signed-off-by: Richard Henderson --- target/microblaze/cpu.h | 4 +++- target/microblaze/translate.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 013858b8e0..594501e4e7 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -254,7 +254,9 @@ struct CPUMBState { /* Internal flags. */ #define IMM_FLAG 4 -#define MSR_EE_FLAG (1 << 8) +/* MSR_EE (1 << 8) */ +/* MSR_UM (1 << 11) */ +/* MSR_VM (1 << 13) */ #define DRTI_FLAG (1 << 16) #define DRTE_FLAG (1 << 17) #define DRTB_FLAG (1 << 18) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 7d1ada7aad..cb490488a6 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -162,7 +162,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) */ static bool trap_illegal(DisasContext *dc, bool cond) { - if (cond && (dc->tb_flags & MSR_EE_FLAG) + if (cond && (dc->tb_flags & MSR_EE) && dc->cpu->cfg.illegal_opcode_exception) { gen_raise_hw_excp(dc, ESR_EC_ILLEGAL_OP); } @@ -178,7 +178,7 @@ static bool trap_userspace(DisasContext *dc, bool cond) int mem_index = cpu_mmu_index(&dc->cpu->env, false); bool cond_user = cond && mem_index == MMU_USER_IDX; - if (cond_user && (dc->tb_flags & MSR_EE_FLAG)) { + if (cond_user && (dc->tb_flags & MSR_EE)) { gen_raise_hw_excp(dc, ESR_EC_PRIVINSN); } return cond_user;