From patchwork Tue Jun 4 20:33:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 165836 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp6344599ili; Tue, 4 Jun 2019 13:52:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzm/fPWsFu2SBcNVTEvgDC4Yi6QSt+Z/rQJVy6G74GrOM+okdeGpqCImFxXWoTh/yTE9Nno X-Received: by 2002:a37:6582:: with SMTP id z124mr27965190qkb.37.1559681570638; Tue, 04 Jun 2019 13:52:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559681570; cv=none; d=google.com; s=arc-20160816; b=UA1EPl82ZMJkJzPrvm5Y8xjwHaucDFyiQLECsaCmK8GkXA3u6gyJwHeAnkjqj86v5U O7byebhLgq93zMdsU3bX9wdnZ6i4A4m8kl9B7BsEv6GWIBPzCew+N6qcdUuaq+5yUMgx Vt+LEyO9OTuihCIPILdbEbj69yjH1altTcRz+tUu8QmNyF5YH2/4vsZEcIvcJMKTlK3N 9Csf0Yf81AEhI0fdeN8MeW9RFI+rz9tk1/MM1p4qqatxwRGqFz7X0c5ZHBXx3ophoVB2 K36wgbDQXRpEtfFmnACtCVRDwDfjv5MOkZQafwztYFEUdX8aKHI1gao7PJvFQTQOjPn1 2Qsg== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1kOvtkiHCUjgMw+1Z+kL1S4IV3z9pyM77bVL+IO/D5Y=; b=kSibX3byBOm8+yFZeFW8qH5PRih/z1rPjj+Tx03ECgRKuPdtHoYW4Ey0nUXbdzpCin PHQZTsmuLVXFbJdQs+GJIN6+6BFp5psyYpHjDOnnrabUQprlg+2C4iZRfpF3j48HZHz+ eSk1/RhUj2TBi5LXAOGGE8xC+h7wDQG3LBw39D9aRMhXiw6pbdpnYfwG8AmH4pkJY8I3 dfCyp3IPAfWkBmn7RK7p3WhUo9WI1ETw4LhnAiWckNBfrRBx3VJf4FLYRCxWPqZJsheH g3L1kL3TnQ8EMZF1n29FzVcV5eUclm8jSscZ31whBw2wugb//eqAytQ8qj+Hj/VbkQri cRXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bdTDWCxt; 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=fail (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 k29si1638511qvh.181.2019.06.04.13.52.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 04 Jun 2019 13:52:50 -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=fail header.i=@linaro.org header.s=google header.b=bdTDWCxt; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:57852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYGQM-000886-57 for patch@linaro.org; Tue, 04 Jun 2019 16:52:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG8W-0001CN-Tg for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYG8V-0004Il-MI for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:24 -0400 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:37815) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYG8V-0004IH-HN for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:23 -0400 Received: by mail-oi1-x243.google.com with SMTP id t76so1580574oih.4 for ; Tue, 04 Jun 2019 13:34:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=1kOvtkiHCUjgMw+1Z+kL1S4IV3z9pyM77bVL+IO/D5Y=; b=bdTDWCxtSqUpS+kyfe3TeH3lAbfUVkcPRvUG2YsYteUy2L4WkzD7KZKUfAs8ioQnpx xDm7KIkLdQR5kdbWJVyorLt10TS+cLgdoNNLJEyuKFOBvCnW2zKQ0prCuTpgT+/6HWla VzXp/T6lX686GWn736949LGtdaWd+dZvg4xukX9c/ul7kcY6kFVAGFU0C0NgcXAA0FXp 9XvzhrfTuk+IRpWhbFV9cN7K7aK55nQv1M/RizzBlHigqmZoYO2Zcu2KtFf1qIWAoh0f hlkNUQRbZlRCE4qcJ3+nopUKa7BDhnXJSynS0Rkkmbi3GRPA8VlpeRxziOIiSXd0LHmY hZ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1kOvtkiHCUjgMw+1Z+kL1S4IV3z9pyM77bVL+IO/D5Y=; b=nNstdii8n/mBv8+k0lHoJZwm4swLbTFNrrsMI0O7NNU7KWnNaxF686O65Wrr+nTild sN3S0Au3j75lN2+IaxvRP4VPCRd0plpYEADqhN+24YHhWTSUnCTphAunUilK42o0wtoI SeWgdIwZFtPZp5v9r+dRclE1vO8053cQXij8bFbkg7iWKoFE/EqRYVgPEoLD1LOsH8WC D5NF8y36XxVW7LFmDp/EVeR59Kbd7mkS3UjbUQbgP8Ic3HES1253r579uwbXha0u5JLL 9+x7nnnAvqqQLj6gmPXdZ3FB9ojcUL2AYp3w3O+eEkmUNccQyynwy5+0X81UQPX1wssG u2Iw== X-Gm-Message-State: APjAAAVV3mDaI5d9j8G4DoaC5LMSaEWCCbxMDm56ekyJN5Jhw/HDCT+e o7NL6uJ2OJVaBFZILoubnB2pDbPsrJJqbw== X-Received: by 2002:aca:f183:: with SMTP id p125mr5626484oih.13.1559680462440; Tue, 04 Jun 2019 13:34:22 -0700 (PDT) Received: from localhost.localdomain (200-56-192-86-cable.cybercable.net.mx. [200.56.192.86]) by smtp.gmail.com with ESMTPSA id h1sm5979901otj.78.2019.06.04.13.34.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 13:34:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2019 15:33:29 -0500 Message-Id: <20190604203351.27778-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190604203351.27778-1-richard.henderson@linaro.org> References: <20190604203351.27778-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::243 Subject: [Qemu-devel] [PATCH v4 17/39] target/microblaze: Use env_cpu, env_archcpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Cleanup in the boilerplate that each target must define. Replace mb_env_get_cpu with env_archcpu. The combination CPU(mb_env_get_cpu) should have used ENV_GET_CPU to begin; use env_cpu now. Move cpu_mmu_index below the include of "exec/cpu-all.h", so that the definition of env_archcpu is available. Reviewed-by: Alistair Francis Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/microblaze/cpu.h | 35 ++++++++++++++------------------ linux-user/microblaze/cpu_loop.c | 2 +- target/microblaze/mmu.c | 5 ++--- target/microblaze/op_helper.c | 2 +- target/microblaze/translate.c | 2 +- 5 files changed, 20 insertions(+), 26 deletions(-) -- 2.17.1 diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 6e68e00e1f..8402cc81f6 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -310,11 +310,6 @@ struct MicroBlazeCPU { CPUMBState env; }; -static inline MicroBlazeCPU *mb_env_get_cpu(CPUMBState *env) -{ - return container_of(env, MicroBlazeCPU, env); -} - #define ENV_OFFSET offsetof(MicroBlazeCPU, env) void mb_cpu_do_interrupt(CPUState *cs); @@ -344,21 +339,6 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo, #define MMU_USER_IDX 2 /* See NB_MMU_MODES further up the file. */ -static inline int cpu_mmu_index (CPUMBState *env, bool ifetch) -{ - MicroBlazeCPU *cpu = mb_env_get_cpu(env); - - /* Are we in nommu mode?. */ - if (!(env->sregs[SR_MSR] & MSR_VM) || !cpu->cfg.use_mmu) { - return MMU_NOMMU_IDX; - } - - if (env->sregs[SR_MSR] & MSR_UM) { - return MMU_USER_IDX; - } - return MMU_KERNEL_IDX; -} - bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); @@ -384,4 +364,19 @@ void mb_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, MemTxResult response, uintptr_t retaddr); #endif +static inline int cpu_mmu_index(CPUMBState *env, bool ifetch) +{ + MicroBlazeCPU *cpu = env_archcpu(env); + + /* Are we in nommu mode?. */ + if (!(env->sregs[SR_MSR] & MSR_VM) || !cpu->cfg.use_mmu) { + return MMU_NOMMU_IDX; + } + + if (env->sregs[SR_MSR] & MSR_UM) { + return MMU_USER_IDX; + } + return MMU_KERNEL_IDX; +} + #endif diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c index 076bdb9a61..a6ea71401d 100644 --- a/linux-user/microblaze/cpu_loop.c +++ b/linux-user/microblaze/cpu_loop.c @@ -23,7 +23,7 @@ void cpu_loop(CPUMBState *env) { - CPUState *cs = CPU(mb_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr, ret; target_siginfo_t info; diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index fcf86b12d5..6763421ba2 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -34,7 +34,7 @@ static unsigned int tlb_decode_size(unsigned int f) static void mmu_flush_idx(CPUMBState *env, unsigned int idx) { - CPUState *cs = CPU(mb_env_get_cpu(env)); + CPUState *cs = env_cpu(env); struct microblaze_mmu *mmu = &env->mmu; unsigned int tlb_size; uint32_t tlb_tag, end, t; @@ -228,7 +228,6 @@ uint32_t mmu_read(CPUMBState *env, bool ext, uint32_t rn) void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v) { - MicroBlazeCPU *cpu = mb_env_get_cpu(env); uint64_t tmp64; unsigned int i; qemu_log_mask(CPU_LOG_MMU, @@ -269,7 +268,7 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v) /* Changes to the zone protection reg flush the QEMU TLB. Fortunately, these are very uncommon. */ if (v != env->mmu.regs[rn]) { - tlb_flush(CPU(cpu)); + tlb_flush(env_cpu(env)); } env->mmu.regs[rn] = v; break; diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index b5dbb90d05..18677ddfca 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -65,7 +65,7 @@ uint32_t helper_get(uint32_t id, uint32_t ctrl) void helper_raise_exception(CPUMBState *env, uint32_t index) { - CPUState *cs = CPU(mb_env_get_cpu(env)); + CPUState *cs = env_cpu(env); cs->exception_index = index; cpu_loop_exit(cs); diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 885fc44b51..9ce65f3bcf 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1604,7 +1604,7 @@ static inline void decode(DisasContext *dc, uint32_t ir) void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) { CPUMBState *env = cs->env_ptr; - MicroBlazeCPU *cpu = mb_env_get_cpu(env); + MicroBlazeCPU *cpu = env_archcpu(env); uint32_t pc_start; struct DisasContext ctx; struct DisasContext *dc = &ctx;