From patchwork Wed May 8 00:06:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163559 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:81:0:0:0:0 with SMTP id l1csp1986995ilm; Tue, 7 May 2019 17:07:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+YAJC9hpPfAfU+wMs4AtcBofJOnFdljKXc6KdRMLkQQ72j8FsiKWSNi14lOcQHW+zZ8Po X-Received: by 2002:a7b:ce85:: with SMTP id q5mr708676wmj.54.1557274044878; Tue, 07 May 2019 17:07:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557274044; cv=none; d=google.com; s=arc-20160816; b=Q3Q+aIjcypikyIf2Uy6QJO0xFsSVhZJLKGrNYstvradm+uVevNzLWqh1lB/vpt7KBh JUHiEfglRRUGIzzIoe9GjrLGewM9xIq3e+cZxFRoSs92mj+2Sz9/b6S5yQ2424t1LvG3 scX5ZbCZPimkq1XAa+a8qFCzc4T8Mmyjc1y5m7AQcC9XHBID36RPTIHDdGnFZFH3ePiq kWUiX8PnnqU2XqAyZtbalRvYJMARqAtP7wV+PK9cRu1nD7xDlKqDH3hZSAIaxpIhGWOp S9RPM2D7U49lGZqZAhQmCGTjdDTAnQvnMmiHabTOW/usSbiy3LeprYbnza37aVyTN6G/ Druw== 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=OiKWP6/OoPfPIuCP7uADTa7Y66Y39q2egElf8tswYBg=; b=IDrW9+XMzuK5wN4qrfXvKnXfu9E/JKDnnB+oj0lPSk2ha9ucMeyLI2i+hqDRZVT2Ij VqdQ4drI1aprAWvCcGo38PVbX+hivAMPcaehThv6DAk9+de7gUCF+kDsghaSfZ4shcwF 5908NQ/RHGwTWRvQjmFEVSZBqsA4yYYR/RK2nXvaT+UMV/cYQa4JMPIqph36D9ZJ2eYt CzZcfzvx/Q4WTjGq9Bocp/kVQuO/Z0ttkxm0hGqkZhR+TtOzoe4XdiyWCQfaBt8vgdm7 g2d5FMpPLbafO3mqldZ9JaXxmgFXHtND8HzeYawm0UOwxQ7K4CdqzGTEQ4NGaD2t/TaJ BcHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xJ0fgsIV; 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 u15si10671150wrn.134.2019.05.07.17.07.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 May 2019 17:07:24 -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=xJ0fgsIV; 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]:56385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOA7H-0007Fx-Pg for patch@linaro.org; Tue, 07 May 2019 20:07:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOA6r-0007DZ-Oe for qemu-devel@nongnu.org; Tue, 07 May 2019 20:06:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOA6p-00068O-M8 for qemu-devel@nongnu.org; Tue, 07 May 2019 20:06:56 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:42964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOA6p-00066C-F2 for qemu-devel@nongnu.org; Tue, 07 May 2019 20:06:55 -0400 Received: by mail-pl1-x644.google.com with SMTP id x15so8963093pln.9 for ; Tue, 07 May 2019 17:06:55 -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=OiKWP6/OoPfPIuCP7uADTa7Y66Y39q2egElf8tswYBg=; b=xJ0fgsIVnk1IeUNgVRf7oddqihPNVP+vsm1JK7UJlabD4IS3jEH2NDUA9/hkrNjaF2 jSdL3rJOO4k0gFnSkhTwrmq/rVmExMVDF4JCk81DKYZklv/TJD88sPhKlDknrUM2nxut dL1VjO3lxvJT6cVhYT5dFJMOqpGQX8ZEY9IGCG1okN6pxb4MAt3lfDmpieB868h+VSZf sFW6QzIIYWgJNbxtkvRFEQ/ir/Y0/Iq6OWzrG6N+cpy0PgmQnSDR3tc8eRD8ztm7X7UK Hv56NDYL8W5WuYGwYDX84ZRB/slw8vNqdSvsxU020FS0a6ew53KOO9gCs/cVM/psOsfe WbWg== 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=OiKWP6/OoPfPIuCP7uADTa7Y66Y39q2egElf8tswYBg=; b=OiAO5U79mQmmJn5mRtliua26WRsKdR5vDsZeTW5C8wtkNrXTOd2WTrtQf3R74DLP2L Umex/+gK9f/z6vKsLteDQaMDpek3K/XJ85p8sTKGcG+vBMIHnkz11CsCVfT1EzCqjKtq 0g5c+hVIoTJpFW0i6qgLV83+Tsy+HqzKeqbo5z5tOfyhRwkcsUFOk74Bgez2E/4BjXza 3OLYfBWaBDFXWMlaJxq77RFLq0nklfnzRuVPGMSbDb2HP4v1UhqOkuyvb/6O7xWL+6L6 PsgE+yu+L/L+sXW4kJcxiAkkarBZjQiDAsvALXBoyKhMvav+vIwp9gD5LIVQmDIMCci+ 49ng== X-Gm-Message-State: APjAAAXj9clnPQ+jl9OiFed4aLZWPnkNlfw9crMnL/8atNyg8UrB8MIu 7Je0NAiqhJreqojdFVl2aW+BkDHp9+s= X-Received: by 2002:a17:902:5acb:: with SMTP id g11mr7381466plm.198.1557274014064; Tue, 07 May 2019 17:06:54 -0700 (PDT) Received: from localhost.localdomain (97-113-189-189.tukw.qwest.net. [97.113.189.189]) by smtp.gmail.com with ESMTPSA id j1sm15793183pgp.91.2019.05.07.17.06.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 17:06:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 7 May 2019 17:06:10 -0700 Message-Id: <20190508000641.19090-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190508000641.19090-1-richard.henderson@linaro.org> References: <20190508000641.19090-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::644 Subject: [Qemu-devel] [PATCH v3 08/39] 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. 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 Reviewed-by: Alistair Francis diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 2c7f75f584..53c085f691 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 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 7201576aae..08dfb834a5 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -119,7 +119,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, 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; @@ -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;