From patchwork Tue Sep 2 11:52:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 36455 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 98594203BE for ; Tue, 2 Sep 2014 11:54:55 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g18sf37983740oah.2 for ; Tue, 02 Sep 2014 04:54:55 -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:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=T9DxGvwHRCM2TdIu2IPmY+riAtrhHzO+2rOEW73iA0c=; b=T/Xnxbue6pYFOOtpExk91XNVgrQaarcly1EjzvcUszgm2aFt2BwVw3L67lCeTQ3cN9 FrvWcdo8VevWVz2CHOGGAtmXpEIfUpaV738x+hiYsLxehpuWvaaeGkHcnE8XXc5/DXG6 /8j6GCtbo/eFbklUdt4+VVG/px8aZwiBxyiuY7jkj/xoYz/O76av+xuEgmYe5jxtLXuW TvcOdqHhArXPE/00qrwsubgu/eowAlVRtE3vwOhCkM9ZU+09/JCcWDbJG2+V5Ad3TZkG ouh/mOxYd4z4P0T5hIrULlGaXH7GI3bn9vH7N7qQEbd9HEDsxpxAgWD3ib+ZHMYPwNFf 4cIg== X-Gm-Message-State: ALoCoQlZVOnaIETSXPkuvUyuJjUHOqsSc/Dsi93m2yzh8xJ2gk04XjpbRxLErKPneXd6u/WKXEkR X-Received: by 10.182.123.163 with SMTP id mb3mr18335624obb.32.1409658895213; Tue, 02 Sep 2014 04:54:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.106.34 with SMTP id d31ls2331505qgf.93.gmail; Tue, 02 Sep 2014 04:54:55 -0700 (PDT) X-Received: by 10.52.1.39 with SMTP id 7mr25217350vdj.17.1409658895150; Tue, 02 Sep 2014 04:54:55 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id x4si2129227vcm.78.2014.09.02.04.54.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 04:54:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id la4so6918531vcb.29 for ; Tue, 02 Sep 2014 04:54:55 -0700 (PDT) X-Received: by 10.52.246.198 with SMTP id xy6mr25095958vdc.7.1409658895087; Tue, 02 Sep 2014 04:54:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp514896vcb; Tue, 2 Sep 2014 04:54:54 -0700 (PDT) X-Received: by 10.112.50.52 with SMTP id z20mr2442650lbn.87.1409658893878; Tue, 02 Sep 2014 04:54:53 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id pm2si4739837lbc.10.2014.09.02.04.54.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Sep 2014 04:54:53 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=81.2.115.146; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XOmdh-0007K5-2K; Tue, 02 Sep 2014 12:52:45 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Mark Cave-Ayland , Richard Henderson Subject: [PATCH v2 3/3] target-sparc: is_translating_asi() is TARGET_SPARC64 only Date: Tue, 2 Sep 2014 12:52:44 +0100 Message-Id: <1409658764-28113-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1409658764-28113-1-git-send-email-peter.maydell@linaro.org> References: <1409658764-28113-1-git-send-email-peter.maydell@linaro.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.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Again, this allows us to remove an 'inline' tag that was there largely to suppress gcc warnings. Signed-off-by: Peter Maydell --- target-sparc/ldst_helper.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 2d028a5..9f65bc3 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -262,11 +262,12 @@ static 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 */ -static inline int is_translating_asi(int asi) +/* TODO: check sparc32 bits */ +static 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 target_ulong asi_address_mask(CPUSPARCState *env, int asi, target_ulong addr) {