From patchwork Sat Mar 23 19:09:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160981 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2193326jan; Sat, 23 Mar 2019 12:40:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyB+gctbqJi6DOGcsnFe/H2Au8hGr/u92CDHsbFnzEDS1jBoH/M+gJIKKyMGubE49Fx2Z29 X-Received: by 2002:a25:8106:: with SMTP id o6mr13182429ybk.53.1553370047536; Sat, 23 Mar 2019 12:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553370047; cv=none; d=google.com; s=arc-20160816; b=IIKVTn58bUhiQsJyzo73BAg4l72/S5m01ti2f5XAqfNF0m7v9SBBmG3nLewGSzeJMQ 844PytCSFiuz1xAKP90Ji06mNd0/bRlzt5lBqOc2sMPrzK46EjkMx/GA40g4GWypHseQ NUZd8p8X6DEhjq0wC4finwy104SLuCTd0cnZO3zWrFNQ13rS2/AZ2LdcjsMlx0j8lScY gX7dybW6XRt22Fd3OtJvogVo50WkuAqUeoOiT0A0ZtsvTLvQCGbe1pcDjCqa0WfYFiVU KMUTZxfaofw7RrEhvu79nkw15+/S/I3DsyQeIM8hNEUviAQVjYXyNHoj5wqKD+/sv9YP BS8Q== 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=KTPu0A4yRZk6SAccQ35Jw9mugJOMEe3GiZ5yoFwzJeQ=; b=tbi6Yj65CcjyGue5nnULe00/RiQeLeQq3uQVOGlXgwWN6MqZ8MXngfa8XfWvPXhs5E dibdO3ImDts0c0yPAKoCV+8ORx3hyT2vtAeOmz2wtETNZSplJsxp3s+YlFYcaIwI38L4 T7r3QT936/n7HtDZJ2NEajhFO4VW9ZzTw3yiv5yb4IdlwUHl8+M9qSy5qsFpPmqRZ+EM uKMzjxOhGYB4nAtdcrqAp0qYwo2FPRb2CbfISc0Bm8J5G9CX05ps6zgk5C94r1b3HNkZ mCPHm2yoSXzdGVOq+IHoOegRz/IFThW/Zv92WFSCssQ0fc2FGB9ukmtrwelUHmwja6kh nizg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=s9GApgFw; 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 a3si6969300ybh.302.2019.03.23.12.40.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 23 Mar 2019 12:40:47 -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=s9GApgFw; 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]:47177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7mVb-00058q-1e for patch@linaro.org; Sat, 23 Mar 2019 15:40:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7mG0-0007kB-9e for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:24:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7m1y-00079x-NT for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:10:14 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:41656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7m1u-00073Y-Hk for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:10:08 -0400 Received: by mail-pg1-x544.google.com with SMTP id k11so3692632pgb.8 for ; Sat, 23 Mar 2019 12:10:02 -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=KTPu0A4yRZk6SAccQ35Jw9mugJOMEe3GiZ5yoFwzJeQ=; b=s9GApgFw54lxfZl85H8q3VOrbxiWWHXjWjjeZnfv3wWnpu5e/QCILE4itKKF92KzyZ n+deSxVS8DLVTkRno0C/36JAnPGbw3kJb0XjCZYVAzQqfO+pCkFb86hD73JRVKkKpLO0 mMvZh08B/o5pcaMmFGX6AJ+ERC5FMinuGqwqaMhtvXAjyv/mASO3Nz6UldlDUtD0W/Bx 6mgQvS6t5KpYBGAfWe/+gJ+3Y3etexLz6FTBzvqA+gG3Y1qhi/l/rIUBduECAySv9rlO 7Rm5E9oNrTr+QbvmWlsGAyFSO/5fR/ErhTlsaIoBNsbfM3K5riuN143apnqFqSiIJfvS SuAA== 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=KTPu0A4yRZk6SAccQ35Jw9mugJOMEe3GiZ5yoFwzJeQ=; b=BJZWAkmloCuLZMtCZjXRXco1eDfXbYOXdugqcYxjrn81LAqE7ngiIjDgnBMxCLvl0W 5MlBl0UBZaB4vHoZQXiW28d4BupF0+dvRxU8Ga10BIWyxZ310eZ7FZgnxEZiQYbOM8t2 BwYYwm0tNZ3ZaOwpnjtmEsd23j+IFMlzAUKWdz9NM2pnxLkiHeflkcuoNnsDYjPn0APa B1T0gzwnx9bBvWb/6o0/hO18IKwLAJTRuFA8W4nUVq+3OvgEA7PaOCAYlhKs/YvfIWHb uhZW2UzvUdh+0P3de/JvMNovcMMjNwmUwSiFNjhnPvlwViIz96tkq7DwGizWc3HtvkyI v4+g== X-Gm-Message-State: APjAAAXJsW5TZmLMjPUu00kr4gj2pCvg8pan/9HmpnUQiCbKpjR4O4VV U/egpHpOLdpjGMvtUtJc5zeO3YB4X/Y= X-Received: by 2002:aa7:91c8:: with SMTP id z8mr4428298pfa.110.1553368200929; Sat, 23 Mar 2019 12:10:00 -0700 (PDT) Received: from localhost.localdomain (174-21-5-201.tukw.qwest.net. [174.21.5.201]) by smtp.gmail.com with ESMTPSA id h184sm25990703pfc.78.2019.03.23.12.09.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 12:09:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Mar 2019 12:09:16 -0700 Message-Id: <20190323190925.21324-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190323190925.21324-1-richard.henderson@linaro.org> References: <20190323190925.21324-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::544 Subject: [Qemu-devel] [PATCH 26/35] target/tricore: Use env_cpu 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" Signed-off-by: Richard Henderson --- target/tricore/cpu.h | 5 ----- target/tricore/op_helper.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index ed32622388..9ea5060a87 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -208,11 +208,6 @@ struct TriCoreCPU { CPUTriCoreState env; }; -static inline TriCoreCPU *tricore_env_get_cpu(CPUTriCoreState *env) -{ - return TRICORE_CPU(container_of(env, TriCoreCPU, env)); -} - #define ENV_OFFSET offsetof(TriCoreCPU, env) hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index ed9dc0c83e..ba2f21a6c3 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -29,7 +29,7 @@ static void QEMU_NORETURN raise_exception_sync_internal(CPUTriCoreState *env, uint32_t class, int tin, uintptr_t pc, uint32_t fcd_pc) { - CPUState *cs = CPU(tricore_env_get_cpu(env)); + CPUState *cs = env_cpu(env); /* in case we come from a helper-call we need to restore the PC */ cpu_restore_state(cs, pc, true); @@ -2800,7 +2800,7 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUTriCoreState *env, int error_code, uintptr_t pc) { - CPUState *cs = CPU(tricore_env_get_cpu(env)); + CPUState *cs = env_cpu(env); cs->exception_index = exception; env->error_code = error_code; /* now we have a real cpu fault */