From 0a2f24ede92501089104b77c79026d030a190c6d Mon Sep 17 00:00:00 2001

From: Wim Taymans <wtaymans@redhat.com>

Date: Mon, 22 Jun 2015 13:29:25 +0200

Subject: [PATCH] bayer: update ORC files

Update ORC files with newest ORC to fix backup code generation error.

---

 gst/bayer/gstbayerorc-dist.c | 1376 +++++++++++++++++++++++-------------------

 1 file changed, 760 insertions(+), 616 deletions(-)

diff --git a/gst/bayer/gstbayerorc-dist.c b/gst/bayer/gstbayerorc-dist.c

index c9afb6a..e79862f 100644

--- a/gst/bayer/gstbayerorc-dist.c

+++ b/gst/bayer/gstbayerorc-dist.c

@@ -667,16 +667,21 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,

   orc_union16 var43;

 #endif

   orc_union16 var44;

-  orc_union64 var45;

-  orc_union16 var46;

+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)

+  volatile orc_union16 var45;

+#else

+  orc_union16 var45;

+#endif

+  orc_union64 var46;

   orc_union16 var47;

   orc_union16 var48;

   orc_union16 var49;

   orc_union16 var50;

   orc_union16 var51;

   orc_union16 var52;

-  orc_union32 var53;

+  orc_union16 var53;

   orc_union32 var54;

+  orc_union32 var55;

   ptr0 = (orc_union64 *) d1;

   ptr4 = (orc_union16 *) s1;

@@ -690,6 +695,9 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,

   var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */

   /* 11: loadpw */

   var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */

+  /* 16: loadpb */

+  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

+  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

   for (i = 0; i < n; i++) {

     /* 0: loadw */

@@ -697,71 +705,71 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,

     /* 1: loadw */

     var38 = ptr9[i];

     /* 2: avgub */

-    var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

-    var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

+    var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

+    var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

     /* 3: loadw */

     var39 = ptr4[i];

     /* 4: loadw */

     var40 = ptr8[i];

     /* 5: avgub */

-    var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

-    var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

+    var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

+    var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

     /* 6: loadw */

     var41 = ptr7[i];

     /* 7: copyw */

-    var48.i = var41.i;

+    var49.i = var41.i;

     /* 8: avgub */

-    var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1;

-    var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1;

+    var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1;

+    var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1;

     /* 10: andw */

-    var50.i = var49.i & var42.i;

+    var51.i = var50.i & var42.i;

     /* 12: andw */

-    var51.i = var48.i & var43.i;

+    var52.i = var49.i & var43.i;

     /* 13: orw */

-    var52.i = var51.i | var50.i;

+    var53.i = var52.i | var51.i;

     /* 14: loadw */

     var44 = ptr6[i];

     /* 15: mergebw */

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[0];

-      _dest.x2[1] = var52.x2[0];

-      var53.x2[0] = _dest.i;

+      _dest.x2[1] = var53.x2[0];

+      var54.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[1];

-      _dest.x2[1] = var52.x2[1];

-      var53.x2[1] = _dest.i;

+      _dest.x2[1] = var53.x2[1];

+      var54.x2[1] = _dest.i;

     }

-    /* 16: mergebw */

+    /* 17: mergebw */

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[0];

-      _dest.x2[1] = var42.x2[0];

-      var54.x2[0] = _dest.i;

+      _dest.x2[0] = var47.x2[0];

+      _dest.x2[1] = var45.x2[0];

+      var55.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[1];

-      _dest.x2[1] = var42.x2[1];

-      var54.x2[1] = _dest.i;

+      _dest.x2[0] = var47.x2[1];

+      _dest.x2[1] = var45.x2[1];

+      var55.x2[1] = _dest.i;

     }

-    /* 17: mergewl */

+    /* 18: mergewl */

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[0];

-      _dest.x2[1] = var54.x2[0];

-      var45.x2[0] = _dest.i;

+      _dest.x2[0] = var54.x2[0];

+      _dest.x2[1] = var55.x2[0];

+      var46.x2[0] = _dest.i;

     }

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[1];

-      _dest.x2[1] = var54.x2[1];

-      var45.x2[1] = _dest.i;

+      _dest.x2[0] = var54.x2[1];

+      _dest.x2[1] = var55.x2[1];

+      var46.x2[1] = _dest.i;

     }

