From patchwork Mon Jun 23 23:01:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32392 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A2BC20540 for ; Mon, 23 Jun 2014 23:02:09 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rd18sf47461643iec.10 for ; Mon, 23 Jun 2014 16:02:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=R6a0eHw/06pXvP63bcMfIFrR9yjmkBExRyiwQICwINY=; b=IGr8h80WHVJ0L/Wg8YQUpGLj5cZY+lxccpqDgZc9HTJ96wuvAQTWTefBH29uPIiPR9 Wpv8b5fMnRSWO2dnUADeS8KIP8QKkCPbFTKH/lgSIHNxwkE58TdaUiV+R4aJgwfZcEz5 nWFtv6Udh+kDq7wgVCdYbJ1Y2xq9gZ1ub8vWhP5hiZy5sWXNm5N/ZXqgLdkNq495SVzb qDUUqiLSS9kDxzJtFeLQebZafbnL/mlmUCA24zLYqvS4uY9JwgoV5NvB/0mr+Ekkuyr1 ptxvqFI7LuiSILW4he0CDDAQEJ1oO+tFAT6iyBmwhDVrQqdWMRUIXLExDuIlqYcJNc/A RALw== X-Gm-Message-State: ALoCoQnKzoyvuYBnRpmU1hlA5OEMD5Uv6Zwiy3F+5kSlMupnfKYaYYhDPr95b/H/MUZ248+BbfuV X-Received: by 10.42.36.10 with SMTP id s10mr10272151icd.5.1403564529353; Mon, 23 Jun 2014 16:02:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.148 with SMTP id r20ls2146089qgd.12.gmail; Mon, 23 Jun 2014 16:02:09 -0700 (PDT) X-Received: by 10.58.46.141 with SMTP id v13mr21813355vem.18.1403564529261; Mon, 23 Jun 2014 16:02:09 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id ot8si9758753vcb.95.2014.06.23.16.02.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Jun 2014 16:02:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so6787592vcb.35 for ; Mon, 23 Jun 2014 16:02:09 -0700 (PDT) X-Received: by 10.58.30.15 with SMTP id o15mr5867446veh.34.1403564529138; Mon, 23 Jun 2014 16:02:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp163945vcb; Mon, 23 Jun 2014 16:02:08 -0700 (PDT) X-Received: by 10.229.103.130 with SMTP id k2mr2741006qco.1.1403564528752; Mon, 23 Jun 2014 16:02:08 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y19si15483824qae.27.2014.06.23.16.02.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 23 Jun 2014 16:02:08 -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; Received: from localhost ([::1]:56329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDFY-00046D-DE for patch@linaro.org; Mon, 23 Jun 2014 19:02:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDF4-0003oo-8O for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:01:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzDF0-0008JW-NV for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:01:38 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDF0-0008JO-HL for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:01:34 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WzDEx-00044i-Va; Tue, 24 Jun 2014 00:01:31 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 24 Jun 2014 00:01:31 +0100 Message-Id: <1403564491-15624-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403564491-15624-1-git-send-email-peter.maydell@linaro.org> References: <1403564491-15624-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , Mark Cave-Ayland , Richard Henderson Subject: [Qemu-devel] [PATCH 3/3] target-sparc: is_translating_asi() is TARGET_SPARC64 only X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Move the is_translating_asi() inside the TARGET_SPARC64 ifdef (and remove the unimplemented 32-bit codepath), as it is only called from TARGET_SPARC64 code. This fixes a clang 3.4 unused-function warning. Signed-off-by: Peter Maydell --- target-sparc/ldst_helper.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index f4be811..e0aee86 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -262,11 +262,12 @@ static inline target_ulong address_mask(CPUSPARCState *env1, target_ulong addr) } #endif +#ifdef TARGET_SPARC64 /* returns true if access using this ASI is to have address translated by MMU otherwise access is to raw physical address */ +/* TODO: check sparc32 bits */ static inline int is_translating_asi(int asi) { -#ifdef TARGET_SPARC64 /* Ultrasparc IIi translating asi - note this list is defined by cpu implementation */ @@ -283,13 +284,8 @@ static inline int is_translating_asi(int asi) default: return 0; } -#else - /* TODO: check sparc32 bits */ - return 0; -#endif } -#ifdef TARGET_SPARC64 static inline target_ulong asi_address_mask(CPUSPARCState *env, int asi, target_ulong addr) {