From patchwork Thu Mar 28 23:03:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161338 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1327357jan; Thu, 28 Mar 2019 16:24:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqzgMVxt8K7Z/JrhL1e61qAmURZhNxNH/bq06n+AMcoPkP54xM832zdfZxA8YLikJ/UqF9nk X-Received: by 2002:a24:eb0e:: with SMTP id h14mr2256794itj.100.1553815498537; Thu, 28 Mar 2019 16:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553815498; cv=none; d=google.com; s=arc-20160816; b=ATPHDepEpJzaZ6z21BmGaI9J6aw5bYQgY+4vGCevIAoxMNErgU7h26cDPHQd/ohyo8 nZeEC9dxgwYhyxMYRR7K7Mm1X4Ax3DdB9DLVCEp0TQSiiV13TF8X3uWWb40KgwxMt+Xf HpmyeNcQBF/vTFGJuucXalrxc4NHfTg8IZK6+Wcvg872SAOyrfRc5ME7LkarghoN3eLL d8xh/Uoe8UyU1h9Cht4jFglWpjVsejbXZ5Rml1356FXVCiMjDYC6hf8PrdyWmDn3rYv0 BMps2QwdU+UByNUtI6JRn6h9EOrAW+baXkB2mZmTbEjdSPvtXLMCnlaozzwoDDeyulYh cevw== 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=9N4JQEw/elYxz2Oh0lSdtSn4NJfOrq4X60hEWwPS5Ew=; b=khK4DLAOykBYpk500zRLe1T+4cP8w0JbLUm6YbfJbjggs2foHjh4vI4zOFA/sFOLxu c9XZWJc+nspViVTKy8xYkZkIjqSq5cjKW2ZO0+FYTv8ejv5Slr0pFHNctWhfIPm5URnU T6Ht1dqhg0qOXYMYfAHQi1H84nH5DmQvg7qkQEuQAXNqiEDPnSS05LEhofE5yTWh9Enu lVf230A1T8g1YtT4fZSDqMOZNwByJRobAjEeNhwYRTEdXJXzAyXTVN7wCA+BOhohBjwn S5dFethCe88DKP+VH0YS5XiL2vL+kBTnd08qIqHRW17DytauPPE93po5DZy88xM5/FKP 0JYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gGbWF7XI; 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 c69si179590ita.124.2019.03.28.16.24.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2019 16:24:58 -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=gGbWF7XI; 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]:43212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eOH-0005nf-QE for patch@linaro.org; Thu, 28 Mar 2019 19:24:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eKs-0001my-OD for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9e4V-00032b-3l for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:32 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:45006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9e4U-00030j-Ij for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:30 -0400 Received: by mail-pl1-x642.google.com with SMTP id g12so50915pll.11 for ; Thu, 28 Mar 2019 16:04:27 -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=9N4JQEw/elYxz2Oh0lSdtSn4NJfOrq4X60hEWwPS5Ew=; b=gGbWF7XILkUiYYQ3LVLJUxoqjY3aLYA4rzgWLZe8dW9u287uZ72JUYdw4/nNYXRe9M AY7P933oijdkl0K4c+vMxcYo/A+xtKcK88nEKJK6+r/zlJ2zdEr2hcM91Ze7A24u00Va mACWk6dFdX/jT4DzVpWBr2lQHQXZ8o+aY+iWUJChMb9STIGgr5OIWVg3iHPpLoMwxdEm Em8UxUKzdf2crlSGEA/M1ISjS2vpW2FxUsxjbP5I2UD3aegKQmX4yBlrKpabeVzLpZOM dclBRxgFrjSwTdN6qcRPp5YyIyoIdeaBojRQiXwzoFSA+QsObMhkEkFIG98IeIUxdNNH 9IQw== 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=9N4JQEw/elYxz2Oh0lSdtSn4NJfOrq4X60hEWwPS5Ew=; b=eZBsaMkzKeM7I6JHYc2iv1kx0PGEa8BO5e6y05CrW0ci320kYA9oOX57eZpdmnSgbJ 1qtH4XvoZLBkzgC7NLMS2cu5Bk6NQt3gZGav/Gq0Bgc5oyxhULH7W8Pul5pcPaj+r8zX 32z9oyNvHdryIbh6Ij1DKW97RtE3wShWOsaqEWCqQbfRL1aTmbbhAu/YetLgtIKkC8TY 9+JTfEarJOOf25jWLylPkfHbWkwBlZTUFYut9lscbP4YJ3m3gTVijNbnKRKUUlJZtFp/ asqg5oE2oetVeQZwAcaJZci8jM2QTw84oXMJ/QHS5SCZM730EXrE40DmQqDv6sIHXcze hZAg== X-Gm-Message-State: APjAAAUnMuRozX69uBH3ZLHSwU1JiQg7OX6xrMQ1NYBKLBCUy4wcJO9Y InNraPaaso7lPLTdaNPAiMGFmP971IQ= X-Received: by 2002:a17:902:4383:: with SMTP id j3mr27604962pld.58.1553814266769; Thu, 28 Mar 2019 16:04:26 -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.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 16:04:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:03:39 -1000 Message-Id: <20190328230404.12909-12-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::642 Subject: [Qemu-devel] [PATCH for-4.1 v2 11/36] target/hppa: 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" Combined uses of CPU(hppa_env_get_cpu()) were failures to use the more proper, ENV_GET_CPU macro, now replaced by env_cpu. Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 5 ----- linux-user/hppa/cpu_loop.c | 2 +- target/hppa/helper.c | 3 +-- target/hppa/int_helper.c | 4 ++-- target/hppa/mem_helper.c | 10 ++++------ target/hppa/op_helper.c | 8 +++----- 6 files changed, 11 insertions(+), 21 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 6ae73e24e4..1387066324 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -222,11 +222,6 @@ struct HPPACPU { QEMUTimer *alarm_timer; }; -static inline HPPACPU *hppa_env_get_cpu(CPUHPPAState *env) -{ - return container_of(env, HPPACPU, env); -} - #define ENV_OFFSET offsetof(HPPACPU, env) typedef CPUHPPAState CPUArchState; diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c index 880955fdef..9915456a1d 100644 --- a/linux-user/hppa/cpu_loop.c +++ b/linux-user/hppa/cpu_loop.c @@ -105,7 +105,7 @@ static abi_ulong hppa_lws(CPUHPPAState *env) void cpu_loop(CPUHPPAState *env) { - CPUState *cs = CPU(hppa_env_get_cpu(env)); + CPUState *cs = env_cpu(env); target_siginfo_t info; abi_ulong ret; int trapnr; diff --git a/target/hppa/helper.c b/target/hppa/helper.c index ac750b62ef..eb5047037e 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -70,8 +70,7 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ureg psw) /* If PSW_P changes, it affects how we translate addresses. */ if ((psw ^ old_psw) & PSW_P) { #ifndef CONFIG_USER_ONLY - CPUState *src = CPU(hppa_env_get_cpu(env)); - tlb_flush_by_mmuidx(src, 0xf); + tlb_flush_by_mmuidx(env_cpu(env), 0xf); #endif } } diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 8d5edd3a20..89241c31e7 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -77,7 +77,7 @@ void HELPER(write_eirr)(CPUHPPAState *env, target_ureg val) { env->cr[CR_EIRR] &= ~val; qemu_mutex_lock_iothread(); - eval_interrupt(hppa_env_get_cpu(env)); + eval_interrupt(env_archcpu(env)); qemu_mutex_unlock_iothread(); } @@ -85,7 +85,7 @@ void HELPER(write_eiem)(CPUHPPAState *env, target_ureg val) { env->cr[CR_EIEM] = val; qemu_mutex_lock_iothread(); - eval_interrupt(hppa_env_get_cpu(env)); + eval_interrupt(env_archcpu(env)); qemu_mutex_unlock_iothread(); } #endif /* !CONFIG_USER_ONLY */ diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index c9b57d07c3..77d5cb6c42 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -55,7 +55,7 @@ static hppa_tlb_entry *hppa_find_tlb(CPUHPPAState *env, vaddr addr) static void hppa_flush_tlb_ent(CPUHPPAState *env, hppa_tlb_entry *ent) { - CPUState *cs = CPU(hppa_env_get_cpu(env)); + CPUState *cs = env_cpu(env); unsigned i, n = 1 << (2 * ent->page_size); uint64_t addr = ent->va_b; @@ -324,7 +324,7 @@ static void ptlb_work(CPUState *cpu, run_on_cpu_data data) void HELPER(ptlb)(CPUHPPAState *env, target_ulong addr) { - CPUState *src = CPU(hppa_env_get_cpu(env)); + CPUState *src = env_cpu(env); CPUState *cpu; trace_hppa_tlb_ptlb(env); run_on_cpu_data data = RUN_ON_CPU_TARGET_PTR(addr); @@ -341,17 +341,15 @@ void HELPER(ptlb)(CPUHPPAState *env, target_ulong addr) number of pages/entries (we choose all), and is local to the cpu. */ void HELPER(ptlbe)(CPUHPPAState *env) { - CPUState *src = CPU(hppa_env_get_cpu(env)); trace_hppa_tlb_ptlbe(env); memset(env->tlb, 0, sizeof(env->tlb)); - tlb_flush_by_mmuidx(src, 0xf); + tlb_flush_by_mmuidx(env_cpu(env), 0xf); } void cpu_hppa_change_prot_id(CPUHPPAState *env) { if (env->psw & PSW_P) { - CPUState *src = CPU(hppa_env_get_cpu(env)); - tlb_flush_by_mmuidx(src, 0xf); + tlb_flush_by_mmuidx(env_cpu(env), 0xf); } } diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 952e97a7d7..04d23c1b22 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -29,8 +29,7 @@ void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp) { - HPPACPU *cpu = hppa_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); cs->exception_index = excp; cpu_loop_exit(cs); @@ -38,8 +37,7 @@ void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp) void QEMU_NORETURN hppa_dynamic_excp(CPUHPPAState *env, int excp, uintptr_t ra) { - HPPACPU *cpu = hppa_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); cs->exception_index = excp; cpu_loop_exit_restore(cs, ra); @@ -630,7 +628,7 @@ target_ureg HELPER(read_interval_timer)(void) #ifndef CONFIG_USER_ONLY void HELPER(write_interval_timer)(CPUHPPAState *env, target_ureg val) { - HPPACPU *cpu = hppa_env_get_cpu(env); + HPPACPU *cpu = env_archcpu(env); uint64_t current = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); uint64_t timeout;