Remove the likely/unlikely macros.

These also slow down the compress filter, its only user, by about 10%.

diff --git a/compress_filter.c b/compress_filter.c
index 2e263e87b0c6af2da12bd6226affe9f1b733e944..7bad4c25debac02e16f2df75a6f98530fd666e3b 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -53,7 +53,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                /* be careful in that heat, my dear */
                int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
                        pcd->current_gain) >> gain_shift;
                /* be careful in that heat, my dear */
                int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
                        pcd->current_gain) >> gain_shift;

-               if (unlikely(adjusted_sample > 32767)) { /* clip */
+               if (adjusted_sample > 32767) { /* clip */

                        PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
                                sample, adjusted_sample);
                        adjusted_sample = 32767;
                        PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
                                sample, adjusted_sample);
                        adjusted_sample = 32767;


@@ -63,7 +63,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                } else
                        pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
                *op++ = sample >= 0? adjusted_sample : -adjusted_sample;
                } else
                        pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
                *op++ = sample >= 0? adjusted_sample : -adjusted_sample;

-               if (likely(++pcd->num_samples & mask))
+               if (++pcd->num_samples & mask)

                        continue;
 //             PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
 //                     pcd->peak);
                        continue;
 //             PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
 //                     pcd->peak);

diff --git a/gcc-compat.h b/gcc-compat.h
index 61c3c88d1c4551a965aaa22c626ddf8fabec31ba..1cd30af2fc7219cb132aa9d0631518e4c6efa942 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -2,11 +2,9 @@
 # define __noreturn    __attribute__ ((noreturn))
 # define __malloc      __attribute__ ((malloc))
 # define __a_unused    __attribute__ ((unused))
 # define __noreturn    __attribute__ ((noreturn))
 # define __malloc      __attribute__ ((malloc))
 # define __a_unused    __attribute__ ((unused))

-# define likely(x)     __builtin_expect (!!(x), 1)
-# define unlikely(x)   __builtin_expect (!!(x), 0)
-/* 
- * p is the number of the "format string" parameter, and q is 
- * the number of the first variadic parameter 
+/*
+ * p is the number of the "format string" parameter, and q is
+ * the number of the first variadic parameter.

  */
 # define __printf(p,q) __attribute__ ((format (printf, p, q)))
 /*
  */
 # define __printf(p,q) __attribute__ ((format (printf, p, q)))
 /*