diff options
author | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-11-11 01:25:00 +0000 |
---|---|---|
committer | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-11-11 01:25:00 +0000 |
commit | 6ab4f311ed263ae99c13d22da11bf5ea14f9b137 (patch) | |
tree | 8174f3c7a58e491466bf6a7b1a9ff17deb1a41b1 /tools/libfsimage/reiserfs | |
parent | 22ed12a0f3266df4714057f9bdf2dfc9577bf80e (diff) | |
download | xen-6ab4f311ed263ae99c13d22da11bf5ea14f9b137.tar.gz xen-6ab4f311ed263ae99c13d22da11bf5ea14f9b137.tar.bz2 xen-6ab4f311ed263ae99c13d22da11bf5ea14f9b137.zip |
[LIBFS] 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.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Diffstat (limited to 'tools/libfsimage/reiserfs')
-rw-r--r-- | tools/libfsimage/reiserfs/fsys_reiserfs.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/tools/libfsimage/reiserfs/fsys_reiserfs.c b/tools/libfsimage/reiserfs/fsys_reiserfs.c index 132821d7ac..1f7b6759df 100644 --- a/tools/libfsimage/reiserfs/fsys_reiserfs.c +++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c @@ -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 |