From patchwork Sat Mar 23 19:09:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160990 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2199396jan; Sat, 23 Mar 2019 12:49:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+9/cfJ4pkuga0moDRFInKdwm87NfdlHaxYyiSrimJt+EjwpWpQW2xfUvqZwu4uU1LjQdo X-Received: by 2002:a81:9858:: with SMTP id p85mr13891067ywg.158.1553370583093; Sat, 23 Mar 2019 12:49:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553370583; cv=none; d=google.com; s=arc-20160816; b=DQI2Ng9EPSKpp+eXPNKA7aFHG6EsIqsGQ3sMGVyVZgu66cQKKvB96tZV/7KYhIBJCC xTbpHQPnzREtDpnIq0/cqEs92Am7wwUbFwV10DqfatIy/fenZmM4J3E2Yyn2ZCBytx+A 4tEpEnfJQlTFmyjT9Ke3P3a2csYmDf8B88jNi7lTH+InwlSL3mVDmKOMYIWseZxdonCN T/2mwYZGI2yMzNRFnfsV7EeSYuc1ptwYYhD/Iyrb7bIMXEF3m0ONcsoQXCksIF7VOsXm RZLWQNZfpTJwfTxLQ6cN3B690hjAurr6GL6tZ/eBKh+W1xKbOLnAXn3ZksRue4IBLzM1 ivRw== 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=YDXXZKk8gyLGCOyZSj4yYSFdmT3482rnPUV4g3dH+GI=; b=Wmnw4iFQhoFNIK7C22u2ORblPH51ElBcbZyHv86pVAdTzfZl7y0cY8xCFf514ReoBv Twy/WV64xD86TM+8qt0+nqbkrsOsN1Mf3tvzDgCkpndgV3KTtXcoYYxFrz7C8d43b1Pp cuZlkGiKlt2wMlNhXUEgahUgNwZVZVoRnAnyakm2EQO9WvwaKaWCMiL2MnA+I+eEvKKA GEfLvhGgmrn8UnV0kT+3EH/rfD3YdHsuqNChACoIlBIJWAVcX6Nn7qom10LTnEgOTeYr 9M5HnHn9puxiEyT4x4XcH05qgwCZu6XjymvwtTXfaARyaD/bwx2NGJ6ZoaFdKg928Y5O LCzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wacXDgzE; 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 z4si6948264ybg.344.2019.03.23.12.49.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 23 Mar 2019 12:49:43 -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=wacXDgzE; 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]:47286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7meE-00045p-Gp for patch@linaro.org; Sat, 23 Mar 2019 15:49:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7mG9-0008Km-At for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7m1X-0006rF-DC for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:09:44 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:39561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7m1X-0006q7-1W for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:09:43 -0400 Received: by mail-pf1-x444.google.com with SMTP id i17so3687781pfo.6 for ; Sat, 23 Mar 2019 12:09:42 -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=YDXXZKk8gyLGCOyZSj4yYSFdmT3482rnPUV4g3dH+GI=; b=wacXDgzEZlwZCflDNJr+e1rgISbUaUArL3U38ypbvLQDkvtkNvmqfUkDFLadPxnfT2 REeCfyeZxSAWVCvI7CAIloyl/XCmqlyLj4Vs5m1GgGJgv7gKCBecw9PUPcdMkD4IgW2a mARimRI8e8lu8NbmTYX1TUr/avAouk2bQ6XC/Gj2WeIqYbutmySu/9yDDxDmitPz69J7 HbjeMFXq953MNClM/UW004MIFQ44id35GWJmm33vPzpnySjAXcjbZARnmPtcfMuEspxr 4iDQYbo+CeoNvAuT9ONAJJ1AKAsDUJhrNpGxBasOO7NiF/tIQy2kmGM/K6b5Sdla6pDj NnnA== 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=YDXXZKk8gyLGCOyZSj4yYSFdmT3482rnPUV4g3dH+GI=; b=c8EH9dyGxkTxF5xIp1huwgFEULUOaL1EHsf+JJ0vhuBHXUZT+VvWYiGDfrto0nD4QE t8Cjph8fFt673kdD+tAXTizMBrjVwoyvCnel1QO80oliXBXWBu9+E9JLmJMVN5nA0+S7 KuIHlEcVw7MR2Co8/QL5mzES1TBAYT1Tqyu79qjGdW5h5o30Dv6zOsyCFiWxY4JcG+cD mwf2qp7LrkY6ou2Xypv4iNQi8vvB9JiGxI592Su8S9V8otVVM4tgDZR0RasOmM1tBcjC CF6j87u4S4ZMCFwVAxfibhX9fSY1s2qSfsEqQvTPm3ploQc2IjqW7vPwbXKUUEHSQMGk GGyA== X-Gm-Message-State: APjAAAUwL4EfuOj2iQT3qAjN2/PTet0FpS3pj00H+TKH+USlj9as1/Hx icFrWCZf18dHleRE75hCQ9nrlFufdCk= X-Received: by 2002:a17:902:15a8:: with SMTP id m37mr16947796pla.178.1553368181520; Sat, 23 Mar 2019 12:09:41 -0700 (PDT) Received: from localhost.localdomain (174-21-5-201.tukw.qwest.net. [174.21.5.201]) by smtp.gmail.com with ESMTPSA id h184sm25990703pfc.78.2019.03.23.12.09.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 12:09:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Mar 2019 12:09:00 -0700 Message-Id: <20190323190925.21324-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190323190925.21324-1-richard.henderson@linaro.org> References: <20190323190925.21324-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::444 Subject: [Qemu-devel] [PATCH 10/35] target/cris: 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/cris/cpu.h | 5 ----- linux-user/cris/cpu_loop.c | 2 +- target/cris/mmu.c | 3 +-- target/cris/op_helper.c | 10 +++------- target/cris/translate.c | 2 +- 5 files changed, 6 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/target/cris/cpu.h b/target/cris/cpu.h index 632ebf84b0..6111dbb14c 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -183,11 +183,6 @@ struct CRISCPU { CPUCRISState env; }; -static inline CRISCPU *cris_env_get_cpu(CPUCRISState *env) -{ - return container_of(env, CRISCPU, env); -} - #define ENV_OFFSET offsetof(CRISCPU, env) #ifndef CONFIG_USER_ONLY diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c index d012e70a7a..06709f19c1 100644 --- a/linux-user/cris/cpu_loop.c +++ b/linux-user/cris/cpu_loop.c @@ -23,7 +23,7 @@ void cpu_loop(CPUCRISState *env) { - CPUState *cs = CPU(cris_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr, ret; target_siginfo_t info; diff --git a/target/cris/mmu.c b/target/cris/mmu.c index b8db908823..ff0d3f4182 100644 --- a/target/cris/mmu.c +++ b/target/cris/mmu.c @@ -290,7 +290,6 @@ static int cris_mmu_translate_page(struct cris_mmu_result *res, void cris_mmu_flush_pid(CPUCRISState *env, uint32_t pid) { - CRISCPU *cpu = cris_env_get_cpu(env); target_ulong vaddr; unsigned int idx; uint32_t lo, hi; @@ -316,7 +315,7 @@ void cris_mmu_flush_pid(CPUCRISState *env, uint32_t pid) vaddr = tlb_vpn << TARGET_PAGE_BITS; D_LOG("flush pid=%x vaddr=%x\n", pid, vaddr); - tlb_flush_page(CPU(cpu), vaddr); + tlb_flush_page(env_cpu(env), vaddr); } } } diff --git a/target/cris/op_helper.c b/target/cris/op_helper.c index 0ee3a3117b..acb137a8ce 100644 --- a/target/cris/op_helper.c +++ b/target/cris/op_helper.c @@ -67,7 +67,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, void helper_raise_exception(CPUCRISState *env, uint32_t index) { - CPUState *cs = CPU(cris_env_get_cpu(env)); + CPUState *cs = env_cpu(env); cs->exception_index = index; cpu_loop_exit(cs); @@ -85,8 +85,7 @@ void helper_tlb_flush_pid(CPUCRISState *env, uint32_t pid) void helper_spc_write(CPUCRISState *env, uint32_t new_spc) { #if !defined(CONFIG_USER_ONLY) - CRISCPU *cpu = cris_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); tlb_flush_page(cs, env->pregs[PR_SPC]); tlb_flush_page(cs, new_spc); @@ -99,9 +98,6 @@ void helper_spc_write(CPUCRISState *env, uint32_t new_spc) void helper_movl_sreg_reg(CPUCRISState *env, uint32_t sreg, uint32_t reg) { -#if !defined(CONFIG_USER_ONLY) - CRISCPU *cpu = cris_env_get_cpu(env); -#endif uint32_t srs; srs = env->pregs[PR_SRS]; srs &= 3; @@ -143,7 +139,7 @@ void helper_movl_sreg_reg(CPUCRISState *env, uint32_t sreg, uint32_t reg) D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", vaddr, tlb_v, env->pc); if (tlb_v) { - tlb_flush_page(CPU(cpu), vaddr); + tlb_flush_page(env_cpu(env), vaddr); } } } diff --git a/target/cris/translate.c b/target/cris/translate.c index 11b2c11174..b5598c6fd5 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -3104,7 +3104,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) * delayslot, like in real hw. */ pc_start = tb->pc & ~1; - dc->cpu = cris_env_get_cpu(env); + dc->cpu = env_archcpu(env); dc->tb = tb; dc->is_jmp = DISAS_NEXT;