From patchwork Mon Jun 23 23:01:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32395 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BD17B20540 for ; Mon, 23 Jun 2014 23:07:29 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id v10sf26077886pde.3 for ; Mon, 23 Jun 2014 16:07:29 -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=NZF+dERrkD+5JDJiKgT33paKfiyCT46znb4cA7OglpQ=; b=XlKlGOZQLWpNaj8+oCaM7oBLWYcdG3QSg/IFH7gIRo7S/sEjzrdz+XQouWL45yY4wA Kh8L6TPyzxAM+VwzZ7UUfEmlRlRgiGHOAsM1+Or4GuND7bKog3Ozp9N+TrxXXOC0szEd ED2+zZT6Fnl07ofmEENOY0gVTZFGLMrqF3rUP89D5jfGHc7QBsePOSp+/df33UDGmG1P APYrTX/fQjw3UsUBAhFZdl5iVUoSh4GFgNGu17iv/UAUxnB8zSDFMpd80CxE1VBUI4eM ARvuv6v9uZkvzJ5papLT12oDq8xjq0EaCleUsgCKehcQadRDSB+eHEqYsMepQO9vTnzQ +gyA== X-Gm-Message-State: ALoCoQlotkySGz98c815yD7SOn90yo3RP378w3UZYlXwQqVD63h523XNEOgS/fstQBhPvhoUkxyp X-Received: by 10.66.142.9 with SMTP id rs9mr1204421pab.47.1403564849067; Mon, 23 Jun 2014 16:07:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.244 with SMTP id u107ls2121835qge.52.gmail; Mon, 23 Jun 2014 16:07:28 -0700 (PDT) X-Received: by 10.52.72.39 with SMTP id a7mr18249809vdv.13.1403564847861; Mon, 23 Jun 2014 16:07:27 -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 hr4si9764180veb.106.2014.06.23.16.07.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Jun 2014 16:07:27 -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 hy10so6902657vcb.1 for ; Mon, 23 Jun 2014 16:07:27 -0700 (PDT) X-Received: by 10.52.241.76 with SMTP id wg12mr18227993vdc.5.1403564847789; Mon, 23 Jun 2014 16:07:27 -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 tc5csp164246vcb; Mon, 23 Jun 2014 16:07:27 -0700 (PDT) X-Received: by 10.224.124.17 with SMTP id s17mr37795810qar.64.1403564847443; Mon, 23 Jun 2014 16:07:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w95si24701731qgd.87.2014.06.23.16.07.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 23 Jun 2014 16:07:27 -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]:56359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDKg-000810-Ve for patch@linaro.org; Mon, 23 Jun 2014 19:07:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDJt-00079G-7s for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:06:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzDJs-0001WX-Gc for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:06:37 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDJs-0001V6-Af for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:06:36 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WzDEx-00044f-UH; Tue, 24 Jun 2014 00:01:31 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 24 Jun 2014 00:01:30 +0100 Message-Id: <1403564491-15624-4-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 2/3] target-sparc: address_mask(), asi_address_mask() are 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.170 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 The address_mask() and asi_address_mask() functions are only used in TARGET_SPARC64 configs, so guard with ifdefs to avoid warnings about unused functions in 32-bit builds. Signed-off-by: Peter Maydell --- target-sparc/ldst_helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 03bd9f9..f4be811 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -250,6 +250,7 @@ static void replace_tlb_1bit_lru(SparcTLBEntry *tlb, #endif +#if defined(TARGET_SPARC64) || defined(CONFIG_USER_ONLY) static inline target_ulong address_mask(CPUSPARCState *env1, target_ulong addr) { #ifdef TARGET_SPARC64 @@ -259,6 +260,7 @@ static inline target_ulong address_mask(CPUSPARCState *env1, target_ulong addr) #endif return addr; } +#endif /* returns true if access using this ASI is to have address translated by MMU otherwise access is to raw physical address */ @@ -287,6 +289,7 @@ static inline int is_translating_asi(int asi) #endif } +#ifdef TARGET_SPARC64 static inline target_ulong asi_address_mask(CPUSPARCState *env, int asi, target_ulong addr) { @@ -296,6 +299,7 @@ static inline target_ulong asi_address_mask(CPUSPARCState *env, return addr; } } +#endif void helper_check_align(CPUSPARCState *env, target_ulong addr, uint32_t align) {