From patchwork Mon Jun 10 02:02:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 166268 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp479218ilk; Sun, 9 Jun 2019 19:31:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVJwA01fyTDMvI51gWb8xijrhIHYjlERu+zvauxmG0amGWNiLyyOk/nuMkaYkqEP8nAAMd X-Received: by 2002:a37:87c5:: with SMTP id j188mr31982205qkd.106.1560133886648; Sun, 09 Jun 2019 19:31:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560133886; cv=none; d=google.com; s=arc-20160816; b=t1ShCh/SHk/5BlGBCKXCpGTLFWXQTEqujZMEM3WymMDlOUrNg+D8qiXWHZ+KiUvlKL QgQuk3wjPJpKkvEWepLXBc2bPPAvlol/KL5+ILw4L2WgwM5w8z2NGA7M3ENdymCmhNRc 9NmeEX7AxLT1yTmwTVJ0WFfJ7GvWb0C+WJZboIhF4O8E2jdOFKsEkJRMEfLeBjnXNJSi IgZQsUUPrYYsOE6Lm5TbB8m4xkBhymk1TNnf029yc4gG/Wx3s17Tmhjs6qimHwzmUvNz Zt9zPpy6ajmDOQT5F9oIT5GRDpqoBhmbKzqqruTsHIlmmvM7/9dd3oVunCZif4+AnIl+ LCcw== 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=ZuP9P/y2awmw4izu8Ta8VFFIgoiKI0vJso4eBOFOhZo=; b=YYqoa92zVyrl2nIwS+lUWqkswUEryy4/8oYFznIRKZPIKoTer/n6DMk/dsMDZm84Zw 0UGf+JpJKlddwmx/LFBKwOzYWOAJAI4PJcBFpcSUSECChMNQcyTp9eltyNwzX+8kdTao K6BPP9f+PAAL2IF257icoOX42BitWiHnH0mS2Iaf+Xr5XxjZ9AqKRuPX2aqfgrTsFoW8 BhpGHrDhOwycuDOPv84z9LDQp1pqH750v2OpdGWIqeq+GvHHKvXR3scYGzkQFXa8uC/D CoKpmfqJy9oiRjdZCM+1dcu1UZENTIwNDGM1b04eJ6kBFtsEO0QAZZJ2fhr2K6wM0jVo EUVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wg3wk0tO; 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 n36si1888195qtb.332.2019.06.09.19.31.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jun 2019 19:31:26 -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=wg3wk0tO; 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]:39806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haA5m-0008Ok-7t for patch@linaro.org; Sun, 09 Jun 2019 22:31:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53253) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ha9eD-0006qO-1n for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ha9eA-0001ra-S7 for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:56 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:45735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ha9eA-0001qy-IR for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:54 -0400 Received: by mail-pl1-x644.google.com with SMTP id bi6so2586640plb.12 for ; Sun, 09 Jun 2019 19:02:54 -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=ZuP9P/y2awmw4izu8Ta8VFFIgoiKI0vJso4eBOFOhZo=; b=wg3wk0tOo1E7X5mKkwYr/h6I0GvSS8QhhAAEoUOahxU+PcL2hUvQzGwQCsrPTrs3ZD D/Dnzf0uQPioO2Xu7iz7UWqHvjkXtMezqKAG3T0MPyZQKPeYgW8fqu+QHKxQr3GgKnIl cFfalEzXnpsDIzqw/tQcRvw9QEqmp86/j7306JkHteJbEolJ4YkIcnniZ/FooShHdAil aBlBr7CwL4osCpBtjfRQnVxQuKEy+sEo6rppVQGekLABCohPD0QMe02hWPjnkRvW6sEh +ZvnnhQwW7HMhcZ/Ye4ZMhzt/d5v7ukX9+7W33q4v8tbsN0jkdkgV9TfHLI+QIeUN1Qa l5GA== 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=ZuP9P/y2awmw4izu8Ta8VFFIgoiKI0vJso4eBOFOhZo=; b=JKd4oZBXRMrjKzmcaotcbOycbKOGly3xidNlvc3IsDahYeCocIqW8gTXkjuLpDUvZJ FfjZUtuU+cLvGgyvNiN+/EjycFmm/vBL+bNhLO2eKd7xOYTBY629pUyIwK98UR6RwsfE 63c4cPkX1n+T50IHSoI1oWnytCpUsDSO0JcDjp2XdzsThOLD6hebXe5LeRpUKOu4PA0z 8gvkP0f75QcBL1Y/0wlQlT2FbidbUezdlu/rRH0MgsPxwVh/PKNaQ9tDemTbTcWqrCFF LJXdEO30PiA1FRF50cQzosrENn1ROBH0wTrs4GtxWYLHhdpj5DX/62Bny1seiM+zH8WW TrNQ== X-Gm-Message-State: APjAAAWoW8gE27TXWZSZbYyE9SsyLzatGyzP+J0BXphXxwOZP/p0UKMq MgycqyOP01/4BXO/33Po0t3z4hfSuBM= X-Received: by 2002:a17:902:59da:: with SMTP id d26mr8651636plj.306.1560132173370; Sun, 09 Jun 2019 19:02:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jun 2019 19:02:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jun 2019 19:02:06 -0700 Message-Id: <20190610020218.9228-28-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::644 Subject: [Qemu-devel] [PULL 27/39] target/tilegx: Use env_cpu 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 tilegx_env_get_cpu with env_archcpu. The combination CPU(tilegx_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/tilegx/cpu.h | 5 ----- linux-user/tilegx/cpu_loop.c | 2 +- target/tilegx/helper.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h index 135df63523..7f8fe7c513 100644 --- a/target/tilegx/cpu.h +++ b/target/tilegx/cpu.h @@ -138,11 +138,6 @@ typedef struct TileGXCPU { CPUTLGState env; } TileGXCPU; -static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState *env) -{ - return container_of(env, TileGXCPU, env); -} - #define ENV_OFFSET offsetof(TileGXCPU, env) /* TILE-Gx memory attributes */ diff --git a/linux-user/tilegx/cpu_loop.c b/linux-user/tilegx/cpu_loop.c index 4f39eb9ad3..d4abe29dcd 100644 --- a/linux-user/tilegx/cpu_loop.c +++ b/linux-user/tilegx/cpu_loop.c @@ -206,7 +206,7 @@ static void do_fetch(CPUTLGState *env, int trapnr, bool quad) void cpu_loop(CPUTLGState *env) { - CPUState *cs = CPU(tilegx_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr; while (1) { diff --git a/target/tilegx/helper.c b/target/tilegx/helper.c index 4964bb9111..a57a679825 100644 --- a/target/tilegx/helper.c +++ b/target/tilegx/helper.c @@ -28,7 +28,7 @@ void helper_exception(CPUTLGState *env, uint32_t excp) { - CPUState *cs = CPU(tilegx_env_get_cpu(env)); + CPUState *cs = env_cpu(env); cs->exception_index = excp; cpu_loop_exit(cs);