From nobody Tue Feb 10 12:14:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559681056; cv=none; d=zoho.com; s=zohoarc; b=ncSarBWYo/p1N3sYCk+qreQFqD77nHbRZSaQL/h9qdo9ldTAhlqtLG5QarMjIKFeIVjcaUWoJG1iN/YEUHgPm4NFl22Ptr+i3eBh/0cvb+v5PV0kcYNuk2ZDrkQSy4yWRgRXA1O8Mujj1YOfsZ7GnkVbodKH/3+ESEj3KnBpHSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559681056; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3eEZ43+foZOHsJH12yR7I4WMYSzG6ykvnQtbtEqnbDs=; b=m3R9oHiS14WUdV8YYc+jN/vILwmJBuguZyByNDE/IyksqGr1sbRLb0YBWbjpc6mYxbyP+w35BfkyarOQ1yYR635774zsSx3H/3Cb610ZwSWKzfGixZ9KI1GE4muLr21piZ9TQVAKbffotK3IlJInmnIdGnkarlalWVfKGlrkQeY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559681056208521.6462474032161; Tue, 4 Jun 2019 13:44:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:57711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYGHs-0000sd-2w for importer@patchew.org; Tue, 04 Jun 2019 16:44:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG8R-00016S-Jl for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYG8Q-0004EM-4p for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:19 -0400 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]:40972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYG8P-0004Cy-Vd for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:18 -0400 Received: by mail-oi1-x241.google.com with SMTP id b21so12668317oic.8 for ; Tue, 04 Jun 2019 13:34:17 -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.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 13:34:15 -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=3eEZ43+foZOHsJH12yR7I4WMYSzG6ykvnQtbtEqnbDs=; b=r3wNXQSWE0KBY++rKoL85Ou3wukzAVz1/VJHrrErBFc899eCqZF0Kiy4b3MOQMEeP0 p33LgbNYFwbGh5JfkOZc6/EbSaO3c8fdgxLa13eJlQllWHnxAO4D+zE8oqbkVhor0Ut0 JJDz366FysAXDysVDzO8ncnoX80NA6NXCKeWU6CLemJi7S3jjYcNUxGjjXhQKTWhyBQ3 bc4DYN1TFBHpxhJ493f4eNQ3M1cmapQrhb0ZBKMnS+hvyaniQGGW/FHfdAqHuEQ6fxzs SJoTap9rLYSKYjhrzihC8qAD3ppUm9MTs89Psz+YbpdnDRfBIyCeK4y9Y2F37/pjFGOx TJnA== 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=3eEZ43+foZOHsJH12yR7I4WMYSzG6ykvnQtbtEqnbDs=; b=rpgg4PDjlePJ/ps9EJoA8NYGfWoGPLUpCSGsrRH+P7TUtzmZysFnSGt3q+MJPa4nkc NTTL6BBA0B0/M6vRAQakrxb1HI85rZCtYSzFMA7/VRwhSXUSIglrYJqzdGSxMldOMQGm jUgBjthtgExEply21PDRFhOA6+7Ms9wiu7/5Wr3JEvg5991pjt0eBMK+MfD2+eOex1Wi 00330OlrEzx6CMG+p8rKjWCYZDq92wktmg3JQewpp+V8s8jvlhu5/EbLJK1gH/TJWVbk 2vP3fX6PA7JDeDhrB/80Fi2hGlWgPPkL/GzFOf38/j2c3Of0nwabdO+DujlvoDDTzyHU LV1w== X-Gm-Message-State: APjAAAWMJpuHoI2b2XxpvjFFPIDUs3XtW1cLdB6CkgAFbdqao/+pdotx 1lvckX7Fxz36bdzx/+Q9bQHDRH14IzTbIA== X-Google-Smtp-Source: APXvYqyasOz7WlN5+FxpIfJs+IXH8vw6ywZkKDupThC4IhNL241mnxZX4dJKO2clg2f6rjSgNYHBvw== X-Received: by 2002:aca:3fc6:: with SMTP id m189mr3475894oia.124.1559680456690; Tue, 04 Jun 2019 13:34:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2019 15:33:25 -0500 Message-Id: <20190604203351.27778-14-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::241 Subject: [Qemu-devel] [PATCH v4 13/39] 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Cleanup in the boilerplate that each target must define. Replace hppa_env_get_cpu with env_archcpu. The combination CPU(hppa_env_get_cpu) should have used ENV_GET_CPU to begin; use env_cpu now. Reviewed-by: Alistair Francis Reviewed-by: Peter Maydell 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(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 0cb1fc8800..75e6a91a5e 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -222,11 +222,6 @@ struct HPPACPU { QEMUTimer *alarm_timer; }; =20 -static inline HPPACPU *hppa_env_get_cpu(CPUHPPAState *env) -{ - return container_of(env, HPPACPU, env); -} - #define ENV_OFFSET offsetof(HPPACPU, env) =20 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) =20 void cpu_loop(CPUHPPAState *env) { - CPUState *cs =3D CPU(hppa_env_get_cpu(env)); + CPUState *cs =3D 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 11c61b3ca2..0dcd105b88 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -71,8 +71,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 =3D 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 va= l) { env->cr[CR_EIRR] &=3D ~val; qemu_mutex_lock_iothread(); - eval_interrupt(hppa_env_get_cpu(env)); + eval_interrupt(env_archcpu(env)); qemu_mutex_unlock_iothread(); } =20 @@ -85,7 +85,7 @@ void HELPER(write_eiem)(CPUHPPAState *env, target_ureg va= l) { env->cr[CR_EIEM] =3D 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 0fd3ac6645..b12c5b5054 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -56,7 +56,7 @@ static hppa_tlb_entry *hppa_find_tlb(CPUHPPAState *env, v= addr addr) =20 static void hppa_flush_tlb_ent(CPUHPPAState *env, hppa_tlb_entry *ent) { - CPUState *cs =3D CPU(hppa_env_get_cpu(env)); + CPUState *cs =3D env_cpu(env); unsigned i, n =3D 1 << (2 * ent->page_size); uint64_t addr =3D ent->va_b; =20 @@ -329,7 +329,7 @@ static void ptlb_work(CPUState *cpu, run_on_cpu_data da= ta) =20 void HELPER(ptlb)(CPUHPPAState *env, target_ulong addr) { - CPUState *src =3D CPU(hppa_env_get_cpu(env)); + CPUState *src =3D env_cpu(env); CPUState *cpu; trace_hppa_tlb_ptlb(env); run_on_cpu_data data =3D RUN_ON_CPU_TARGET_PTR(addr); @@ -346,17 +346,15 @@ void HELPER(ptlb)(CPUHPPAState *env, target_ulong add= r) number of pages/entries (we choose all), and is local to the cpu. */ void HELPER(ptlbe)(CPUHPPAState *env) { - CPUState *src =3D 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); } =20 void cpu_hppa_change_prot_id(CPUHPPAState *env) { if (env->psw & PSW_P) { - CPUState *src =3D CPU(hppa_env_get_cpu(env)); - tlb_flush_by_mmuidx(src, 0xf); + tlb_flush_by_mmuidx(env_cpu(env), 0xf); } } =20 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 @@ =20 void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp) { - HPPACPU *cpu =3D hppa_env_get_cpu(env); - CPUState *cs =3D CPU(cpu); + CPUState *cs =3D env_cpu(env); =20 cs->exception_index =3D excp; cpu_loop_exit(cs); @@ -38,8 +37,7 @@ void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int ex= cp) =20 void QEMU_NORETURN hppa_dynamic_excp(CPUHPPAState *env, int excp, uintptr_= t ra) { - HPPACPU *cpu =3D hppa_env_get_cpu(env); - CPUState *cs =3D CPU(cpu); + CPUState *cs =3D env_cpu(env); =20 cs->exception_index =3D 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 =3D hppa_env_get_cpu(env); + HPPACPU *cpu =3D env_archcpu(env); uint64_t current =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); uint64_t timeout; =20 --=20 2.17.1