From patchwork Tue Jun 4 20:33:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 165816 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp6329469ili; Tue, 4 Jun 2019 13:35:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5106pY+hWF8nApFuX+ZfLKeU48S2BoW+RNHxt7JXy0P55Q/Sj1xjaAWOOSLizNsslj5D7 X-Received: by 2002:a05:620a:14a1:: with SMTP id x1mr28970817qkj.164.1559680551789; Tue, 04 Jun 2019 13:35:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559680551; cv=none; d=google.com; s=arc-20160816; b=iyC5yatlDXdwUDTF/ra9j7385t9wyCPuLQoGeArgfnWaqMHQmyayKhZTcxglyNd2yO gYmeolMb90O/bv8seAcp/yGg0d8br3JWR568gKdiwTG0IZ3ene/R9oDWBzVOy2xHi720 deGoG1ZmHQ/c7oXbb8brIfwoz38AsLYDhP94w7wDKcNoSEmsBKjZg6Yjss9nCbz7Pyor yIVodgIPhewUFMvhJIOVvaZjMEHXalPkeQyrsX0XSeffR/Dh8kF0kHfCaDiAIW+AFgfd DIdKdIn9c5HsSAh+3CExG7gBWPGPjFyttnWRAdFWs0wNmQfXYB2RXD3EkzVtXlkPtL9O 1flg== 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=TkngbE1sypwzNw5h/VQnw7E5NCmBkYtpc+Uhii5AlrQ=; b=iouaUN7Qh+vTbd0gK0JROI5kSsb7CCm5/yQ9AWiyTaqfGnQboWbtu9Jkt+tCarMpZl l7+amI0kZix9aGU8H4TeW8MmygkDpqrUjVTXGItpqiOUB4L68saW8MxFrXgXIVBRSG2t Hh3ltVwVs5bW+gGclmu5RGgZ7qoKEnL/dyQEFq3DNaCrn82VCP+YBrg2+wafr2qwKGWR SV4DLfVpH8Qen/4K9TiDmOlEUL8dYTmbUgDvjmymzCqY1sB0yq3g0bSzA2vqLBMGtTxa DaoaX7cJc7yFtwdx/WdgjD4iEO5G2M5lqR+7SM+hOWLrq6s7Ap2CbISZHOkJUhV+1mHT z7oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GJobI6Gd; 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 h15si764257qta.206.2019.06.04.13.35.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 04 Jun 2019 13:35:51 -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=GJobI6Gd; 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]:57615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG9v-00029L-AG for patch@linaro.org; Tue, 04 Jun 2019 16:35:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG8U-0001A2-IF for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYG8T-0004HB-BX for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:22 -0400 Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]:44166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYG8T-0004Gi-6l for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:21 -0400 Received: by mail-ot1-x343.google.com with SMTP id b7so7252002otl.11 for ; Tue, 04 Jun 2019 13:34:20 -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=TkngbE1sypwzNw5h/VQnw7E5NCmBkYtpc+Uhii5AlrQ=; b=GJobI6GdOpbwAfuPyeym7Clk4GjX2Vx31FB2NEmuZkrJ4yQotula7TKIWsO1js+eLa RvTZcitUnsRXWZnDx1Q94lWUSffXSiTOrAs62PlKPVS7lQfHEd6Jk7kkgNo/7DpjCOrK T11ZJaibMe7d6g687A+HBCNFWpz2F1TdOn62ctDp/IbTL863fI5wleWcBt8fMdVabmMa g+ABxrQRFmC8fdKQXk6GQdZL/BabDw7Rv09lWHMDoabvmoWcnuTTg4ZuaFjcVslu91ox ekbYSXJaURvwExRIVN1iGhHYOD9QtnfOGv8X3m6Q3UgQheBm+GWo0L1aUNkkr6/U5FHp ZAsg== 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=TkngbE1sypwzNw5h/VQnw7E5NCmBkYtpc+Uhii5AlrQ=; b=ZzXUR8KkiXGoyqlk/ShpylAAbLT2oRpmYSNDTbmHKCq4Hk5TXO7RCgxzbB4DC0mdqp gQl/8kXuWmf2RL/SMBloSp9Emu0lUiP1s9A/N4gvwILR21FNgS02/hy/5a3fCVeOeSIz NFw8a+8H0Avpo7VyOV/x2+YXlEZgJiOzD7t5I1VK8VPTXg9mv/dIdBKnMwD4dK4o1ZBY hxxpz4h6CsyPUOWXkAvCcEohAw0vgVutzi7Z+5IzaLRE4N6wa950UEMR6GQMTji3zxUM EVFiL0h3y3CfNs8mNp7FvafDYB80L1vectO0TfjLgQGmOxrQCbm5qEHA9Kqs1cLDQMdT io9g== X-Gm-Message-State: APjAAAVskf6cetX93UQ0KReFi8Jvib5Pue/Au9y1REzCrag+fgt7S19I XI2EqHY1KIv7iNgqyK1bt9SuthdhEseCYw== X-Received: by 2002:a9d:5e83:: with SMTP id f3mr1884658otl.90.1559680459991; Tue, 04 Jun 2019 13:34:19 -0700 (PDT) Received: from localhost.localdomain (200-56-192-86-cable.cybercable.net.mx. [200.56.192.86]) by smtp.gmail.com with ESMTPSA id h1sm5979901otj.78.2019.06.04.13.34.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 13:34:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2019 15:33:27 -0500 Message-Id: <20190604203351.27778-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190604203351.27778-1-richard.henderson@linaro.org> References: <20190604203351.27778-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::343 Subject: [Qemu-devel] [PATCH v4 15/39] target/lm32: 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" Cleanup in the boilerplate that each target must define. Replace lm32_env_get_cpu with env_archcpu. The combination CPU(lm32_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/lm32/cpu.h | 5 ----- target/lm32/helper.c | 19 ++++++------------- target/lm32/op_helper.c | 6 +++--- target/lm32/translate.c | 2 +- 4 files changed, 10 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h index ad9452eb9f..7fb65fb4b6 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -195,11 +195,6 @@ struct LM32CPU { uint32_t features; }; -static inline LM32CPU *lm32_env_get_cpu(CPULM32State *env) -{ - return container_of(env, LM32CPU, env); -} - #define ENV_OFFSET offsetof(LM32CPU, env) #ifndef CONFIG_USER_ONLY diff --git a/target/lm32/helper.c b/target/lm32/helper.c index 8cd4840052..9f3b107474 100644 --- a/target/lm32/helper.c +++ b/target/lm32/helper.c @@ -58,28 +58,23 @@ hwaddr lm32_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) void lm32_breakpoint_insert(CPULM32State *env, int idx, target_ulong address) { - LM32CPU *cpu = lm32_env_get_cpu(env); - - cpu_breakpoint_insert(CPU(cpu), address, BP_CPU, + cpu_breakpoint_insert(env_cpu(env), address, BP_CPU, &env->cpu_breakpoint[idx]); } void lm32_breakpoint_remove(CPULM32State *env, int idx) { - LM32CPU *cpu = lm32_env_get_cpu(env); - if (!env->cpu_breakpoint[idx]) { return; } - cpu_breakpoint_remove_by_ref(CPU(cpu), env->cpu_breakpoint[idx]); + cpu_breakpoint_remove_by_ref(env_cpu(env), env->cpu_breakpoint[idx]); env->cpu_breakpoint[idx] = NULL; } void lm32_watchpoint_insert(CPULM32State *env, int idx, target_ulong address, lm32_wp_t wp_type) { - LM32CPU *cpu = lm32_env_get_cpu(env); int flags = 0; switch (wp_type) { @@ -98,26 +93,24 @@ void lm32_watchpoint_insert(CPULM32State *env, int idx, target_ulong address, } if (flags != 0) { - cpu_watchpoint_insert(CPU(cpu), address, 1, flags, - &env->cpu_watchpoint[idx]); + cpu_watchpoint_insert(env_cpu(env), address, 1, flags, + &env->cpu_watchpoint[idx]); } } void lm32_watchpoint_remove(CPULM32State *env, int idx) { - LM32CPU *cpu = lm32_env_get_cpu(env); - if (!env->cpu_watchpoint[idx]) { return; } - cpu_watchpoint_remove_by_ref(CPU(cpu), env->cpu_watchpoint[idx]); + cpu_watchpoint_remove_by_ref(env_cpu(env), env->cpu_watchpoint[idx]); env->cpu_watchpoint[idx] = NULL; } static bool check_watchpoints(CPULM32State *env) { - LM32CPU *cpu = lm32_env_get_cpu(env); + LM32CPU *cpu = env_archcpu(env); int i; for (i = 0; i < cpu->num_watchpoints; i++) { diff --git a/target/lm32/op_helper.c b/target/lm32/op_helper.c index be12b11b02..d184550a7b 100644 --- a/target/lm32/op_helper.c +++ b/target/lm32/op_helper.c @@ -16,7 +16,7 @@ #if !defined(CONFIG_USER_ONLY) void raise_exception(CPULM32State *env, int index) { - CPUState *cs = CPU(lm32_env_get_cpu(env)); + CPUState *cs = env_cpu(env); cs->exception_index = index; cpu_loop_exit(cs); @@ -29,7 +29,7 @@ void HELPER(raise_exception)(CPULM32State *env, uint32_t index) void HELPER(hlt)(CPULM32State *env) { - CPUState *cs = CPU(lm32_env_get_cpu(env)); + CPUState *cs = env_cpu(env); cs->halted = 1; cs->exception_index = EXCP_HLT; @@ -39,7 +39,7 @@ void HELPER(hlt)(CPULM32State *env) void HELPER(ill)(CPULM32State *env) { #ifndef CONFIG_USER_ONLY - CPUState *cs = CPU(lm32_env_get_cpu(env)); + CPUState *cs = env_cpu(env); fprintf(stderr, "VM paused due to illegal instruction. " "Connect a debugger or switch to the monitor console " "to find out more.\n"); diff --git a/target/lm32/translate.c b/target/lm32/translate.c index f0e0e7058e..b9f2f2c4a7 100644 --- a/target/lm32/translate.c +++ b/target/lm32/translate.c @@ -1053,7 +1053,7 @@ static inline void decode(DisasContext *dc, uint32_t ir) void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) { CPULM32State *env = cs->env_ptr; - LM32CPU *cpu = lm32_env_get_cpu(env); + LM32CPU *cpu = env_archcpu(env); struct DisasContext ctx, *dc = &ctx; uint32_t pc_start; uint32_t page_start;