From patchwork Thu Mar 28 23:03:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161337 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1326961jan; Thu, 28 Mar 2019 16:24:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqywHJrnLVwnZvigAPvfWq4c4VbCI8+cPjVUEa3oqJF365arAvcpR8lAXAXhUCYFzCgd6iRf X-Received: by 2002:a24:ddcd:: with SMTP id t196mr2097523itf.75.1553815469869; Thu, 28 Mar 2019 16:24:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553815469; cv=none; d=google.com; s=arc-20160816; b=TZqpluK8Q52+CERH7TrhfVE7s+e4s+6q5uTQg/sk/FDbX0I3RbALRjzl3YloPYETpJ ceExFMvD76j0yZ5Lc0EPUSNkqUFkmYl4a++z/Rf4QdxTx1o6QcY4pR8PWnOfaql7esfH uW0Tqtn3PRbB9iZ/NDyLblQiEWmiZIdt1SpD/a3i1mH9pXBT0QJ/GRm9CXlm562yyM/t iyakj4NZvBQObgR0iKfnzjotPspuiwdt//CB6EA6VTf4kwyNBEK8uUp/y2hDJnUKdYwq NfzwhNGL48gaVnIu2Rr7ukNWDhaAMJo6EN9e+dDO/PpNOv7utKYsf7IF1S5mWPUmtpfp jUjw== 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=Css6NKgFH171QC6SSk07lpmy2ZqpsnjuUU/ll24a9MA=; b=rpiymqRZE5mqg6bAuYlkYzmrzJ2gh01G1CsvMQWLXlALLhsgoS1RuLloj3v158rj6s FruIV/mQ6lRuwgkLOwe1y7prxNqrrmOvZbvePLAObYARW3rhZUGjzCeoNn6Bnzy6+6Vx QQOvWCeyoiAstOtC43CZW4QbIMVHJHKz8AgQHyQfGqozQMjI8UNf8pnrn1ZN/+hR1YQ/ UyY3dNKxMR/tPmcIhZHNa71k6ZfJudHI0KlOZ2UzcQ3RsGyoCsMaj94nr73lipOTyCJK hAk+0wIaWdifc0bj4FWfDnqoMfJRgVbyyXgtjDzV64zx5aOACheXbxmdmY3lHXCApv9t Ju4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i4vPpYXW; 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 x12si197527itl.112.2019.03.28.16.24.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2019 16:24:29 -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=i4vPpYXW; 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]:43210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eNp-0005iU-4R for patch@linaro.org; Thu, 28 Mar 2019 19:24:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eKv-0001km-Ew for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:21:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9e4N-0002za-U6 for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:25 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:40536) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9e4N-0002yy-NH for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:23 -0400 Received: by mail-pg1-x541.google.com with SMTP id u9so225816pgo.7 for ; Thu, 28 Mar 2019 16:04: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=Css6NKgFH171QC6SSk07lpmy2ZqpsnjuUU/ll24a9MA=; b=i4vPpYXWWtjFqgwtTbVG/QMC+0h8zIima4xpD1fHckDmkcqgkZK2JYExxt29Cm8zdY Fb7LxZN4cfCedKff88BbZSUKEQSP0DQJNf25SJuTh5xUGmnKbyNIQbPq5WMCSuq+z91T zxwcwyL4kLjxi8IWNusDbLYucXI0319854bfUPMVJ2Cs01Y+UwAoVgfkQDPK65O8B8jS vohyaTnlvh+m+S6aBeuOKm6+1xK48iL/6dxYvJKhjFDI3W9P8esHW2oa8Z8j1VfEYlMl uHNKMBdplFFYvFUlohdtOU1LrWBEuGgxlbMvBPKXFm2DO2e8I3xdGuR9BztQyqWUXJV1 PMrg== 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=Css6NKgFH171QC6SSk07lpmy2ZqpsnjuUU/ll24a9MA=; b=mIB3GVmP1Kg/mQGZoRLjGbkHGTjXupe1nnSz5SDW9Twd4fTASQnIPrYuHX6ajDAu7V w1vpGpsHmkRwlgei5NiRggWfqrXwR39ykwJS0cSx8tWixcHfZ0tckhG4XvVfizL9sHQ0 PbB4YXXp+hmiIOO/+A2G6ExPmiYRBzN3Bu/jWcOtyFKDl65ULqghvBN3V3pV11eIrwCO pXZ5DBe9jdEllwoiX/LEZYDFlocnEaxMya8WXBOJaavZ7ZUB5J2c83gGhondQgpnBE8o 87p5xf5C3XHPCzymcsJUukTVgBX2RXjUKDHaAuS1wyG95MJIhSSYxwYGLmIbC+vcL1zi ogYw== X-Gm-Message-State: APjAAAVzq/V/qKEolo/qZj1/lcs3JBCOTDLZONVQh2j2FQDE9dPPmrVs 1OekqOHpfa8y+6wdYQP+jrdJCcA90d4= X-Received: by 2002:a62:445a:: with SMTP id r87mr42875056pfa.13.1553814261891; Thu, 28 Mar 2019 16:04:21 -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.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 16:04:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:03:36 -1000 Message-Id: <20190328230404.12909-9-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::541 Subject: [Qemu-devel] [PATCH for-4.1 v2 08/36] target/alpha: 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" With exactly one exception, most uses of alpha_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/alpha/cpu.h | 5 ----- linux-user/alpha/cpu_loop.c | 2 +- target/alpha/helper.c | 8 +++----- target/alpha/sys_helper.c | 8 ++++---- 4 files changed, 8 insertions(+), 15 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 788edd5cb3..e22518871a 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -273,11 +273,6 @@ struct AlphaCPU { QEMUTimer *alarm_timer; }; -static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) -{ - return container_of(env, AlphaCPU, env); -} - #define ENV_OFFSET offsetof(AlphaCPU, env) #ifndef CONFIG_USER_ONLY diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c index 824b6d6658..2acdefde03 100644 --- a/linux-user/alpha/cpu_loop.c +++ b/linux-user/alpha/cpu_loop.c @@ -23,7 +23,7 @@ void cpu_loop(CPUAlphaState *env) { - CPUState *cs = CPU(alpha_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr; target_siginfo_t info; abi_long sysret; diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 57e2c212b3..4769d44fd9 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -118,7 +118,7 @@ static int get_physical_address(CPUAlphaState *env, target_ulong addr, int prot_need, int mmu_idx, target_ulong *pphys, int *pprot) { - CPUState *cs = CPU(alpha_env_get_cpu(env)); + CPUState *cs = env_cpu(env); target_long saddr = addr; target_ulong phys = 0; target_ulong L1pte, L2pte, L3pte; @@ -463,8 +463,7 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, We expect that ENV->PC has already been updated. */ void QEMU_NORETURN helper_excp(CPUAlphaState *env, int excp, int error) { - AlphaCPU *cpu = alpha_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); cs->exception_index = excp; env->error_code = error; @@ -475,8 +474,7 @@ void QEMU_NORETURN helper_excp(CPUAlphaState *env, int excp, int error) void QEMU_NORETURN dynamic_excp(CPUAlphaState *env, uintptr_t retaddr, int excp, int error) { - AlphaCPU *cpu = alpha_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); cs->exception_index = excp; env->error_code = error; diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c index ac22323191..f9c34b1144 100644 --- a/target/alpha/sys_helper.c +++ b/target/alpha/sys_helper.c @@ -44,17 +44,17 @@ uint64_t helper_load_pcc(CPUAlphaState *env) #ifndef CONFIG_USER_ONLY void helper_tbia(CPUAlphaState *env) { - tlb_flush(CPU(alpha_env_get_cpu(env))); + tlb_flush(env_cpu(env)); } void helper_tbis(CPUAlphaState *env, uint64_t p) { - tlb_flush_page(CPU(alpha_env_get_cpu(env)), p); + tlb_flush_page(env_cpu(env), p); } void helper_tb_flush(CPUAlphaState *env) { - tb_flush(CPU(alpha_env_get_cpu(env))); + tb_flush(env_cpu(env)); } void helper_halt(uint64_t restart) @@ -78,7 +78,7 @@ uint64_t helper_get_walltime(void) void helper_set_alarm(CPUAlphaState *env, uint64_t expire) { - AlphaCPU *cpu = alpha_env_get_cpu(env); + AlphaCPU *cpu = env_archcpu(env); if (expire) { env->alarm_expire = expire;