-    /* 18: storeq */

-    ptr0[i] = var45;

+    /* 19: storeq */

+    ptr0[i] = var46;

   }

 }

@@ -795,16 +803,21 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex)

   orc_union16 var43;

 #endif

   orc_union16 var44;

-  orc_union64 var45;

-  orc_union16 var46;

+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)

+  volatile orc_union16 var45;

+#else

+  orc_union16 var45;

+#endif

+  orc_union64 var46;

   orc_union16 var47;

   orc_union16 var48;

   orc_union16 var49;

   orc_union16 var50;

   orc_union16 var51;

   orc_union16 var52;

-  orc_union32 var53;

+  orc_union16 var53;

   orc_union32 var54;

+  orc_union32 var55;

   ptr0 = (orc_union64 *) ex->arrays[0];

   ptr4 = (orc_union16 *) ex->arrays[4];

@@ -818,6 +831,9 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex)

   var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */

   /* 11: loadpw */

   var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */

+  /* 16: loadpb */

+  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

+  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

   for (i = 0; i < n; i++) {

     /* 0: loadw */

@@ -825,71 +841,71 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex)

     /* 1: loadw */

     var38 = ptr9[i];

     /* 2: avgub */

-    var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

-    var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

+    var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

+    var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

     /* 3: loadw */

     var39 = ptr4[i];

     /* 4: loadw */

     var40 = ptr8[i];

     /* 5: avgub */

-    var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

-    var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

+    var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

+    var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

     /* 6: loadw */

     var41 = ptr7[i];

     /* 7: copyw */

-    var48.i = var41.i;

+    var49.i = var41.i;

     /* 8: avgub */

-    var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1;

-    var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1;

+    var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1;

+    var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1;

     /* 10: andw */

-    var50.i = var49.i & var42.i;

+    var51.i = var50.i & var42.i;

     /* 12: andw */

-    var51.i = var48.i & var43.i;

+    var52.i = var49.i & var43.i;

     /* 13: orw */

-    var52.i = var51.i | var50.i;

+    var53.i = var52.i | var51.i;

     /* 14: loadw */

     var44 = ptr6[i];

     /* 15: mergebw */

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[0];

-      _dest.x2[1] = var52.x2[0];

-      var53.x2[0] = _dest.i;

+      _dest.x2[1] = var53.x2[0];

+      var54.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[1];

-      _dest.x2[1] = var52.x2[1];

-      var53.x2[1] = _dest.i;

+      _dest.x2[1] = var53.x2[1];

+      var54.x2[1] = _dest.i;

     }

-    /* 16: mergebw */

+    /* 17: mergebw */

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[0];

-      _dest.x2[1] = var42.x2[0];

-      var54.x2[0] = _dest.i;

+      _dest.x2[0] = var47.x2[0];

+      _dest.x2[1] = var45.x2[0];

+      var55.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[1];

-      _dest.x2[1] = var42.x2[1];

-      var54.x2[1] = _dest.i;

+      _dest.x2[0] = var47.x2[1];

+      _dest.x2[1] = var45.x2[1];

+      var55.x2[1] = _dest.i;

     }

-    /* 17: mergewl */

+    /* 18: mergewl */

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[0];

-      _dest.x2[1] = var54.x2[0];

-      var45.x2[0] = _dest.i;

+      _dest.x2[0] = var54.x2[0];

+      _dest.x2[1] = var55.x2[0];

+      var46.x2[0] = _dest.i;

     }

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[1];

-      _dest.x2[1] = var54.x2[1];

-      var45.x2[1] = _dest.i;

+      _dest.x2[0] = var54.x2[1];

+      _dest.x2[1] = var55.x2[1];

+      var46.x2[1] = _dest.i;

     }

-    /* 18: storeq */

-    ptr0[i] = var45;

+    /* 19: storeq */

+    ptr0[i] = var46;

   }

 }

@@ -915,11 +931,12 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,

         1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114,

         103, 101, 95, 98, 103, 95, 98, 103, 114, 97, 11, 8, 8, 12, 2, 2,

         12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14,

-        2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20,

-        2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4,

-        8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36,

-        36, 17, 92, 35, 36, 35, 21, 1, 196, 33, 6, 35, 21, 1, 196, 32,

