From patchwork Thu Apr 18 09:50:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 237589 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 93CAC2C01D4 for ; Thu, 18 Apr 2013 19:50:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755987Ab3DRJuM (ORCPT ); Thu, 18 Apr 2013 05:50:12 -0400 Received: from mail-ia0-f174.google.com ([209.85.210.174]:57995 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119Ab3DRJuJ (ORCPT ); Thu, 18 Apr 2013 05:50:09 -0400 Received: by mail-ia0-f174.google.com with SMTP id m10so322199iam.33 for ; Thu, 18 Apr 2013 02:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=r7sGSPfDjyIdDgc4btrOlv34YUKmo75hKlJ7PsjvXoI=; b=iWNUMZQ88HITv6fQ7zFHXH2IY1MktGd6/c96TbaFlyCTLFqBL8QmihQUAjqsaC1SVj q1xlweXhkAhmS4GF1bAaHILw1CwdhLsRbLUf5jDBfy94KlgT/1gGCAs8KQP/kAbBfW+9 6x+Md+YqMk+EVneARUEht4KcwpsOoYfMwa543W2DtHRboQ0r2WJm72g0UZVMfkSBhsqZ hSI+vGZawSX++bHRD1ZyNTTDxp/t/X+P/8j+AQIuUi3BlMgdtUZ9xt3DxkuHoeR2IQrl NkZM8l/3ObfvpSC4SNYgf6JA5Gw6R+38WPIldS9EdgJ3zTy5aWOhVRtLkmoeLRXyc0lF ZfyQ== MIME-Version: 1.0 X-Received: by 10.50.18.110 with SMTP id v14mr12733899igd.109.1366278609103; Thu, 18 Apr 2013 02:50:09 -0700 (PDT) Received: by 10.64.48.231 with HTTP; Thu, 18 Apr 2013 02:50:08 -0700 (PDT) In-Reply-To: References: Date: Thu, 18 Apr 2013 11:50:08 +0200 X-Google-Sender-Auth: DuYFNBFJbH0IThuD7LhaYQCPt-0 Message-ID: Subject: Re: [PATCH 1/2] lib: Add lz4 compressor module From: Geert Uytterhoeven To: Chanho Min Cc: Andrew Morton , "Darrick J. Wong" , Bob Pearson , Richard Weinberger , Herbert Xu , "linux-kernel@vger.kernel.org" , linux-crypto@vger.kernel.org, Yann Collet , Kyungsik Lee , Chanho Min , "Linux/m68k" , sparclinux , Linux-Next Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org On Thu, Mar 14, 2013 at 10:48 AM, Chanho Min wrote: > +#ifdef __BIG_ENDIAN > +#define LZ4_NBCOMMONBYTES(val) (__builtin_clzll(val) >> 3) > +#else > +#define LZ4_NBCOMMONBYTES(val) (__builtin_ctzll(val) >> 3) > +#endif > > #else /* 32-bit */ > #define STEPSIZE 4 > @@ -83,6 +130,14 @@ typedef struct _U64_S { u64 v; } U64_S; > } while (0) > > #define LZ4_SECURECOPY LZ4_WILDCOPY > +#define HTYPE const u8* > + > +#ifdef __BIG_ENDIAN > +#define LZ4_NBCOMMONBYTES(val) (__builtin_clz(val) >> 3) > +#else > +#define LZ4_NBCOMMONBYTES(val) (__builtin_ctz(val) >> 3) > +#endif It seems at least m68k and sparc don't have the __builtin_clz() functions: m68k-allmodconfig (http://kisskb.ellerman.id.au/kisskb/buildresult/8572593/): ERROR: "__clzsi2" [lib/lz4/lz4hc_compress.ko] undefined! ERROR: "__clzsi2" [lib/lz4/lz4_compress.ko] undefined! sparc64-allmodconfig (http://kisskb.ellerman.id.au/kisskb/buildresult/8572790/): ERROR: "__clzdi2" [lib/lz4/lz4hc_compress.ko] undefined! ERROR: "__clzdi2" [lib/lz4/lz4_compress.ko] undefined! sparc-allmodconfig (http://kisskb.ellerman.id.au/kisskb/buildresult/8572795/): ERROR: "__clzdi2" [lib/lz4/lz4hc_compress.ko] undefined! ERROR: "__clzdi2" [lib/lz4/lz4_compress.ko] undefined! There may be more, hidden by build errors before reaching the link or modpost phases. The gmail-whitespace-damaged patch below fixes the m68k and sparc builds for me, does this look acceptable? Gr{oetje,eeting}s, Geert --- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/lib/lz4/lz4defs.h b/lib/lz4/lz4defs.h index abcecdc..81d3251 100644 --- a/lib/lz4/lz4defs.h +++ b/lib/lz4/lz4defs.h @@ -107,12 +107,6 @@ typedef struct _U64_S { u64 v; } U64_S; } while (0) #define HTYPE u32 -#ifdef __BIG_ENDIAN -#define LZ4_NBCOMMONBYTES(val) (__builtin_clzll(val) >> 3) -#else -#define LZ4_NBCOMMONBYTES(val) (__builtin_ctzll(val) >> 3) -#endif - #else /* 32-bit */ #define STEPSIZE 4 @@ -132,12 +126,12 @@ typedef struct _U64_S { u64 v; } U64_S; #define LZ4_SECURECOPY LZ4_WILDCOPY #define HTYPE const u8* -#ifdef __BIG_ENDIAN -#define LZ4_NBCOMMONBYTES(val) (__builtin_clz(val) >> 3) -#else -#define LZ4_NBCOMMONBYTES(val) (__builtin_ctz(val) >> 3) #endif +#ifdef __BIG_ENDIAN +#define LZ4_NBCOMMONBYTES(val) (((STEPSIZE * 8) - 1 - __fls(val)) >> 3) +#else +#define LZ4_NBCOMMONBYTES(val) (__ffs(val) >> 3) #endif #define LZ4_READ_LITTLEENDIAN_16(d, s, p) \