From patchwork Mon Jun 10 02:01:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 166247 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp460157ilk; Sun, 9 Jun 2019 19:07:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGNb36Jw0WtSwrUdcCNIp56h4Q6s2iXLxCph7vuKuHjMW0etXNwCOQVlWsm/sx6f/yuJ7a X-Received: by 2002:ac8:458d:: with SMTP id l13mr58695038qtn.165.1560132437144; Sun, 09 Jun 2019 19:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560132437; cv=none; d=google.com; s=arc-20160816; b=UYvjLaQokDY8p0bAQZsNmY/IXd3SnI/yJAPgJL15JYITGwJfvS4D57G3GAfQO45Pod jlsYZ4DKuo1PVK7A6mofxaCqqEP4zSO7UVIK9URHpfdi9k+MGKov109oT9olw1JGURVR cz/2uS7PfZMdkNHOW4nZslc/MkTKlEtvFUKu87QfVb3y94MtReUnO9emYWjHQjvZ5H9E 4GUKBtZyuV3mLG1GBKuSYa2M5/zqP39NCJ9K6W35+tt/ZYHGV7O2xK2uevi9ZqnV3Huz WFz2ZdrdQyxNfXVaXb+vRwvxKrk6UzkewusM1RhkUz/BmYUkmX+Xdbn9RzIbYd8Nsq1/ smFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=98JOxuqlJVZoGMNI/F+3Atqcd/SU0QC/Vy6EmOYsiac=; b=NJ3h+SBGBV096OSJtmoHuvLwT0bqpkwpiNDqezHHhwkP+qeBqmpMXM0OYi7cYUjzkG yJMC+vswqIWEO96Cl7Q762ug4W4qpNmNVI3FKMuUtsYW3Z8Cv2Z777XgVfI6CArTJQ4m s8iOEvuZygMLFrBbmfWFfNMQRUIU0xTA9vZRYuo6AgLw2wWWtFB5jtVnhoNtK1UOlYIu TwW1Ibj+vNQrD5RaYna/D2InfnbFuGpzyEeULy9/rhPZ2nSZFZTtFaGTx80tzbhIzacH JVSr9tqvn/njx8PSndSZNosk9w4BFRe43xQYVYzopv8kf/hdGyh0nEA92phpdjCcx/vk k3EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tfXfKcyQ; 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 x129si1934996qkd.207.2019.06.09.19.07.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jun 2019 19:07:17 -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=tfXfKcyQ; 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 ([::1]:39630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ha9iM-00019t-U8 for patch@linaro.org; Sun, 09 Jun 2019 22:07:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52919) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ha9dp-0005mV-Lk for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ha9do-0001do-G8 for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:33 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:44615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ha9do-0001dJ-9Y for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:32 -0400 Received: by mail-pg1-x52b.google.com with SMTP id n2so4138535pgp.11 for ; Sun, 09 Jun 2019 19:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=98JOxuqlJVZoGMNI/F+3Atqcd/SU0QC/Vy6EmOYsiac=; b=tfXfKcyQfSWBaf2iFwZWPXPzYxIt4apQjvSUpd8kyuGBenNSJ9eySIt4Hh0o7qjJd3 TACGFkh8dsUqQwMyH55eCa8awSru01sz0nIKvhLpMPB0HP0HDG9vFke0/Z5RKr4dqo9H zwAHmyVB+aF5o2EeG2nasXVGJY+Q7tPh5poewMGspxiD4LipgxKabWfV8X3LA8V2PbSa N7PlfsacF12AaE3Mfvvr5XpodxQCnIwWoRO5+WCpsnb6eXoDdurUsZP/1WrejUWfrIV0 NUGCoC7bjwPUxyzTabN195vUmNsnIqCx6neZlkovzYBsZCdA+32ksUe8MppTOfBOXXwv eh1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=98JOxuqlJVZoGMNI/F+3Atqcd/SU0QC/Vy6EmOYsiac=; b=PYqM1zRFdqx7SzFyTzKFSWipxldoUBZW7d73ZcBDrWoOqIO9BAasRQz7rQ8hJdSuUn F6wWUjuJFILcUxGvydieNQt+ZOLs9kNaE9O/IZNTF4y8W6WXGvxtHIo+bFcZXcBi+iYy R9hb5U7hNHFCISbpZ9kkTG7OknG6CVng+X0l3iU9cwpsleJynfSLBQXZPTjDPliauMko QJer3KkWAW4TQBc87sQ/DRl4ESD8z51E8K6fe2v1QGxRvYNeWzMyhy59mP0hRcHp49Y1 XNmF78IWjHgKnUxYQqQvZrFyN6m8wLh1/ztaGmUHTEusT5hz9ULGNJwyhmdVk4ej9OYu eP6Q== X-Gm-Message-State: APjAAAVmrLlzFfDBGLpXhhGxLnf0cGu8preC2YPz6SHWxFWovspfYEDC TxHndMTrc4q2YHBKbKalRtSOhstHkdE= X-Received: by 2002:a62:1993:: with SMTP id 141mr69706947pfz.97.1560132150781; Sun, 09 Jun 2019 19:02:30 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id l63sm9749013pfl.181.2019.06.09.19.02.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jun 2019 19:02:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jun 2019 19:01:47 -0700 Message-Id: <20190610020218.9228-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190610020218.9228-1-richard.henderson@linaro.org> References: <20190610020218.9228-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::52b Subject: [Qemu-devel] [PULL 08/39] target/alpha: Use env_cpu, env_archcpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cleanup in the boilerplate that each target must define. Replace alpha_env_get_cpu with env_archcpu. The combination CPU(alpha_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/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 diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index e391195be0..86d3e953b9 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -278,11 +278,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 61992571e1..7a94eee84c 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 2134ee1e9d..93b8e788b1 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -136,7 +136,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; @@ -486,8 +486,7 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) 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; @@ -498,8 +497,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;