[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH] non-x86 build fix for libfsimage
IA64 & PPC aren't making use of this right now, but it's silly to have the build fail for some trivial x86 specific assembly. I snagged the appropriate bitops for ia64 and ppc (untested) and tossed in an unoptimized option as well in case we want to make use of it. Thanks, Alex Signed-off-by: Alex Williamson <alex.williamson@xxxxxx> --- diff -r b9fa39557370 tools/libfsimage/ext2fs/fsys_ext2fs.c --- a/tools/libfsimage/ext2fs/fsys_ext2fs.c Fri Nov 10 08:58:47 2006 -0700 +++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c Fri Nov 10 10:23:57 2006 -0700 @@ -232,6 +232,7 @@ struct ext2_dir_entry #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#if defined(__i386__) || defined(__x86_64__) /* include/asm-i386/bitops.h */ /* * ffz = Find First Zero in word. Undefined if no zero exists, @@ -250,6 +251,66 @@ ffz (unsigned long word) : "r" (~word)); return word; } + +#elif defined(__ia64__) + +typedef unsigned long __u64; + +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# define ia64_popcnt(x) __builtin_popcountl(x) +#else +# define ia64_popcnt(x) \ + ({ \ + __u64 ia64_intri_res; \ + asm ("popcnt %0=%1" : "=r" (ia64_intri_res) : "r" (x)); \ + ia64_intri_res; \ + }) +#endif + +static __inline__ unsigned long +ffz (unsigned long word) +{ + unsigned long result; + + result = ia64_popcnt(word & (~word - 1)); + return result; +} + +#elif defined(__powerpc__) + +static __inline__ int +__ilog2(unsigned long x) +{ + int lz; + + asm (PPC_CNTLZL "%0,%1" : "=r" (lz) : "r" (x)); + return BITS_PER_LONG - 1 - lz; +} + +static __inline__ unsigned long +ffz (unsigned long word) +{ + if ((word = ~word) == 0) + return BITS_PER_LONG; + return __ilog2(word & -word); +} + +#else /* Unoptimized */ + +static __inline__ unsigned long +ffz (unsigned long word) +{ + unsigned long result; + + result = 0; + while(word & 1) + { + result++; + word >>= 1; + } + return result; +} +#endif /* check filesystem types and read superblock into memory buffer */ int diff -r b9fa39557370 tools/libfsimage/reiserfs/fsys_reiserfs.c --- a/tools/libfsimage/reiserfs/fsys_reiserfs.c Fri Nov 10 08:58:47 2006 -0700 +++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c Fri Nov 10 10:23:57 2006 -0700 @@ -363,6 +363,8 @@ struct fsys_reiser_info #define JOURNAL_START ((__u32 *) (INFO + 1)) #define JOURNAL_END ((__u32 *) (FSYS_BUF + FSYS_BUFLEN)) +#if defined(__i386__) || defined(__x86_64__) + #ifdef __amd64 #define BSF "bsfq" #else @@ -376,6 +378,61 @@ grub_log2 (unsigned long word) : "r" (word)); return word; } + +#elif defined(__ia64__) + +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# define ia64_popcnt(x) __builtin_popcountl(x) +#else +# define ia64_popcnt(x) \ + ({ \ + __u64 ia64_intri_res; \ + asm ("popcnt %0=%1" : "=r" (ia64_intri_res) : "r" (x)); \ + ia64_intri_res; \ + }) +#endif + +static __inline__ unsigned long +grub_log2 (unsigned long word) +{ + unsigned long result; + + result = ia64_popcnt((word - 1) & ~word); + return result; +} + +#elif defined(__powerpc__) + +static __inline__ int +__ilog2(unsigned long x) +{ + int lz; + + asm (PPC_CNTLZL "%0,%1" : "=r" (lz) : "r" (x)); + return BITS_PER_LONG - 1 - lz; +} + +static __inline__ unsigned long +grub_log2 (unsigned long word) +{ + return __ilog2(word & -word); +} + +#else /* Unoptimized */ + +static __inline__ unsigned long +grub_log2 (unsigned long word) +{ + unsigned long result = 0; + + while (!(word & 1UL)) + { + result++; + word >>= 1; + } + return result; +} +#endif #define log2 grub_log2 static __inline__ int _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |