From patchwork Fri Oct 19 16:57:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 149314 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3572745lji; Fri, 19 Oct 2018 10:22:42 -0700 (PDT) X-Google-Smtp-Source: ACcGV62B3SKBkABeagFLFHIbYqivi/Z3jlRwxK9HuzcHjsK6bxPxT2FMg/mutOrs5v6we0zaUkwB X-Received: by 2002:ac8:1d11:: with SMTP id d17-v6mr33570262qtl.343.1539969762905; Fri, 19 Oct 2018 10:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539969762; cv=none; d=google.com; s=arc-20160816; b=OB2k4ogw06m1ANLLrpDWZwyUPGA9G5HaW26YH9snYUzKMNPZCAY081K8EzHt9js5AK zDprS8AJSBe/AlZkVSLuwE0u8DZu2j1GPlCuWXk7+WwJlEswwo8k0d7StLTpO5BMJTz6 YdJivV30PK4Rv6b93zf5FRTamfvYIfC1FU9OsI3ONP1sfkidJlxZEMM+V2N8zv6riFb0 rDN3bxG0jMqBpFFXN3MYjWaHQHrQx/qVst3W2vAqLf/KUc/wLCkljQ0QMBkjB5Wytgh6 yUxXEDEPKFmVbwSdhJMGM8sYCD09NFhlheND8EZN10278LVEC7/qSkRjWDtSRISZXLw5 9ykw== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=sanKIYRkVkti3wcQka/DGXpFjzn7WXR8RFYaYNqE2hg=; b=GX2fHrmXB0fI5fpyiDO4bg7JboabKYWpkMO/ofH0WN9b6zvbxekznMHEQ5kKGeq9eU 4OVg2JQqM1oNoU1NNFSS9Xi75Hn5rnRvsmMQtM1ceSxbD2Taq0OJKsXAImAdo0KGg9sd UHnTHumkHJZHY6QSRgWFeM0NnBRa/0t68FuSIWF3P1VgSblAJJQ28PHiEnJ7KXiBQwhO Od9LKJcK/r3RP5YaY4O1CK096b7b1SPCpoC2J5RxlpjvwmHOqxACom6sTIksBM/wTQ/L gWfSteNOrvvUHjDiBqoe7svL0ahXT9iPEXtAt4h+ZGRGWuDGsAlucwGqdUAJG/vZSQdq EkWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q8si263600qvh.74.2018.10.19.10.22.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Oct 2018 10:22:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:51828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDYTy-0000RO-Bd for patch@linaro.org; Fri, 19 Oct 2018 13:22:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDY8k-00047P-2Z for qemu-devel@nongnu.org; Fri, 19 Oct 2018 13:00:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDY8j-0005aO-Cm for qemu-devel@nongnu.org; Fri, 19 Oct 2018 13:00:45 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:51984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDY8j-0002bn-4W for qemu-devel@nongnu.org; Fri, 19 Oct 2018 13:00:45 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gDY5u-0006i7-Kr for qemu-devel@nongnu.org; Fri, 19 Oct 2018 17:57:50 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2018 17:57:02 +0100 Message-Id: <20181019165735.22511-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181019165735.22511-1-peter.maydell@linaro.org> References: <20181019165735.22511-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 12/45] target/arm: Make switch_mode() file-local 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" The switch_mode() function is defined in target/arm/helper.c and used only in that file and nowhere else, so we can make it file-local rather than global. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20181012144235.19646-3-peter.maydell@linaro.org --- target/arm/internals.h | 1 - target/arm/helper.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.19.1 diff --git a/target/arm/internals.h b/target/arm/internals.h index 276f2d8a8df..6b204fad51e 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -145,7 +145,6 @@ static inline int bank_number(int mode) g_assert_not_reached(); } -void switch_mode(CPUARMState *, int); void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_translate_init(void); diff --git a/target/arm/helper.c b/target/arm/helper.c index 09c31c47418..ee265892176 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -56,6 +56,8 @@ static void v8m_security_lookup(CPUARMState *env, uint32_t address, V8M_SAttributes *sattrs); #endif +static void switch_mode(CPUARMState *env, int mode); + static int vfp_gdb_get_reg(CPUARMState *env, uint8_t *buf, int reg) { int nregs; @@ -6316,7 +6318,7 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) return 0; } -void switch_mode(CPUARMState *env, int mode) +static void switch_mode(CPUARMState *env, int mode) { ARMCPU *cpu = arm_env_get_cpu(env); @@ -6338,7 +6340,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) #else -void switch_mode(CPUARMState *env, int mode) +static void switch_mode(CPUARMState *env, int mode) { int old_mode; int i;