X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=8a6dc4da2174a1c747db67dfed9347b8afa01cea;hp=dd564f5d6af1809d36f2f4e9df41e6f35fb67e56;hb=9f9d3eb4bb33782c66d52b825bb84578f74de817;hpb=0541069de2f74283d44ebb02372b60fb608795f2;ds=sidebyside diff --git a/src/util.h b/src/util.h index dd564f5d..8a6dc4da 100644 --- a/src/util.h +++ b/src/util.h @@ -10,24 +10,21 @@ #ifdef __GNUC__ # define WIMLIBAPI __attribute__((visibility("default"))) -# define NOINLINE __attribute__((noinline)) # define ALWAYS_INLINE inline __attribute__((always_inline)) +# define PACKED __attribute__((packed)) # define FORMAT(type, format_str, args_start) \ __attribute__((format(type, format_str, args_start))) # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) # define COLD __attribute__((cold)) -# define HOT __attribute__((hot)) # else # define COLD -# define HOT # endif #else # define WIMLIBAPI -# define NOINLINE # define ALWAYS_INLINE inline # define FORMAT(type, format_str, args_start) # define COLD -# define HOT +# define PACKED #endif /* __GNUC__ */ @@ -181,13 +178,25 @@ extern void print_string(const void *string, size_t len); extern int get_num_path_components(const char *path); -extern ssize_t full_write(int fd, const void *buf, size_t n); - static inline void print_byte_field(const u8 field[], size_t len) { while (len--) printf("%02hhx", *field++); } +static inline u32 bsr32(u32 n) +{ +#if defined(__x86__) || defined(__x86_64__) + asm("bsrl %0, %0;" + : "=r"(n) + : "0" (n)); + return n; +#else + u32 pow = 0; + while ((n >>= 1) != 0) + pow++; + return pow; +#endif +} #endif /* _WIMLIB_UTIL_H */