pixman: Branch 'master' - 2 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Sat Jul 10 18:05:56 PDT 2010
README | 3
pixman/pixman-combine.h.template | 152 +++++++++++++++++++--------------------
2 files changed, 78 insertions(+), 77 deletions(-)
New commits:
commit 7114b2d63bd5702c94cb8aa9401c023e550c77bc
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date: Thu Jul 1 16:54:30 2010 -0400
Make the combiner macros less likely to cause name collisions.
Protect the arguments to the combiner macros with parentheses, and
postfix their temporary variables with underscores to avoid name space
collisions with the surrounding code.
Alexander Shulgin pointed out that underscore-prefixed identifiers are
reserved for the C implementation, so we use postfix underscores
instead.
diff --git a/pixman/pixman-combine.h.template b/pixman/pixman-combine.h.template
index 2f6392f..67ed309 100644
--- a/pixman/pixman-combine.h.template
+++ b/pixman/pixman-combine.h.template
@@ -31,7 +31,7 @@
(((comp2_t) (a) * MASK) / (b))
#define ADD_UNc(x, y, t) \
- ((t) = x + y, \
+ ((t) = (x) + (y), \
(comp4_t) (comp1_t) ((t) | (0 - ((t) >> G_SHIFT))))
#define DIV_ONE_UNc(x) \
@@ -84,15 +84,15 @@
#define UNcx4_MUL_UNc(x, a) \
do \
{ \
- comp4_t r1, r2, t; \
+ comp4_t r1__, r2__, t__; \
\
- r1 = (x); \
- UNc_rb_MUL_UNc (r1, a, t); \
+ r1__ = (x); \
+ UNc_rb_MUL_UNc (r1__, (a), t__); \
\
- r2 = (x) >> G_SHIFT; \
- UNc_rb_MUL_UNc (r2, a, t); \
+ r2__ = (x) >> G_SHIFT; \
+ UNc_rb_MUL_UNc (r2__, (a), t__); \
\
- x = r1 | (r2 << G_SHIFT); \
+ (x) = r1__ | (r2__ << G_SHIFT); \
} while (0)
/*
@@ -101,19 +101,19 @@
#define UNcx4_MUL_UNc_ADD_UNcx4(x, a, y) \
do \
{ \
- comp4_t r1, r2, r3, t; \
+ comp4_t r1__, r2__, r3__, t__; \
\
- r1 = (x); \
- r2 = (y) & RB_MASK; \
- UNc_rb_MUL_UNc (r1, a, t); \
- UNc_rb_ADD_UNc_rb (r1, r2, t); \
+ r1__ = (x); \
+ r2__ = (y) & RB_MASK; \
+ UNc_rb_MUL_UNc (r1__, (a), t__); \
+ UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \
\
- r2 = (x) >> G_SHIFT; \
- r3 = ((y) >> G_SHIFT) & RB_MASK; \
- UNc_rb_MUL_UNc (r2, a, t); \
- UNc_rb_ADD_UNc_rb (r2, r3, t); \
+ r2__ = (x) >> G_SHIFT; \
+ r3__ = ((y) >> G_SHIFT) & RB_MASK; \
+ UNc_rb_MUL_UNc (r2__, (a), t__); \
+ UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \
\
- x = r1 | (r2 << G_SHIFT); \
+ (x) = r1__ | (r2__ << G_SHIFT); \
} while (0)
/*
@@ -122,21 +122,21 @@
#define UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc(x, a, y, b) \
do \
{ \
- comp4_t r1, r2, r3, t; \
+ comp4_t r1__, r2__, r3__, t__; \
\
- r1 = x; \
- r2 = y; \
- UNc_rb_MUL_UNc (r1, a, t); \
- UNc_rb_MUL_UNc (r2, b, t); \
- UNc_rb_ADD_UNc_rb (r1, r2, t); \
+ r1__ = (x); \
+ r2__ = (y); \
+ UNc_rb_MUL_UNc (r1__, (a), t__); \
+ UNc_rb_MUL_UNc (r2__, (b), t__); \
+ UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \
\
- r2 = (x >> G_SHIFT); \
- r3 = (y >> G_SHIFT); \
- UNc_rb_MUL_UNc (r2, a, t); \
- UNc_rb_MUL_UNc (r3, b, t); \
- UNc_rb_ADD_UNc_rb (r2, r3, t); \
+ r2__ = ((x) >> G_SHIFT); \
+ r3__ = ((y) >> G_SHIFT); \
+ UNc_rb_MUL_UNc (r2__, (a), t__); \
+ UNc_rb_MUL_UNc (r3__, (b), t__); \
+ UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \
\
- x = r1 | (r2 << G_SHIFT); \
+ (x) = r1__ | (r2__ << G_SHIFT); \
} while (0)
/*
@@ -145,17 +145,17 @@
#define UNcx4_MUL_UNcx4(x, a) \
do \
{ \
- comp4_t r1, r2, r3, t; \
+ comp4_t r1__, r2__, r3__, t__; \
\
- r1 = x; \
- r2 = a; \
- UNc_rb_MUL_UNc_rb (r1, r2, t); \
+ r1__ = (x); \
+ r2__ = (a); \
+ UNc_rb_MUL_UNc_rb (r1__, r2__, t__); \
\
- r2 = x >> G_SHIFT; \
- r3 = a >> G_SHIFT; \
- UNc_rb_MUL_UNc_rb (r2, r3, t); \
+ r2__ = (x) >> G_SHIFT; \
+ r3__ = (a) >> G_SHIFT; \
+ UNc_rb_MUL_UNc_rb (r2__, r3__, t__); \
\
- x = r1 | (r2 << G_SHIFT); \
+ (x) = r1__ | (r2__ << G_SHIFT); \
} while (0)
/*
@@ -164,21 +164,21 @@
#define UNcx4_MUL_UNcx4_ADD_UNcx4(x, a, y) \
do \
{ \
- comp4_t r1, r2, r3, t; \
+ comp4_t r1__, r2__, r3__, t__; \
\
- r1 = x; \
- r2 = a; \
- UNc_rb_MUL_UNc_rb (r1, r2, t); \
- r2 = y & RB_MASK; \
- UNc_rb_ADD_UNc_rb (r1, r2, t); \
+ r1__ = (x); \
+ r2__ = (a); \
+ UNc_rb_MUL_UNc_rb (r1__, r2__, t__); \
+ r2__ = (y) & RB_MASK; \
+ UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \
\
- r2 = (x >> G_SHIFT); \
- r3 = (a >> G_SHIFT); \
- UNc_rb_MUL_UNc_rb (r2, r3, t); \
- r3 = (y >> G_SHIFT) & RB_MASK; \
- UNc_rb_ADD_UNc_rb (r2, r3, t); \
+ r2__ = ((x) >> G_SHIFT); \
+ r3__ = ((a) >> G_SHIFT); \
+ UNc_rb_MUL_UNc_rb (r2__, r3__, t__); \
+ r3__ = ((y) >> G_SHIFT) & RB_MASK; \
+ UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \
\
- x = r1 | (r2 << G_SHIFT); \
+ (x) = r1__ | (r2__ << G_SHIFT); \
} while (0)
/*
@@ -187,40 +187,40 @@
#define UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc(x, a, y, b) \
do \
{ \
- comp4_t r1, r2, r3, t; \
- \
- r1 = x; \
- r2 = a; \
- UNc_rb_MUL_UNc_rb (r1, r2, t); \
- r2 = y; \
- UNc_rb_MUL_UNc (r2, b, t); \
- UNc_rb_ADD_UNc_rb (r1, r2, t); \
- \
- r2 = x >> G_SHIFT; \
- r3 = a >> G_SHIFT; \
- UNc_rb_MUL_UNc_rb (r2, r3, t); \
- r3 = y >> G_SHIFT; \
- UNc_rb_MUL_UNc (r3, b, t); \
- UNc_rb_ADD_UNc_rb (r2, r3, t); \
- \
- x = r1 | (r2 << G_SHIFT); \
+ comp4_t r1__, r2__, r3__, t__; \
+ \
+ r1__ = (x); \
+ r2__ = (a); \
+ UNc_rb_MUL_UNc_rb (r1__, r2__, t__); \
+ r2__ = (y); \
+ UNc_rb_MUL_UNc (r2__, (b), t__); \
+ UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \
+ \
+ r2__ = (x) >> G_SHIFT; \
+ r3__ = (a) >> G_SHIFT; \
+ UNc_rb_MUL_UNc_rb (r2__, r3__, t__); \
+ r3__ = (y) >> G_SHIFT; \
+ UNc_rb_MUL_UNc (r3__, (b), t__); \
+ UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \
+ \
+ x = r1__ | (r2__ << G_SHIFT); \
} while (0)
/*
- x_c = min(x_c + y_c, 255)
- */
+ x_c = min(x_c + y_c, 255)
+*/
#define UNcx4_ADD_UNcx4(x, y) \
do \
{ \
- comp4_t r1, r2, r3, t; \
+ comp4_t r1__, r2__, r3__, t__; \
\
- r1 = x & RB_MASK; \
- r2 = y & RB_MASK; \
- UNc_rb_ADD_UNc_rb (r1, r2, t); \
+ r1__ = (x) & RB_MASK; \
+ r2__ = (y) & RB_MASK; \
+ UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \
\
- r2 = (x >> G_SHIFT) & RB_MASK; \
- r3 = (y >> G_SHIFT) & RB_MASK; \
- UNc_rb_ADD_UNc_rb (r2, r3, t); \
+ r2__ = ((x) >> G_SHIFT) & RB_MASK; \
+ r3__ = ((y) >> G_SHIFT) & RB_MASK; \
+ UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \
\
- x = r1 | (r2 << G_SHIFT); \
+ x = r1__ | (r2__ << G_SHIFT); \
} while (0)
commit a92e4a6a9475e07435efb60aa2fde5fa04592d89
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date: Mon Jun 21 15:30:46 2010 -0400
Minor tweaks to README
diff --git a/README b/README
index 4497cb2..3cfbc50 100644
--- a/README
+++ b/README
@@ -6,7 +6,8 @@ mailing list:
http://lists.freedesktop.org/mailman/listinfo/pixman
-Please submit bugs and patches to the freedesktop bug tracker:
+Please send patches and bug reports either to the mailing list above,
+or file them at the freedesktop bug tracker:
https://bugs.freedesktop.org/enter_bug.cgi?product=pixman
More information about the xorg-commit
mailing list