-        34, 16, 21, 1, 195, 0, 33, 32, 2, 0,

+        2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 14, 1, 255, 0, 0,

+        0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5,

+        9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36,

+        73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 33,

+        6, 35, 21, 1, 196, 32, 34, 18, 21, 1, 195, 0, 33, 32, 2, 0,

+

       };

       p = orc_program_new_from_static_bytecode (bc);

       orc_program_set_backup_function (p, _backup_bayer_orc_merge_bg_bgra);

@@ -936,6 +953,7 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,

       orc_program_add_source (p, 2, "s6");

       orc_program_add_constant (p, 2, 0x000000ff, "c1");

       orc_program_add_constant (p, 2, 0x0000ff00, "c2");

+      orc_program_add_constant (p, 1, 0x000000ff, "c3");

       orc_program_add_temporary (p, 4, "t1");

       orc_program_add_temporary (p, 4, "t2");

       orc_program_add_temporary (p, 2, "t3");

@@ -958,7 +976,7 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,

           ORC_VAR_D1);

       orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_T4,

           ORC_VAR_D1);

-      orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_C1,

+      orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_C3,

           ORC_VAR_D1);

       orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T1,

           ORC_VAR_D1);

@@ -1021,16 +1039,21 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,

   orc_union16 var43;

 #endif

   orc_union16 var44;

-  orc_union64 var45;

-  orc_union16 var46;

+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)

+  volatile orc_union16 var45;

+#else

+  orc_union16 var45;

+#endif

+  orc_union64 var46;

   orc_union16 var47;

   orc_union16 var48;

   orc_union16 var49;

   orc_union16 var50;

   orc_union16 var51;

   orc_union16 var52;

-  orc_union32 var53;

+  orc_union16 var53;

   orc_union32 var54;

+  orc_union32 var55;

   ptr0 = (orc_union64 *) d1;

   ptr4 = (orc_union16 *) s1;

@@ -1044,6 +1067,9 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,

   var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */

   /* 11: loadpw */

   var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */

+  /* 16: loadpb */

+  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

+  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

   for (i = 0; i < n; i++) {

     /* 0: loadw */

@@ -1051,71 +1077,71 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,

     /* 1: loadw */

     var38 = ptr8[i];

     /* 2: avgub */

-    var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

-    var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

+    var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

+    var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

     /* 3: loadw */

     var39 = ptr5[i];

     /* 4: loadw */

     var40 = ptr9[i];

     /* 5: avgub */

-    var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

-    var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

+    var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

+    var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

     /* 6: loadw */

     var41 = ptr6[i];

     /* 7: copyw */

-    var48.i = var41.i;

+    var49.i = var41.i;

     /* 8: avgub */

-    var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1;

-    var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1;

+    var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1;

+    var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1;

     /* 10: andw */

-    var50.i = var49.i & var42.i;

+    var51.i = var50.i & var42.i;

     /* 12: andw */

-    var51.i = var48.i & var43.i;

+    var52.i = var49.i & var43.i;

     /* 13: orw */

-    var52.i = var51.i | var50.i;

+    var53.i = var52.i | var51.i;

     /* 14: mergebw */

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[0];

-      _dest.x2[1] = var52.x2[0];

-      var53.x2[0] = _dest.i;

+      _dest.x2[0] = var47.x2[0];

+      _dest.x2[1] = var53.x2[0];

+      var54.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[1];

-      _dest.x2[1] = var52.x2[1];

-      var53.x2[1] = _dest.i;

+      _dest.x2[0] = var47.x2[1];

+      _dest.x2[1] = var53.x2[1];

+      var54.x2[1] = _dest.i;

     }

     /* 15: loadw */

     var44 = ptr7[i];

-    /* 16: mergebw */

+    /* 17: mergebw */

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[0];

-      _dest.x2[1] = var43.x2[0];

-      var54.x2[0] = _dest.i;

+      _dest.x2[1] = var45.x2[0];

+      var55.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[1];

-      _dest.x2[1] = var43.x2[1];

-      var54.x2[1] = _dest.i;

+      _dest.x2[1] = var45.x2[1];

+      var55.x2[1] = _dest.i;

     }

-    /* 17: mergewl */

+    /* 18: mergewl */

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[0];

-      _dest.x2[1] = var54.x2[0];

-      var45.x2[0] = _dest.i;

