From patchwork Thu Mar 28 23:03:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161361 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1340454jan; Thu, 28 Mar 2019 16:42:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwp3HMMR8rb1Lrjo/Siaem0jIk/lUmghcqmn1zImN1c2LFqnQGX841MQMlFOK2JxyEmgHRk X-Received: by 2002:a6b:6f09:: with SMTP id k9mr10260799ioc.163.1553816530463; Thu, 28 Mar 2019 16:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553816530; cv=none; d=google.com; s=arc-20160816; b=CfwzrBBK6eRDPbBPB5tFi0YF9DPXfpvEK1zuRTN6D7wzE/7n2aeTsG42UXjOynwWr2 VOdnNEdKExDM1xEn2pZLjZj4cR0qJPqaJOBrxpxM5AyaDGD16Z5l2Xb98FXsQgZ+G/v2 aCPTr32wdrxg5JGXQI/as6HB1ZxlpDwCMNBRDDw0YiPJC0rD/Q0IfOStmO/3aEurWejm L9LImbJkM1WEJy/sfI4VYMsK9gQ1yP3qpVd9B1bmMFEU5aGyU+yiwbvPEIemKDHc3tnm d/2gUzBNNHZxa0SfoJjbK6EAjw+bIrHKL1KDwYW8qpd74tyqgRmDVUITe0zSjw+NFe+h SudQ== 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=3OxT6mpM/m6PbtrRF3gNTdG5tddrrD1q+DqAaSZ/g70=; b=S6GgLqKcOW0O9/rrC4hWuH5ErMRLcHaeQ39P/CJXlfUGsauKtSM/8dJdTqbCFT2RC+ lz7yihgQc4YQZnmelny6I2rKsdGskH+zYwt657hD2wK1AFNK3TAR9pdTr7WcC/EkJRmN 0aIEeLvv8onxFEa2bUNNgGTf2hA8S88jrWY6Cu/2sBb6HzFMCFfueXf38HtLIUIGioGz dLN9fexolhPDQN6wxupIgNefOPCZXT0C8mt4XSm+LMaddMDEIWXU1c60pHREdX88DmLf IgD2aeDFQ5DkV5sf52XGse7WEi8Roa8EXAmVCS+X0WggFjU02mDbRotDXAZcSvlIjR1f IloQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XSlIGQGf; 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 b24si225886itd.43.2019.03.28.16.42.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2019 16:42:10 -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=XSlIGQGf; 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]:43488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eev-0004cC-N2 for patch@linaro.org; Thu, 28 Mar 2019 19:42:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eKr-0001my-D4 for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:21:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9e4Y-00034k-FJ for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:35 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:40538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9e4Y-00034Y-5a for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:34 -0400 Received: by mail-pg1-x542.google.com with SMTP id u9so226027pgo.7 for ; Thu, 28 Mar 2019 16:04:34 -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=3OxT6mpM/m6PbtrRF3gNTdG5tddrrD1q+DqAaSZ/g70=; b=XSlIGQGfWdFttawaUTNFX8GG2F2rwIKAozctshacQhyFl5lXFj+F4YsuzW01N85QNu QNYYNGOLBUll85lNR8yzAolC0bZK4/t7eHim7EvgmJ3RD0mHxt2Q1Bfdzum2b1fRBSKr oTRHVrZ1KnK9JbQ+pkmKpVIA9jmdlO1qZ7u0v+aDZ2o/J3TfzN5srfEBBaIh7ENdQN/R lNJptS9clPMwTVNJ+Y6YDEckKbRSGvvA9CEMplXSk3Vyl3ywsli8fobYW86riyL60qoJ Ti0ZBt48wO8Nlr+/ir3+eXrH/bsWngWGL4u1UvYu3nQBYNbHNji8W4hM9R7D0pD/nF3j sZ6A== 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=3OxT6mpM/m6PbtrRF3gNTdG5tddrrD1q+DqAaSZ/g70=; b=qMq9kw7CHiYrALn+BEl4tVoQ9cAJhVYDxyqBcCtCAYDwvZ4GEeDAgDEvk2lvugqLdV hahGnpgHJS3Y/64wIwa7Y5feCSchf7s8+JUo6Bt3lfd/8iyiHbe1yBKKJkJ2ffNlsd0r duS4nxaSweQDdFJuL/boTuMtOEYwGhq1Sf/8vHSnSLWvgJH4lG02CEZasmCorRyVM62O qwiNmWhCn5TIM6rOKIfVBeRVNTEzsaxgw2M3FszP58af7tuKuBuYV8NhDMC3tlAQm6HI MA1qD5iwf46QYL0ew2IAhAvYrhpT/S9mS1gB3LElSPRqcSATPKnsyCf13l3sV+eD3nsK Qvkw== X-Gm-Message-State: APjAAAW7ZpVD0si8OaWfxJrxgWk5FcZ0/MjPdfp1a0XGGlDXZzKoIKak o/dN7n92j6/9VuPYtVwsjID080EPELY= X-Received: by 2002:aa7:93a5:: with SMTP id x5mr26783816pff.234.1553814272897; Thu, 28 Mar 2019 16:04:32 -0700 (PDT) Received: from cloudburst.ASUS (cpe-66-75-72-255.hawaii.res.rr.com. [66.75.72.255]) by smtp.gmail.com with ESMTPSA id f1sm280911pgl.35.2019.03.28.16.04.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 16:04:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:03:43 -1000 Message-Id: <20190328230404.12909-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190328230404.12909-1-richard.henderson@linaro.org> References: <20190328230404.12909-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::542 Subject: [Qemu-devel] [PATCH for-4.1 v2 15/36] 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" 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 Reviewed-by: Peter Maydell diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 3ca5d21451..a9748d57ad 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); @@ -345,21 +340,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; -} - int mb_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int mmu_idx); @@ -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 c2190e15fd..f70329e021 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 e23dcfdc20..aa91d3a257 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -84,7 +84,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 78ca265b04..816ba53721 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1603,7 +1603,7 @@ static inline void decode(DisasContext *dc, uint32_t ir) void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) { 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;