+      _dest.x2[0] = var54.x2[0];

+      _dest.x2[1] = var55.x2[0];

+      var46.x2[0] = _dest.i;

     }

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[1];

-      _dest.x2[1] = var54.x2[1];

-      var45.x2[1] = _dest.i;

+      _dest.x2[0] = var54.x2[1];

+      _dest.x2[1] = var55.x2[1];

+      var46.x2[1] = _dest.i;

     }

-    /* 18: storeq */

-    ptr0[i] = var45;

+    /* 19: storeq */

+    ptr0[i] = var46;

   }

 }

@@ -1149,16 +1175,21 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex)

   orc_union16 var43;

 #endif

   orc_union16 var44;

-  orc_union64 var45;

-  orc_union16 var46;

+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)

+  volatile orc_union16 var45;

+#else

+  orc_union16 var45;

+#endif

+  orc_union64 var46;

   orc_union16 var47;

   orc_union16 var48;

   orc_union16 var49;

   orc_union16 var50;

   orc_union16 var51;

   orc_union16 var52;

-  orc_union32 var53;

+  orc_union16 var53;

   orc_union32 var54;

+  orc_union32 var55;

   ptr0 = (orc_union64 *) ex->arrays[0];

   ptr4 = (orc_union16 *) ex->arrays[4];

@@ -1172,6 +1203,9 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex)

   var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */

   /* 11: loadpw */

   var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */

+  /* 16: loadpb */

+  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

+  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

   for (i = 0; i < n; i++) {

     /* 0: loadw */

@@ -1179,71 +1213,71 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex)

     /* 1: loadw */

     var38 = ptr8[i];

     /* 2: avgub */

-    var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

-    var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

+    var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

+    var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

     /* 3: loadw */

     var39 = ptr5[i];

     /* 4: loadw */

     var40 = ptr9[i];

     /* 5: avgub */

-    var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

-    var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

+    var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

+    var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

     /* 6: loadw */

     var41 = ptr6[i];

     /* 7: copyw */

-    var48.i = var41.i;

+    var49.i = var41.i;

     /* 8: avgub */

-    var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1;

-    var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1;

+    var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1;

+    var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1;

     /* 10: andw */

-    var50.i = var49.i & var42.i;

+    var51.i = var50.i & var42.i;

     /* 12: andw */

-    var51.i = var48.i & var43.i;

+    var52.i = var49.i & var43.i;

     /* 13: orw */

-    var52.i = var51.i | var50.i;

+    var53.i = var52.i | var51.i;

     /* 14: mergebw */

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[0];

-      _dest.x2[1] = var52.x2[0];

-      var53.x2[0] = _dest.i;

+      _dest.x2[0] = var47.x2[0];

+      _dest.x2[1] = var53.x2[0];

+      var54.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

-      _dest.x2[0] = var46.x2[1];

-      _dest.x2[1] = var52.x2[1];

-      var53.x2[1] = _dest.i;

+      _dest.x2[0] = var47.x2[1];

+      _dest.x2[1] = var53.x2[1];

+      var54.x2[1] = _dest.i;

     }

     /* 15: loadw */

     var44 = ptr7[i];

-    /* 16: mergebw */

+    /* 17: mergebw */

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[0];

-      _dest.x2[1] = var43.x2[0];

-      var54.x2[0] = _dest.i;

+      _dest.x2[1] = var45.x2[0];

+      var55.x2[0] = _dest.i;

     }

     {

       orc_union16 _dest;

       _dest.x2[0] = var44.x2[1];

-      _dest.x2[1] = var43.x2[1];

-      var54.x2[1] = _dest.i;

+      _dest.x2[1] = var45.x2[1];

+      var55.x2[1] = _dest.i;

     }

-    /* 17: mergewl */

+    /* 18: mergewl */

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[0];

-      _dest.x2[1] = var54.x2[0];

-      var45.x2[0] = _dest.i;

+      _dest.x2[0] = var54.x2[0];

+      _dest.x2[1] = var55.x2[0];

+      var46.x2[0] = _dest.i;

     }

     {

       orc_union32 _dest;

-      _dest.x2[0] = var53.x2[1];

-      _dest.x2[1] = var54.x2[1];

-      var45.x2[1] = _dest.i;

+      _dest.x2[0] = var54.x2[1];

+      _dest.x2[1] = var55.x2[1];

+      var46.x2[1] = _dest.i;

     }

-    /* 18: storeq */

-    ptr0[i] = var45;

+    /* 19: storeq */

+    ptr0[i] = var46;

   }

 }

@@ -1269,11 +1303,12 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,

         1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114,

         103, 101, 95, 103, 114, 95, 98, 103, 114, 97, 11, 8, 8, 12, 2, 2,

         12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14,

-        2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20,

-        2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5,

-        9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36,

-        36, 17, 92, 35, 36, 35, 21, 1, 196, 33, 34, 35, 21, 1, 196, 32,

-        7, 17, 21, 1, 195, 0, 33, 32, 2, 0,

+        2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 14, 1, 255, 0, 0,

+        0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4,

+        8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36,

+        73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 33,

+        34, 35, 21, 1, 196, 32, 7, 18, 21, 1, 195, 0, 33, 32, 2, 0,

+

       };

       p = orc_program_new_from_static_bytecode (bc);

       orc_program_set_backup_function (p, _backup_bayer_orc_merge_gr_bgra);

@@ -1290,6 +1325,7 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,

       orc_program_add_source (p, 2, "s6");

       orc_program_add_constant (p, 2, 0x0000ff00, "c1");

       orc_program_add_constant (p, 2, 0x000000ff, "c2");

+      orc_program_add_constant (p, 1, 0x000000ff, "c3");

       orc_program_add_temporary (p, 4, "t1");

       orc_program_add_temporary (p, 4, "t2");

       orc_program_add_temporary (p, 2, "t3");

@@ -1312,7 +1348,7 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,

           ORC_VAR_D1);

       orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T4,

           ORC_VAR_D1);

-      orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_C2,

+      orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_C3,

           ORC_VAR_D1);

       orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T1,

           ORC_VAR_D1);

@@ -1374,17 +1410,22 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1,

 #else

   orc_union16 var43;

 #endif

+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)

+  volatile orc_union16 var44;

+#else

   orc_union16 var44;

-  orc_union64 var45;

-  orc_union16 var46;

+#endif

+  orc_union16 var45;

+  orc_union64 var46;

   orc_union16 var47;

   orc_union16 var48;

   orc_union16 var49;

   orc_union16 var50;

   orc_union16 var51;

   orc_union16 var52;

-  orc_union32 var53;

+  orc_union16 var53;

   orc_union32 var54;

+  orc_union32 var55;

   ptr0 = (orc_union64 *) d1;

   ptr4 = (orc_union16 *) s1;

@@ -1398,6 +1439,9 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1,

   var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */

   /* 11: loadpw */

   var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */

+  /* 14: loadpb */

+  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

+  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */

   for (i = 0; i < n; i++) {

     /* 0: loadw */

@@ -1405,71 +1449,71 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1,

     /* 1: loadw */

     var38 = ptr9[i];

     /* 2: avgub */

-    var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

-    var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

+    var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1;

+    var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1;

     /* 3: loadw */

     var39 = ptr4[i];

     /* 4: loadw */

     var40 = ptr8[i];

     /* 5: avgub */

-    var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

-    var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

+    var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1;

+    var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1;

     /* 6: loadw */

     var41 = ptr7[i];

     /* 7: copyw */

-    var48.i = var41.i;

+    var49.i = var41.i;

     /* 8: avgub */

-    var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1;

-    var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1;

+    var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1;

+    var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1;

     /* 10: andw */

-    var50.i = var49.i & var42.i;

+    var51.i = var50.i & var42.i;

     /* 12: andw */

-    var51.i = var48.i & var43.i;

+    var52.i = var49.i & var43.i;

     /* 13: orw */

-    var52.i = var51.i | var50.i;

-    /* 14: loadw */

-    var44 = ptr6[i];

-    /* 15: mergebw */

+    var53.i = var52.i | var51.i;

+    /* 15: loadw */

+    var45 = ptr6[i];

+    /* 16: mergebw */

     {

       orc_union16 _dest;

-      _dest.x2[0] = var42.x2[0];

-      _dest.x2[1] = var44.x2[0];

-      var53.x2[0] = _dest.i;

+      _dest.x2[0] = var44.x2[0];

+      _dest.x2[1] = var45.x2[0];

+      var54.x2[0] = _dest.i;

     }