From 4d7ce8c5068b89b149704d005187186eb9a75dce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 21 Aug 2010 21:42:04 +0200 Subject: [PATCH] 0.10.19.4 pre-release --- configure.ac | 2 +- docs/plugins/gst-plugins-bad-plugins.args | 20 +- docs/plugins/gst-plugins-bad-plugins.hierarchy | 46 +- docs/plugins/gst-plugins-bad-plugins.interfaces | 28 +- docs/plugins/gst-plugins-bad-plugins.prerequisites | 4 +- ext/cog/gstcogorc-dist.c | 5004 +++++++++++--------- ext/cog/gstcogorc-dist.h | 8 +- po/af.po | 2 +- po/az.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ky.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mt.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- win32/common/config.h | 2 +- 42 files changed, 2812 insertions(+), 2370 deletions(-) diff --git a/configure.ac b/configure.ac index 1840dc6..fccaab3 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(GStreamer Bad Plug-ins, 0.10.19.3, +AC_INIT(GStreamer Bad Plug-ins, 0.10.19.4, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-plugins-bad) diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args index be18933..1f28478 100644 --- a/docs/plugins/gst-plugins-bad-plugins.args +++ b/docs/plugins/gst-plugins-bad-plugins.args @@ -26390,7 +26390,7 @@ rw physics water density: from 1 to 4. -4.63015e-299 +1.10363e-314 @@ -26430,7 +26430,7 @@ rw splash make a big splash in the center. -7.74861e-304 +7.13925e-321 @@ -26440,7 +26440,7 @@ rw splash make a big splash in the center. -0 +2.35064e-310 @@ -26470,7 +26470,7 @@ rw ratiox x-ratio. -1.37974e-309 +8.62498e-317 @@ -26480,7 +26480,7 @@ rw ratioy y-ratio. -1.3852e-309 +-1.30276e-224 @@ -26490,7 +26490,7 @@ rw DelayTime the delay time. -1.37974e-309 +0 @@ -26520,7 +26520,7 @@ rw Color the color of the image. -2.33349e-09 +0 @@ -26530,7 +26530,7 @@ rw Color the color of the image. -5.42746e-14 +0 @@ -26540,7 +26540,7 @@ rw Color-R the color of the image. -8.89504e-15 +2.54155e-38 @@ -27060,7 +27060,7 @@ rw blend blend factor. -4.74303e-322 +6.09249e+247 diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index 14714de..8afe942 100644 --- a/docs/plugins/gst-plugins-bad-plugins.hierarchy +++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy @@ -1,5 +1,7 @@ GObject GstColorBalanceChannel + GstMixerTrack + GstMixerOptions GstObject GstBus GstClock @@ -46,6 +48,7 @@ GObject GstBaseSrc GstDTMFSrc GstDataURISrc + GstFliteTestSrc GstPushSrc GstBaseAudioSrc GstJackAudioSrc @@ -56,6 +59,7 @@ GObject GstMMS GstMythtvSrc GstNeonhttpSrc + GstRTMPSrc GstRfbSrc GstShmSrc GstVCDSrc @@ -204,6 +208,7 @@ GObject GstGPPMux GstGSMDec GstGSMEnc + GstGmeDec GstH264Parse GstId3BaseMux GstId3Mux @@ -216,7 +221,6 @@ GObject GstKateEnc GstKateParse GstKateTag - GstKateTiger GstLiveAdder GstMJ2Mux GstMP4Mux @@ -226,11 +230,9 @@ GObject GstMimDec GstMimEnc GstModPlug - GstMpeg2enc GstMpeg4VParse GstMpegPSDemux GstMpegTSDemux - GstMplex GstMusepackDec GstMveDemux GstMveMux @@ -255,6 +257,38 @@ GObject GstAudioSegmentClip GstVideoSegmentClip GstSignalProcessor + invadarecords-com-plugins-lv2-compressor-mono + invadarecords-com-plugins-lv2-compressor-stereo + invadarecords-com-plugins-lv2-delay-mono + invadarecords-com-plugins-lv2-delay-sum + invadarecords-com-plugins-lv2-erreverb-mono + invadarecords-com-plugins-lv2-erreverb-sum + invadarecords-com-plugins-lv2-filter-hpf-mono + invadarecords-com-plugins-lv2-filter-hpf-stereo + invadarecords-com-plugins-lv2-filter-lpf-mono + invadarecords-com-plugins-lv2-filter-lpf-stereo + invadarecords-com-plugins-lv2-input + invadarecords-com-plugins-lv2-meter + invadarecords-com-plugins-lv2-phaser-mono + invadarecords-com-plugins-lv2-phaser-stereo + invadarecords-com-plugins-lv2-phaser-sum + invadarecords-com-plugins-lv2-testtone + invadarecords-com-plugins-lv2-tube-mono + invadarecords-com-plugins-lv2-tube-stereo + ladspa-Ambisonics-11-cube-decoder + ladspa-Ambisonics-11-hexagon-decoder + ladspa-Ambisonics-11-mono-panner + ladspa-Ambisonics-11-rotator + ladspa-Ambisonics-11-square-decoder + ladspa-Ambisonics-11-stereo-panner + ladspa-Ambisonics-21-panner + ladspa-Ambisonics-21-rotator + ladspa-Ambisonics-22-panner + ladspa-Ambisonics-22-rotator + ladspa-Ambisonics-31-panner + ladspa-Ambisonics-31-rotator + ladspa-Ambisonics-33-panner + ladspa-Ambisonics-33-rotator ladspa-Chorus1 ladspa-Chorus2 ladspa-G2reverb @@ -263,8 +297,14 @@ GObject ladspa-Mvclpf-2 ladspa-Mvclpf-3 ladspa-Mvclpf-4 + ladspa-Parametric1 ladspa-Phaser1 ladspa-Phaser1+LFO + ladspa-Pulse-VCO + ladspa-Rec-VCO + ladspa-Saw-VCO + ladspa-Tricardioid-to-AMB + ladspa-Virtualmic ladspa-alias ladspa-allpass-c ladspa-allpass-l diff --git a/docs/plugins/gst-plugins-bad-plugins.interfaces b/docs/plugins/gst-plugins-bad-plugins.interfaces index 1ebc1ce..547c9e2 100644 --- a/docs/plugins/gst-plugins-bad-plugins.interfaces +++ b/docs/plugins/gst-plugins-bad-plugins.interfaces @@ -2,42 +2,42 @@ GstBin GstChildProxy GstPipeline GstChildProxy GstCameraBin GstChildProxy GstImplementsInterface GstColorBalance GstTagSetter GstPhotography GstQTMoovRecover GstChildProxy +RsnDvdBin GstChildProxy GstURIHandler GstGSettingsSwitchSink GstChildProxy GstGSettingsAudioSink GstChildProxy GstGSettingsVideoSink GstChildProxy GstGSettingsSwitchSrc GstChildProxy GstGSettingsAudioSrc GstChildProxy GstGSettingsVideoSrc GstChildProxy -RsnDvdBin GstChildProxy GstURIHandler DvbBaseBin GstChildProxy GstURIHandler +GstFPSDisplaySink GstChildProxy GstAutoConvert GstChildProxy GstSDPDemux GstChildProxy -GstFPSDisplaySink GstChildProxy -GstMpeg2enc GstPreset -GstSDLVideoSink GstImplementsInterface GstXOverlay GstNavigation +GstMetadataMux GstTagSetter +GstXvidEnc GstPreset +GstVP8Enc GstTagSetter GstPreset +GstDiracEnc GstPreset +GstCDAudio GstURIHandler GstDfbVideoSink GstImplementsInterface GstNavigation GstColorBalance +GstSDLVideoSink GstImplementsInterface GstXOverlay GstNavigation VdpSink GstImplementsInterface GstNavigation GstXOverlay GstApExSink GstImplementsInterface GstMixer -GstCeltEnc GstTagSetter GstPreset -GstCDAudio GstURIHandler +GstAmrWbEnc GstPreset GstMythtvSrc GstURIHandler +GstRTMPSrc GstURIHandler GstMMS GstURIHandler GstNeonhttpSrc GstURIHandler GstVCDSrc GstURIHandler GstDataURISrc GstURIHandler -GstAmrWbEnc GstPreset -GstMetadataMux GstTagSetter GstFaac GstPreset -GstXvidEnc GstPreset -GstDiracEnc GstPreset -GstVP8Enc GstTagSetter GstPreset GstKateEnc GstTagSetter GstKateTag GstTagSetter -GstJifMux GstTagSetter -GstId3BaseMux GstTagSetter -GstId3Mux GstTagSetter +GstCeltEnc GstTagSetter GstPreset GstQTMux GstTagSetter GstMP4Mux GstTagSetter GstGPPMux GstTagSetter GstMJ2Mux GstTagSetter +GstJifMux GstTagSetter GstAsfMux GstTagSetter +GstId3BaseMux GstTagSetter +GstId3Mux GstTagSetter diff --git a/docs/plugins/gst-plugins-bad-plugins.prerequisites b/docs/plugins/gst-plugins-bad-plugins.prerequisites index c5365a7..4819672 100644 --- a/docs/plugins/gst-plugins-bad-plugins.prerequisites +++ b/docs/plugins/gst-plugins-bad-plugins.prerequisites @@ -1,8 +1,8 @@ GstChildProxy GstObject -GstImplementsInterface GstElement -GstXOverlay GstImplementsInterface GstElement GstTagSetter GstElement +GstImplementsInterface GstElement GstColorBalance GstImplementsInterface GstElement +GstXOverlay GstImplementsInterface GstElement GstMixer GstImplementsInterface GstElement GstPhotography GstImplementsInterface GstElement MXFDescriptiveMetadataFrameworkInterface MXFDescriptiveMetadata diff --git a/ext/cog/gstcogorc-dist.c b/ext/cog/gstcogorc-dist.c index a375aa2..755636d 100644 --- a/ext/cog/gstcogorc-dist.c +++ b/ext/cog/gstcogorc-dist.c @@ -48,13 +48,22 @@ typedef unsigned long orc_uint64; #endif typedef union { + orc_int16 i; + orc_int8 x2[2]; +} orc_union16; +typedef union +{ orc_int32 i; float f; + orc_int16 x2[2]; + orc_int8 x4[4]; } orc_union32; typedef union { orc_int64 i; double f; + orc_int32 x2[2]; + orc_int16 x4[4]; } orc_union64; #endif @@ -146,6 +155,17 @@ void cogorc_unpack_axyz_3 (orc_uint8 * d1, const orc_uint32 * s1, int n); #define ORC_SWAP_W(x) ((((x)&0xff)<<8) | (((x)&0xff00)>>8)) #define ORC_SWAP_L(x) ((((x)&0xff)<<24) | (((x)&0xff00)<<8) | (((x)&0xff0000)>>8) | (((x)&0xff000000)>>24)) #define ORC_PTR_OFFSET(ptr,offset) ((void *)(((unsigned char *)(ptr)) + (offset))) +#define ORC_MIN_NORMAL (1.1754944909521339405e-38) +#define ORC_DENORMAL(x) (((x) > -ORC_MIN_NORMAL && (x) < ORC_MIN_NORMAL) ? ((x)<0 ? (-0.0f) : (0.0f)) : (x)) +#define ORC_MINF(a,b) (isnan(a) ? a : isnan(b) ? b : ((a)<(b)) ? (a) : (b)) +#define ORC_MAXF(a,b) (isnan(a) ? a : isnan(b) ? b : ((a)>(b)) ? (a) : (b)) +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define ORC_RESTRICT restrict +#elif defined(__GNUC__) && __GNUC__ >= 4 +#define ORC_RESTRICT __restrict__ +#else +#define ORC_RESTRICT +#endif /* end Orc C target preamble */ @@ -157,46 +177,46 @@ cogorc_downsample_horiz_cosite_1tap (orc_uint8 * d1, const orc_uint16 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var32; + orc_int8 var33; ptr0 = (orc_int8 *) d1; - ptr4 = (orc_int16 *) s1; + ptr4 = (orc_union16 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0wb */ - var0 = (orc_uint16) var4 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var32 = ptr4[i]; + /* 1: select0wb */ + var33 = (orc_uint16) var32.i & 0xff; + /* 2: storeb */ + ptr0[i] = var33; } } #else static void -_backup_cogorc_downsample_horiz_cosite_1tap (OrcExecutor * ex) +_backup_cogorc_downsample_horiz_cosite_1tap (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var32; + orc_int8 var33; ptr0 = (orc_int8 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; + ptr4 = (orc_union16 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0wb */ - var0 = (orc_uint16) var4 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var32 = ptr4[i]; + /* 1: select0wb */ + var33 = (orc_uint16) var32.i & 0xff; + /* 2: storeb */ + ptr0[i] = var33; } } @@ -222,7 +242,8 @@ cogorc_downsample_horiz_cosite_1tap (orc_uint8 * d1, const orc_uint16 * s1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 2, "s1"); - orc_program_append (p, "select0wb", ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_D1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -248,134 +269,140 @@ cogorc_downsample_horiz_cosite_3tap (orc_uint8 * d1, const orc_uint16 * s1, const orc_uint16 * s2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int16 var5; - const orc_int16 *ptr5; - const orc_int16 var16 = 2; - const orc_int16 var17 = 2; - const orc_int16 var18 = 2; - orc_int8 var32; - orc_int8 var33; - orc_int8 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_union16 *ORC_RESTRICT ptr5; + orc_union16 var38; + orc_union16 var39; + orc_union16 var40; + orc_union16 var41; + orc_int8 var42; + orc_union16 var43; + orc_int8 var44; + orc_int8 var45; + orc_int8 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; ptr0 = (orc_int8 *) d1; - ptr4 = (orc_int16 *) s1; - ptr5 = (orc_int16 *) s2; + ptr4 = (orc_union16 *) s1; + ptr5 = (orc_union16 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: copyw */ - var35 = var4; - /* 1: select0wb */ - var32 = (orc_uint16) var35 & 0xff; - /* 2: select1wb */ - var33 = ((orc_uint16) var35 >> 8) & 0xff; - /* 3: select0wb */ - var34 = (orc_uint16) var5 & 0xff; - /* 4: convubw */ - var38 = (orc_uint8) var32; - /* 5: convubw */ - var36 = (orc_uint8) var33; + /* 0: loadw */ + var38 = ptr4[i]; + /* 1: copyw */ + var43.i = var38.i; + /* 2: select0wb */ + var44 = (orc_uint16) var43.i & 0xff; + /* 3: select1wb */ + var45 = ((orc_uint16) var43.i >> 8) & 0xff; + /* 4: loadw */ + var39 = ptr5[i]; + /* 5: select0wb */ + var46 = (orc_uint16) var39.i & 0xff; /* 6: convubw */ - var37 = (orc_uint8) var34; - /* 7: mullw */ - var39 = (var36 * var16) & 0xffff; - /* 8: addw */ - var40 = var38 + var37; - /* 9: addw */ - var41 = var40 + var39; - /* 10: addw */ - var42 = var41 + var17; - /* 11: shrsw */ - var43 = var42 >> var18; - /* 12: convsuswb */ - var0 = ORC_CLAMP_UB (var43); - *ptr0 = var0; - ptr0++; + var47.i = (orc_uint8) var44; + /* 7: convubw */ + var48.i = (orc_uint8) var45; + /* 8: convubw */ + var49.i = (orc_uint8) var46; + /* 9: loadpw */ + var40.i = 2; + /* 10: mullw */ + var50.i = (var48.i * var40.i) & 0xffff; + /* 11: addw */ + var51.i = var47.i + var49.i; + /* 12: addw */ + var52.i = var51.i + var50.i; + /* 13: loadpw */ + var41.i = 2; + /* 14: addw */ + var53.i = var52.i + var41.i; + /* 15: shrsw */ + var54.i = var53.i >> 2; + /* 16: convsuswb */ + var42 = ORC_CLAMP_UB (var54.i); + /* 17: storeb */ + ptr0[i] = var42; } } #else static void -_backup_cogorc_downsample_horiz_cosite_3tap (OrcExecutor * ex) +_backup_cogorc_downsample_horiz_cosite_3tap (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int16 var5; - const orc_int16 *ptr5; - const orc_int16 var16 = 2; - const orc_int16 var17 = 2; - const orc_int16 var18 = 2; - orc_int8 var32; - orc_int8 var33; - orc_int8 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_union16 *ORC_RESTRICT ptr5; + orc_union16 var38; + orc_union16 var39; + orc_union16 var40; + orc_union16 var41; + orc_int8 var42; + orc_union16 var43; + orc_int8 var44; + orc_int8 var45; + orc_int8 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; ptr0 = (orc_int8 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; - ptr5 = (orc_int16 *) ex->arrays[5]; + ptr4 = (orc_union16 *) ex->arrays[4]; + ptr5 = (orc_union16 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: copyw */ - var35 = var4; - /* 1: select0wb */ - var32 = (orc_uint16) var35 & 0xff; - /* 2: select1wb */ - var33 = ((orc_uint16) var35 >> 8) & 0xff; - /* 3: select0wb */ - var34 = (orc_uint16) var5 & 0xff; - /* 4: convubw */ - var38 = (orc_uint8) var32; - /* 5: convubw */ - var36 = (orc_uint8) var33; + /* 0: loadw */ + var38 = ptr4[i]; + /* 1: copyw */ + var43.i = var38.i; + /* 2: select0wb */ + var44 = (orc_uint16) var43.i & 0xff; + /* 3: select1wb */ + var45 = ((orc_uint16) var43.i >> 8) & 0xff; + /* 4: loadw */ + var39 = ptr5[i]; + /* 5: select0wb */ + var46 = (orc_uint16) var39.i & 0xff; /* 6: convubw */ - var37 = (orc_uint8) var34; - /* 7: mullw */ - var39 = (var36 * var16) & 0xffff; - /* 8: addw */ - var40 = var38 + var37; - /* 9: addw */ - var41 = var40 + var39; - /* 10: addw */ - var42 = var41 + var17; - /* 11: shrsw */ - var43 = var42 >> var18; - /* 12: convsuswb */ - var0 = ORC_CLAMP_UB (var43); - *ptr0 = var0; - ptr0++; + var47.i = (orc_uint8) var44; + /* 7: convubw */ + var48.i = (orc_uint8) var45; + /* 8: convubw */ + var49.i = (orc_uint8) var46; + /* 9: loadpw */ + var40.i = 2; + /* 10: mullw */ + var50.i = (var48.i * var40.i) & 0xffff; + /* 11: addw */ + var51.i = var47.i + var49.i; + /* 12: addw */ + var52.i = var51.i + var50.i; + /* 13: loadpw */ + var41.i = 2; + /* 14: addw */ + var53.i = var52.i + var41.i; + /* 15: shrsw */ + var54.i = var53.i >> 2; + /* 16: convsuswb */ + var42 = ORC_CLAMP_UB (var54.i); + /* 17: storeb */ + ptr0[i] = var42; } } @@ -401,9 +428,9 @@ cogorc_downsample_horiz_cosite_3tap (orc_uint8 * d1, const orc_uint16 * s1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 2, "s1"); orc_program_add_source (p, 2, "s2"); - orc_program_add_constant (p, 2, 2, "c1"); - orc_program_add_constant (p, 2, 2, "c2"); - orc_program_add_constant (p, 2, 2, "c3"); + orc_program_add_constant (p, 2, 0x00000002, "c1"); + orc_program_add_constant (p, 2, 0x00000002, "c2"); + orc_program_add_constant (p, 2, 0x00000002, "c3"); orc_program_add_temporary (p, 1, "t1"); orc_program_add_temporary (p, 1, "t2"); orc_program_add_temporary (p, 1, "t3"); @@ -411,19 +438,32 @@ cogorc_downsample_horiz_cosite_3tap (orc_uint8 * d1, const orc_uint16 * s1, orc_program_add_temporary (p, 2, "t5"); orc_program_add_temporary (p, 2, "t6"); - orc_program_append (p, "copyw", ORC_VAR_T4, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_T1, ORC_VAR_T4, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_T3, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T5, ORC_VAR_T2, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T6, ORC_VAR_T3, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C1); - orc_program_append (p, "addw", ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_T6); - orc_program_append (p, "addw", ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_T5); - orc_program_append (p, "addw", ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C2); - orc_program_append (p, "shrsw", ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C3); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T4, ORC_VAR_D1); + orc_program_append_2 (p, "copyw", 0, ORC_VAR_T4, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_T1, ORC_VAR_T4, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_T2, ORC_VAR_T4, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_T3, ORC_VAR_S2, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T5, ORC_VAR_T2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T6, ORC_VAR_T3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_T6, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_T5, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T4, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -450,104 +490,104 @@ cogorc_downsample_420_jpeg (orc_uint8 * d1, const orc_uint16 * s1, const orc_uint16 * s2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int16 var5; - const orc_int16 *ptr5; - orc_int16 var32; - orc_int8 var33; - orc_int8 var34; - orc_int8 var35; - orc_int8 var36; - orc_int8 var37; - orc_int16 var38; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_union16 *ORC_RESTRICT ptr5; + orc_union16 var37; + orc_union16 var38; orc_int8 var39; + orc_union16 var40; + orc_int8 var41; + orc_int8 var42; + orc_int8 var43; + orc_union16 var44; + orc_int8 var45; + orc_int8 var46; + orc_int8 var47; ptr0 = (orc_int8 *) d1; - ptr4 = (orc_int16 *) s1; - ptr5 = (orc_int16 *) s2; + ptr4 = (orc_union16 *) s1; + ptr5 = (orc_union16 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: copyw */ - var32 = var4; - /* 1: select0wb */ - var33 = (orc_uint16) var32 & 0xff; - /* 2: select1wb */ - var34 = ((orc_uint16) var32 >> 8) & 0xff; - /* 3: avgub */ - var37 = ((orc_uint8) var33 + (orc_uint8) var34 + 1) >> 1; - /* 4: copyw */ - var38 = var5; - /* 5: select0wb */ - var35 = (orc_uint16) var38 & 0xff; - /* 6: select1wb */ - var36 = ((orc_uint16) var38 >> 8) & 0xff; - /* 7: avgub */ - var39 = ((orc_uint8) var35 + (orc_uint8) var36 + 1) >> 1; - /* 8: avgub */ - var0 = ((orc_uint8) var37 + (orc_uint8) var39 + 1) >> 1; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var37 = ptr4[i]; + /* 1: copyw */ + var40.i = var37.i; + /* 2: select0wb */ + var41 = (orc_uint16) var40.i & 0xff; + /* 3: select1wb */ + var42 = ((orc_uint16) var40.i >> 8) & 0xff; + /* 4: avgub */ + var43 = ((orc_uint8) var41 + (orc_uint8) var42 + 1) >> 1; + /* 5: loadw */ + var38 = ptr5[i]; + /* 6: copyw */ + var44.i = var38.i; + /* 7: select0wb */ + var45 = (orc_uint16) var44.i & 0xff; + /* 8: select1wb */ + var46 = ((orc_uint16) var44.i >> 8) & 0xff; + /* 9: avgub */ + var47 = ((orc_uint8) var45 + (orc_uint8) var46 + 1) >> 1; + /* 10: avgub */ + var39 = ((orc_uint8) var43 + (orc_uint8) var47 + 1) >> 1; + /* 11: storeb */ + ptr0[i] = var39; } } #else static void -_backup_cogorc_downsample_420_jpeg (OrcExecutor * ex) +_backup_cogorc_downsample_420_jpeg (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int16 var5; - const orc_int16 *ptr5; - orc_int16 var32; - orc_int8 var33; - orc_int8 var34; - orc_int8 var35; - orc_int8 var36; - orc_int8 var37; - orc_int16 var38; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_union16 *ORC_RESTRICT ptr5; + orc_union16 var37; + orc_union16 var38; orc_int8 var39; + orc_union16 var40; + orc_int8 var41; + orc_int8 var42; + orc_int8 var43; + orc_union16 var44; + orc_int8 var45; + orc_int8 var46; + orc_int8 var47; ptr0 = (orc_int8 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; - ptr5 = (orc_int16 *) ex->arrays[5]; + ptr4 = (orc_union16 *) ex->arrays[4]; + ptr5 = (orc_union16 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: copyw */ - var32 = var4; - /* 1: select0wb */ - var33 = (orc_uint16) var32 & 0xff; - /* 2: select1wb */ - var34 = ((orc_uint16) var32 >> 8) & 0xff; - /* 3: avgub */ - var37 = ((orc_uint8) var33 + (orc_uint8) var34 + 1) >> 1; - /* 4: copyw */ - var38 = var5; - /* 5: select0wb */ - var35 = (orc_uint16) var38 & 0xff; - /* 6: select1wb */ - var36 = ((orc_uint16) var38 >> 8) & 0xff; - /* 7: avgub */ - var39 = ((orc_uint8) var35 + (orc_uint8) var36 + 1) >> 1; - /* 8: avgub */ - var0 = ((orc_uint8) var37 + (orc_uint8) var39 + 1) >> 1; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var37 = ptr4[i]; + /* 1: copyw */ + var40.i = var37.i; + /* 2: select0wb */ + var41 = (orc_uint16) var40.i & 0xff; + /* 3: select1wb */ + var42 = ((orc_uint16) var40.i >> 8) & 0xff; + /* 4: avgub */ + var43 = ((orc_uint8) var41 + (orc_uint8) var42 + 1) >> 1; + /* 5: loadw */ + var38 = ptr5[i]; + /* 6: copyw */ + var44.i = var38.i; + /* 7: select0wb */ + var45 = (orc_uint16) var44.i & 0xff; + /* 8: select1wb */ + var46 = ((orc_uint16) var44.i >> 8) & 0xff; + /* 9: avgub */ + var47 = ((orc_uint8) var45 + (orc_uint8) var46 + 1) >> 1; + /* 10: avgub */ + var39 = ((orc_uint8) var43 + (orc_uint8) var47 + 1) >> 1; + /* 11: storeb */ + ptr0[i] = var39; } } @@ -578,15 +618,24 @@ cogorc_downsample_420_jpeg (orc_uint8 * d1, const orc_uint16 * s1, orc_program_add_temporary (p, 1, "t4"); orc_program_add_temporary (p, 1, "t5"); - orc_program_append (p, "copyw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_D1); - orc_program_append (p, "avgub", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3); - orc_program_append (p, "copyw", ORC_VAR_T1, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_T5, ORC_VAR_T1, ORC_VAR_D1); - orc_program_append (p, "avgub", ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_T5); - orc_program_append (p, "avgub", ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T4); + orc_program_append_2 (p, "copyw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_T2, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_T3, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "avgub", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3, + ORC_VAR_D1); + orc_program_append_2 (p, "copyw", 0, ORC_VAR_T1, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_T4, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_T5, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "avgub", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_T5, + ORC_VAR_D1); + orc_program_append_2 (p, "avgub", 0, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T4, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -613,56 +662,56 @@ cogorc_downsample_vert_halfsite_2tap (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var32; + orc_int8 var33; + orc_int8 var34; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: avgub */ - var0 = ((orc_uint8) var4 + (orc_uint8) var5 + 1) >> 1; - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var32 = ptr4[i]; + /* 1: loadb */ + var33 = ptr5[i]; + /* 2: avgub */ + var34 = ((orc_uint8) var32 + (orc_uint8) var33 + 1) >> 1; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_downsample_vert_halfsite_2tap (OrcExecutor * ex) +_backup_cogorc_downsample_vert_halfsite_2tap (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var32; + orc_int8 var33; + orc_int8 var34; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: avgub */ - var0 = ((orc_uint8) var4 + (orc_uint8) var5 + 1) >> 1; - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var32 = ptr4[i]; + /* 1: loadb */ + var33 = ptr5[i]; + /* 2: avgub */ + var34 = ((orc_uint8) var32 + (orc_uint8) var33 + 1) >> 1; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -689,7 +738,8 @@ cogorc_downsample_vert_halfsite_2tap (orc_uint8 * d1, const orc_uint8 * s1, orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_append (p, "avgub", ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_S2); + orc_program_append_2 (p, "avgub", 0, ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_S2, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -716,25 +766,24 @@ cogorc_downsample_vert_cosite_3tap (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const orc_int16 var16 = 2; - const orc_int16 var17 = 2; - const orc_int16 var18 = 2; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var35; + orc_int8 var36; + orc_int8 var37; + orc_union16 var38; + orc_union16 var39; + orc_int8 var40; + orc_union16 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -742,61 +791,64 @@ cogorc_downsample_vert_cosite_3tap (orc_uint8 * d1, const orc_uint8 * s1, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; + /* 0: loadb */ + var35 = ptr4[i]; /* 1: convubw */ - var33 = (orc_uint8) var5; - /* 2: convubw */ - var34 = (orc_uint8) var6; - /* 3: mullw */ - var35 = (var33 * var16) & 0xffff; - /* 4: addw */ - var36 = var32 + var34; - /* 5: addw */ - var37 = var36 + var35; - /* 6: addw */ - var38 = var37 + var17; - /* 7: shrsw */ - var39 = var38 >> var18; - /* 8: convsuswb */ - var0 = ORC_CLAMP_UB (var39); - *ptr0 = var0; - ptr0++; + var41.i = (orc_uint8) var35; + /* 2: loadb */ + var36 = ptr5[i]; + /* 3: convubw */ + var42.i = (orc_uint8) var36; + /* 4: loadb */ + var37 = ptr6[i]; + /* 5: convubw */ + var43.i = (orc_uint8) var37; + /* 6: loadpw */ + var38.i = 2; + /* 7: mullw */ + var44.i = (var42.i * var38.i) & 0xffff; + /* 8: addw */ + var45.i = var41.i + var43.i; + /* 9: addw */ + var46.i = var45.i + var44.i; + /* 10: loadpw */ + var39.i = 2; + /* 11: addw */ + var47.i = var46.i + var39.i; + /* 12: shrsw */ + var48.i = var47.i >> 2; + /* 13: convsuswb */ + var40 = ORC_CLAMP_UB (var48.i); + /* 14: storeb */ + ptr0[i] = var40; } } #else static void -_backup_cogorc_downsample_vert_cosite_3tap (OrcExecutor * ex) +_backup_cogorc_downsample_vert_cosite_3tap (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const orc_int16 var16 = 2; - const orc_int16 var17 = 2; - const orc_int16 var18 = 2; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var35; + orc_int8 var36; + orc_int8 var37; + orc_union16 var38; + orc_union16 var39; + orc_int8 var40; + orc_union16 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -804,32 +856,36 @@ _backup_cogorc_downsample_vert_cosite_3tap (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; + /* 0: loadb */ + var35 = ptr4[i]; /* 1: convubw */ - var33 = (orc_uint8) var5; - /* 2: convubw */ - var34 = (orc_uint8) var6; - /* 3: mullw */ - var35 = (var33 * var16) & 0xffff; - /* 4: addw */ - var36 = var32 + var34; - /* 5: addw */ - var37 = var36 + var35; - /* 6: addw */ - var38 = var37 + var17; - /* 7: shrsw */ - var39 = var38 >> var18; - /* 8: convsuswb */ - var0 = ORC_CLAMP_UB (var39); - *ptr0 = var0; - ptr0++; + var41.i = (orc_uint8) var35; + /* 2: loadb */ + var36 = ptr5[i]; + /* 3: convubw */ + var42.i = (orc_uint8) var36; + /* 4: loadb */ + var37 = ptr6[i]; + /* 5: convubw */ + var43.i = (orc_uint8) var37; + /* 6: loadpw */ + var38.i = 2; + /* 7: mullw */ + var44.i = (var42.i * var38.i) & 0xffff; + /* 8: addw */ + var45.i = var41.i + var43.i; + /* 9: addw */ + var46.i = var45.i + var44.i; + /* 10: loadpw */ + var39.i = 2; + /* 11: addw */ + var47.i = var46.i + var39.i; + /* 12: shrsw */ + var48.i = var47.i >> 2; + /* 13: convsuswb */ + var40 = ORC_CLAMP_UB (var48.i); + /* 14: storeb */ + ptr0[i] = var40; } } @@ -856,22 +912,31 @@ cogorc_downsample_vert_cosite_3tap (orc_uint8 * d1, const orc_uint8 * s1, orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); - orc_program_add_constant (p, 2, 2, "c1"); - orc_program_add_constant (p, 2, 2, "c2"); - orc_program_add_constant (p, 2, 2, "c3"); + orc_program_add_constant (p, 2, 0x00000002, "c1"); + orc_program_add_constant (p, 2, 0x00000002, "c2"); + orc_program_add_constant (p, 2, 0x00000002, "c3"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); orc_program_add_temporary (p, 2, "t3"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T3); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2); - orc_program_append (p, "shrsw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C3); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T3, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -899,31 +964,30 @@ cogorc_downsample_vert_halfsite_4tap (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, const orc_uint8 * s4, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var7; - const orc_int8 *ptr7; - const orc_int16 var16 = 26; - const orc_int16 var17 = 6; - const orc_int16 var18 = 32; - const orc_int16 var19 = 6; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + const orc_int8 *ORC_RESTRICT ptr7; + orc_int8 var36; + orc_int8 var37; + orc_int8 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -932,75 +996,80 @@ cogorc_downsample_vert_halfsite_4tap (orc_uint8 * d1, const orc_uint8 * s1, ptr7 = (orc_int8 *) s4; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - var7 = *ptr7; - ptr7++; - /* 0: convubw */ - var32 = (orc_uint8) var4; + /* 0: loadb */ + var36 = ptr4[i]; /* 1: convubw */ - var33 = (orc_uint8) var5; - /* 2: convubw */ - var34 = (orc_uint8) var6; + var44.i = (orc_uint8) var36; + /* 2: loadb */ + var37 = ptr5[i]; /* 3: convubw */ - var35 = (orc_uint8) var7; - /* 4: addw */ - var36 = var33 + var34; - /* 5: mullw */ - var37 = (var36 * var16) & 0xffff; - /* 6: addw */ - var38 = var32 + var35; - /* 7: mullw */ - var39 = (var38 * var17) & 0xffff; + var45.i = (orc_uint8) var37; + /* 4: loadb */ + var38 = ptr6[i]; + /* 5: convubw */ + var46.i = (orc_uint8) var38; + /* 6: loadb */ + var39 = ptr7[i]; + /* 7: convubw */ + var47.i = (orc_uint8) var39; /* 8: addw */ - var40 = var37 + var39; - /* 9: addw */ - var41 = var40 + var18; - /* 10: shrsw */ - var42 = var41 >> var19; - /* 11: convsuswb */ - var0 = ORC_CLAMP_UB (var42); - *ptr0 = var0; - ptr0++; + var48.i = var45.i + var46.i; + /* 9: loadpw */ + var40.i = 26; + /* 10: mullw */ + var49.i = (var48.i * var40.i) & 0xffff; + /* 11: addw */ + var50.i = var44.i + var47.i; + /* 12: loadpw */ + var41.i = 6; + /* 13: mullw */ + var51.i = (var50.i * var41.i) & 0xffff; + /* 14: addw */ + var52.i = var49.i + var51.i; + /* 15: loadpw */ + var42.i = 32; + /* 16: addw */ + var53.i = var52.i + var42.i; + /* 17: shrsw */ + var54.i = var53.i >> 6; + /* 18: convsuswb */ + var43 = ORC_CLAMP_UB (var54.i); + /* 19: storeb */ + ptr0[i] = var43; } } #else static void -_backup_cogorc_downsample_vert_halfsite_4tap (OrcExecutor * ex) +_backup_cogorc_downsample_vert_halfsite_4tap (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var7; - const orc_int8 *ptr7; - const orc_int16 var16 = 26; - const orc_int16 var17 = 6; - const orc_int16 var18 = 32; - const orc_int16 var19 = 6; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + const orc_int8 *ORC_RESTRICT ptr7; + orc_int8 var36; + orc_int8 var37; + orc_int8 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -1009,40 +1078,46 @@ _backup_cogorc_downsample_vert_halfsite_4tap (OrcExecutor * ex) ptr7 = (orc_int8 *) ex->arrays[7]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - var7 = *ptr7; - ptr7++; - /* 0: convubw */ - var32 = (orc_uint8) var4; + /* 0: loadb */ + var36 = ptr4[i]; /* 1: convubw */ - var33 = (orc_uint8) var5; - /* 2: convubw */ - var34 = (orc_uint8) var6; + var44.i = (orc_uint8) var36; + /* 2: loadb */ + var37 = ptr5[i]; /* 3: convubw */ - var35 = (orc_uint8) var7; - /* 4: addw */ - var36 = var33 + var34; - /* 5: mullw */ - var37 = (var36 * var16) & 0xffff; - /* 6: addw */ - var38 = var32 + var35; - /* 7: mullw */ - var39 = (var38 * var17) & 0xffff; + var45.i = (orc_uint8) var37; + /* 4: loadb */ + var38 = ptr6[i]; + /* 5: convubw */ + var46.i = (orc_uint8) var38; + /* 6: loadb */ + var39 = ptr7[i]; + /* 7: convubw */ + var47.i = (orc_uint8) var39; /* 8: addw */ - var40 = var37 + var39; - /* 9: addw */ - var41 = var40 + var18; - /* 10: shrsw */ - var42 = var41 >> var19; - /* 11: convsuswb */ - var0 = ORC_CLAMP_UB (var42); - *ptr0 = var0; - ptr0++; + var48.i = var45.i + var46.i; + /* 9: loadpw */ + var40.i = 26; + /* 10: mullw */ + var49.i = (var48.i * var40.i) & 0xffff; + /* 11: addw */ + var50.i = var44.i + var47.i; + /* 12: loadpw */ + var41.i = 6; + /* 13: mullw */ + var51.i = (var50.i * var41.i) & 0xffff; + /* 14: addw */ + var52.i = var49.i + var51.i; + /* 15: loadpw */ + var42.i = 32; + /* 16: addw */ + var53.i = var52.i + var42.i; + /* 17: shrsw */ + var54.i = var53.i >> 6; + /* 18: convsuswb */ + var43 = ORC_CLAMP_UB (var54.i); + /* 19: storeb */ + ptr0[i] = var43; } } @@ -1070,27 +1145,39 @@ cogorc_downsample_vert_halfsite_4tap (orc_uint8 * d1, const orc_uint8 * s1, orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); orc_program_add_source (p, 1, "s4"); - orc_program_add_constant (p, 2, 26, "c1"); - orc_program_add_constant (p, 2, 6, "c2"); - orc_program_add_constant (p, 2, 32, "c3"); - orc_program_add_constant (p, 2, 6, "c4"); + orc_program_add_constant (p, 2, 0x0000001a, "c1"); + orc_program_add_constant (p, 2, 0x00000006, "c2"); + orc_program_add_constant (p, 2, 0x00000020, "c3"); + orc_program_add_constant (p, 2, 0x00000006, "c4"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); orc_program_add_temporary (p, 2, "t3"); orc_program_add_temporary (p, 2, "t4"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "convubw", ORC_VAR_T4, ORC_VAR_S4, ORC_VAR_D1); - orc_program_append (p, "addw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T4); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2); - orc_program_append (p, "addw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T1); - orc_program_append (p, "addw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C3); - orc_program_append (p, "shrsw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C4); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T4, ORC_VAR_S4, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T4, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C4, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T2, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -1118,52 +1205,52 @@ void cogorc_upsample_horiz_cosite_1tap (guint8 * d1, const orc_uint8 * s1, int n) { int i; - orc_int16 var0; - orc_int16 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var32; + orc_union16 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + orc_int8 var33; + orc_union16 var34; + orc_int8 var35; - ptr0 = (orc_int16 *) d1; + ptr0 = (orc_union16 *) d1; ptr4 = (orc_int8 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: copyb */ - var32 = var4; - /* 1: mergebw */ - var0 = ((orc_uint8) var32) | ((orc_uint8) var32 << 8); - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var33 = ptr4[i]; + /* 1: copyb */ + var35 = var33; + /* 2: mergebw */ + var34.i = ((orc_uint8) var35) | ((orc_uint8) var35 << 8); + /* 3: storew */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_upsample_horiz_cosite_1tap (OrcExecutor * ex) +_backup_cogorc_upsample_horiz_cosite_1tap (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int16 var0; - orc_int16 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var32; + orc_union16 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + orc_int8 var33; + orc_union16 var34; + orc_int8 var35; - ptr0 = (orc_int16 *) ex->arrays[0]; + ptr0 = (orc_union16 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: copyb */ - var32 = var4; - /* 1: mergebw */ - var0 = ((orc_uint8) var32) | ((orc_uint8) var32 << 8); - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var33 = ptr4[i]; + /* 1: copyb */ + var35 = var33; + /* 2: mergebw */ + var34.i = ((orc_uint8) var35) | ((orc_uint8) var35 << 8); + /* 3: storew */ + ptr0[i] = var34; } } @@ -1189,8 +1276,10 @@ cogorc_upsample_horiz_cosite_1tap (guint8 * d1, const orc_uint8 * s1, int n) orc_program_add_source (p, 1, "s1"); orc_program_add_temporary (p, 1, "t1"); - orc_program_append (p, "copyb", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mergebw", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T1); + orc_program_append_2 (p, "copyb", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T1, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -1216,68 +1305,68 @@ cogorc_upsample_horiz_cosite (guint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n) { int i; - orc_int16 var0; - orc_int16 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var32; - orc_int8 var33; + orc_union16 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var34; + orc_int8 var35; + orc_union16 var36; + orc_int8 var37; + orc_int8 var38; - ptr0 = (orc_int16 *) d1; + ptr0 = (orc_union16 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: copyb */ - var32 = var4; - /* 1: avgub */ - var33 = ((orc_uint8) var32 + (orc_uint8) var5 + 1) >> 1; - /* 2: mergebw */ - var0 = ((orc_uint8) var32) | ((orc_uint8) var33 << 8); - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: copyb */ + var37 = var34; + /* 2: loadb */ + var35 = ptr5[i]; + /* 3: avgub */ + var38 = ((orc_uint8) var37 + (orc_uint8) var35 + 1) >> 1; + /* 4: mergebw */ + var36.i = ((orc_uint8) var37) | ((orc_uint8) var38 << 8); + /* 5: storew */ + ptr0[i] = var36; } } #else static void -_backup_cogorc_upsample_horiz_cosite (OrcExecutor * ex) +_backup_cogorc_upsample_horiz_cosite (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int16 var0; - orc_int16 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var32; - orc_int8 var33; + orc_union16 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var34; + orc_int8 var35; + orc_union16 var36; + orc_int8 var37; + orc_int8 var38; - ptr0 = (orc_int16 *) ex->arrays[0]; + ptr0 = (orc_union16 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: copyb */ - var32 = var4; - /* 1: avgub */ - var33 = ((orc_uint8) var32 + (orc_uint8) var5 + 1) >> 1; - /* 2: mergebw */ - var0 = ((orc_uint8) var32) | ((orc_uint8) var33 << 8); - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: copyb */ + var37 = var34; + /* 2: loadb */ + var35 = ptr5[i]; + /* 3: avgub */ + var38 = ((orc_uint8) var37 + (orc_uint8) var35 + 1) >> 1; + /* 4: mergebw */ + var36.i = ((orc_uint8) var37) | ((orc_uint8) var38 << 8); + /* 5: storew */ + ptr0[i] = var36; } } @@ -1305,9 +1394,12 @@ cogorc_upsample_horiz_cosite (guint8 * d1, const orc_uint8 * s1, orc_program_add_temporary (p, 1, "t1"); orc_program_add_temporary (p, 1, "t2"); - orc_program_append (p, "copyb", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "avgub", ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_S2); - orc_program_append (p, "mergebw", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2); + orc_program_append_2 (p, "copyb", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "avgub", 0, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_S2, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -1334,56 +1426,56 @@ cogorc_upsample_vert_avgub (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var32; + orc_int8 var33; + orc_int8 var34; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: avgub */ - var0 = ((orc_uint8) var4 + (orc_uint8) var5 + 1) >> 1; - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var32 = ptr4[i]; + /* 1: loadb */ + var33 = ptr5[i]; + /* 2: avgub */ + var34 = ((orc_uint8) var32 + (orc_uint8) var33 + 1) >> 1; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_upsample_vert_avgub (OrcExecutor * ex) +_backup_cogorc_upsample_vert_avgub (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var32; + orc_int8 var33; + orc_int8 var34; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: avgub */ - var0 = ((orc_uint8) var4 + (orc_uint8) var5 + 1) >> 1; - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var32 = ptr4[i]; + /* 1: loadb */ + var33 = ptr5[i]; + /* 2: avgub */ + var34 = ((orc_uint8) var32 + (orc_uint8) var33 + 1) >> 1; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -1409,7 +1501,8 @@ cogorc_upsample_vert_avgub (orc_uint8 * d1, const orc_uint8 * s1, orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_append (p, "avgub", ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_S2); + orc_program_append_2 (p, "avgub", 0, ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_S2, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -1435,46 +1528,46 @@ void orc_unpack_yuyv_y (orc_uint8 * d1, const orc_uint16 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var32; + orc_int8 var33; ptr0 = (orc_int8 *) d1; - ptr4 = (orc_int16 *) s1; + ptr4 = (orc_union16 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0wb */ - var0 = (orc_uint16) var4 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var32 = ptr4[i]; + /* 1: select0wb */ + var33 = (orc_uint16) var32.i & 0xff; + /* 2: storeb */ + ptr0[i] = var33; } } #else static void -_backup_orc_unpack_yuyv_y (OrcExecutor * ex) +_backup_orc_unpack_yuyv_y (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var32; + orc_int8 var33; ptr0 = (orc_int8 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; + ptr4 = (orc_union16 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0wb */ - var0 = (orc_uint16) var4 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var32 = ptr4[i]; + /* 1: select0wb */ + var33 = (orc_uint16) var32.i & 0xff; + /* 2: storeb */ + ptr0[i] = var33; } } @@ -1498,7 +1591,8 @@ orc_unpack_yuyv_y (orc_uint8 * d1, const orc_uint16 * s1, int n) orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 2, "s1"); - orc_program_append (p, "select0wb", ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_D1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -1523,52 +1617,52 @@ void orc_unpack_yuyv_u (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_orc_unpack_yuyv_u (OrcExecutor * ex) +_backup_orc_unpack_yuyv_u (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -1593,8 +1687,10 @@ orc_unpack_yuyv_u (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select0lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select0lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -1619,52 +1715,52 @@ void orc_unpack_yuyv_v (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_orc_unpack_yuyv_v (OrcExecutor * ex) +_backup_orc_unpack_yuyv_v (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -1689,8 +1785,10 @@ orc_unpack_yuyv_v (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select1lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select1lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -1716,96 +1814,96 @@ orc_pack_yuyv (orc_uint32 * d1, const guint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int n) { int i; - orc_union32 var0; - orc_union32 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var32; - orc_int8 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; + orc_union32 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_union16 var37; + orc_int8 var38; + orc_int8 var39; + orc_union32 var40; + orc_union16 var41; + orc_int8 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; ptr0 = (orc_union32 *) d1; - ptr4 = (orc_int16 *) s1; + ptr4 = (orc_union16 *) s1; ptr5 = (orc_int8 *) s2; ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: copyw */ - var36 = var4; - /* 1: select0wb */ - var32 = (orc_uint16) var36 & 0xff; - /* 2: select1wb */ - var33 = ((orc_uint16) var36 >> 8) & 0xff; - /* 3: mergebw */ - var34 = ((orc_uint8) var32) | ((orc_uint8) var5 << 8); - /* 4: mergebw */ - var35 = ((orc_uint8) var33) | ((orc_uint8) var6 << 8); - /* 5: mergewl */ - var0.i = ((orc_uint16) var34) | ((orc_uint16) var35 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var37 = ptr4[i]; + /* 1: copyw */ + var41.i = var37.i; + /* 2: select0wb */ + var42 = (orc_uint16) var41.i & 0xff; + /* 3: select1wb */ + var43 = ((orc_uint16) var41.i >> 8) & 0xff; + /* 4: loadb */ + var38 = ptr5[i]; + /* 5: mergebw */ + var44.i = ((orc_uint8) var42) | ((orc_uint8) var38 << 8); + /* 6: loadb */ + var39 = ptr6[i]; + /* 7: mergebw */ + var45.i = ((orc_uint8) var43) | ((orc_uint8) var39 << 8); + /* 8: mergewl */ + var40.i = ((orc_uint16) var44.i) | ((orc_uint16) var45.i << 16); + /* 9: storel */ + ptr0[i] = var40; } } #else static void -_backup_orc_pack_yuyv (OrcExecutor * ex) +_backup_orc_pack_yuyv (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_union32 var0; - orc_union32 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var32; - orc_int8 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; + orc_union32 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_union16 var37; + orc_int8 var38; + orc_int8 var39; + orc_union32 var40; + orc_union16 var41; + orc_int8 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; ptr0 = (orc_union32 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; + ptr4 = (orc_union16 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: copyw */ - var36 = var4; - /* 1: select0wb */ - var32 = (orc_uint16) var36 & 0xff; - /* 2: select1wb */ - var33 = ((orc_uint16) var36 >> 8) & 0xff; - /* 3: mergebw */ - var34 = ((orc_uint8) var32) | ((orc_uint8) var5 << 8); - /* 4: mergebw */ - var35 = ((orc_uint8) var33) | ((orc_uint8) var6 << 8); - /* 5: mergewl */ - var0.i = ((orc_uint16) var34) | ((orc_uint16) var35 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var37 = ptr4[i]; + /* 1: copyw */ + var41.i = var37.i; + /* 2: select0wb */ + var42 = (orc_uint16) var41.i & 0xff; + /* 3: select1wb */ + var43 = ((orc_uint16) var41.i >> 8) & 0xff; + /* 4: loadb */ + var38 = ptr5[i]; + /* 5: mergebw */ + var44.i = ((orc_uint8) var42) | ((orc_uint8) var38 << 8); + /* 6: loadb */ + var39 = ptr6[i]; + /* 7: mergebw */ + var45.i = ((orc_uint8) var43) | ((orc_uint8) var39 << 8); + /* 8: mergewl */ + var40.i = ((orc_uint16) var44.i) | ((orc_uint16) var45.i << 16); + /* 9: storel */ + ptr0[i] = var40; } } @@ -1837,12 +1935,18 @@ orc_pack_yuyv (orc_uint32 * d1, const guint8 * s1, const orc_uint8 * s2, orc_program_add_temporary (p, 2, "t4"); orc_program_add_temporary (p, 2, "t5"); - orc_program_append (p, "copyw", ORC_VAR_T5, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_T1, ORC_VAR_T5, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_T2, ORC_VAR_T5, ORC_VAR_D1); - orc_program_append (p, "mergebw", ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_S2); - orc_program_append (p, "mergebw", ORC_VAR_T4, ORC_VAR_T2, ORC_VAR_S3); - orc_program_append (p, "mergewl", ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_T4); + orc_program_append_2 (p, "copyw", 0, ORC_VAR_T5, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_T1, ORC_VAR_T5, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_T2, ORC_VAR_T5, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_S2, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T4, ORC_VAR_T2, ORC_VAR_S3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_T4, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -1869,46 +1973,46 @@ void orc_unpack_uyvy_y (orc_uint8 * d1, const orc_uint16 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var32; + orc_int8 var33; ptr0 = (orc_int8 *) d1; - ptr4 = (orc_int16 *) s1; + ptr4 = (orc_union16 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1wb */ - var0 = ((orc_uint16) var4 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var32 = ptr4[i]; + /* 1: select1wb */ + var33 = ((orc_uint16) var32.i >> 8) & 0xff; + /* 2: storeb */ + ptr0[i] = var33; } } #else static void -_backup_orc_unpack_uyvy_y (OrcExecutor * ex) +_backup_orc_unpack_uyvy_y (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var32; + orc_int8 var33; ptr0 = (orc_int8 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; + ptr4 = (orc_union16 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1wb */ - var0 = ((orc_uint16) var4 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var32 = ptr4[i]; + /* 1: select1wb */ + var33 = ((orc_uint16) var32.i >> 8) & 0xff; + /* 2: storeb */ + ptr0[i] = var33; } } @@ -1932,7 +2036,8 @@ orc_unpack_uyvy_y (orc_uint8 * d1, const orc_uint16 * s1, int n) orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 2, "s1"); - orc_program_append (p, "select1wb", ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_D1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -1957,52 +2062,52 @@ void orc_unpack_uyvy_u (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_orc_unpack_uyvy_u (OrcExecutor * ex) +_backup_orc_unpack_uyvy_u (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -2027,8 +2132,10 @@ orc_unpack_uyvy_u (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select0lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select0lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -2053,52 +2160,52 @@ void orc_unpack_uyvy_v (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_orc_unpack_uyvy_v (OrcExecutor * ex) +_backup_orc_unpack_uyvy_v (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -2123,8 +2230,10 @@ orc_unpack_uyvy_v (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select1lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select1lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -2150,96 +2259,96 @@ orc_pack_uyvy (orc_uint32 * d1, const guint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int n) { int i; - orc_union32 var0; - orc_union32 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var32; - orc_int8 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; + orc_union32 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_union16 var37; + orc_int8 var38; + orc_int8 var39; + orc_union32 var40; + orc_union16 var41; + orc_int8 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; ptr0 = (orc_union32 *) d1; - ptr4 = (orc_int16 *) s1; + ptr4 = (orc_union16 *) s1; ptr5 = (orc_int8 *) s2; ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: copyw */ - var36 = var4; - /* 1: select0wb */ - var32 = (orc_uint16) var36 & 0xff; - /* 2: select1wb */ - var33 = ((orc_uint16) var36 >> 8) & 0xff; - /* 3: mergebw */ - var34 = ((orc_uint8) var5) | ((orc_uint8) var32 << 8); - /* 4: mergebw */ - var35 = ((orc_uint8) var6) | ((orc_uint8) var33 << 8); - /* 5: mergewl */ - var0.i = ((orc_uint16) var34) | ((orc_uint16) var35 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var37 = ptr4[i]; + /* 1: copyw */ + var41.i = var37.i; + /* 2: select0wb */ + var42 = (orc_uint16) var41.i & 0xff; + /* 3: select1wb */ + var43 = ((orc_uint16) var41.i >> 8) & 0xff; + /* 4: loadb */ + var38 = ptr5[i]; + /* 5: mergebw */ + var44.i = ((orc_uint8) var38) | ((orc_uint8) var42 << 8); + /* 6: loadb */ + var39 = ptr6[i]; + /* 7: mergebw */ + var45.i = ((orc_uint8) var39) | ((orc_uint8) var43 << 8); + /* 8: mergewl */ + var40.i = ((orc_uint16) var44.i) | ((orc_uint16) var45.i << 16); + /* 9: storel */ + ptr0[i] = var40; } } #else static void -_backup_orc_pack_uyvy (OrcExecutor * ex) +_backup_orc_pack_uyvy (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_union32 var0; - orc_union32 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var32; - orc_int8 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; + orc_union32 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_union16 var37; + orc_int8 var38; + orc_int8 var39; + orc_union32 var40; + orc_union16 var41; + orc_int8 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; ptr0 = (orc_union32 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; + ptr4 = (orc_union16 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: copyw */ - var36 = var4; - /* 1: select0wb */ - var32 = (orc_uint16) var36 & 0xff; - /* 2: select1wb */ - var33 = ((orc_uint16) var36 >> 8) & 0xff; - /* 3: mergebw */ - var34 = ((orc_uint8) var5) | ((orc_uint8) var32 << 8); - /* 4: mergebw */ - var35 = ((orc_uint8) var6) | ((orc_uint8) var33 << 8); - /* 5: mergewl */ - var0.i = ((orc_uint16) var34) | ((orc_uint16) var35 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var37 = ptr4[i]; + /* 1: copyw */ + var41.i = var37.i; + /* 2: select0wb */ + var42 = (orc_uint16) var41.i & 0xff; + /* 3: select1wb */ + var43 = ((orc_uint16) var41.i >> 8) & 0xff; + /* 4: loadb */ + var38 = ptr5[i]; + /* 5: mergebw */ + var44.i = ((orc_uint8) var38) | ((orc_uint8) var42 << 8); + /* 6: loadb */ + var39 = ptr6[i]; + /* 7: mergebw */ + var45.i = ((orc_uint8) var39) | ((orc_uint8) var43 << 8); + /* 8: mergewl */ + var40.i = ((orc_uint16) var44.i) | ((orc_uint16) var45.i << 16); + /* 9: storel */ + ptr0[i] = var40; } } @@ -2271,12 +2380,18 @@ orc_pack_uyvy (orc_uint32 * d1, const guint8 * s1, const orc_uint8 * s2, orc_program_add_temporary (p, 2, "t4"); orc_program_add_temporary (p, 2, "t5"); - orc_program_append (p, "copyw", ORC_VAR_T5, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_T1, ORC_VAR_T5, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_T2, ORC_VAR_T5, ORC_VAR_D1); - orc_program_append (p, "mergebw", ORC_VAR_T3, ORC_VAR_S2, ORC_VAR_T1); - orc_program_append (p, "mergebw", ORC_VAR_T4, ORC_VAR_S3, ORC_VAR_T2); - orc_program_append (p, "mergewl", ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_T4); + orc_program_append_2 (p, "copyw", 0, ORC_VAR_T5, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_T1, ORC_VAR_T5, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_T2, ORC_VAR_T5, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T3, ORC_VAR_S2, ORC_VAR_T1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T4, ORC_VAR_S3, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_T4, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -2303,54 +2418,58 @@ void orc_addc_convert_u8_s16 (orc_uint8 * d1, const gint16 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - const orc_int16 var16 = 128; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var33; + orc_union16 var34; + orc_int8 var35; + orc_union16 var36; ptr0 = (orc_int8 *) d1; - ptr4 = (orc_int16 *) s1; + ptr4 = (orc_union16 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: addw */ - var32 = var4 + var16; - /* 1: convsuswb */ - var0 = ORC_CLAMP_UB (var32); - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var33 = ptr4[i]; + /* 1: loadpw */ + var34.i = 128; + /* 2: addw */ + var36.i = var33.i + var34.i; + /* 3: convsuswb */ + var35 = ORC_CLAMP_UB (var36.i); + /* 4: storeb */ + ptr0[i] = var35; } } #else static void -_backup_orc_addc_convert_u8_s16 (OrcExecutor * ex) +_backup_orc_addc_convert_u8_s16 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int16 var4; - const orc_int16 *ptr4; - const orc_int16 var16 = 128; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union16 *ORC_RESTRICT ptr4; + orc_union16 var33; + orc_union16 var34; + orc_int8 var35; + orc_union16 var36; ptr0 = (orc_int8 *) ex->arrays[0]; - ptr4 = (orc_int16 *) ex->arrays[4]; + ptr4 = (orc_union16 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: addw */ - var32 = var4 + var16; - /* 1: convsuswb */ - var0 = ORC_CLAMP_UB (var32); - *ptr0 = var0; - ptr0++; + /* 0: loadw */ + var33 = ptr4[i]; + /* 1: loadpw */ + var34.i = 128; + /* 2: addw */ + var36.i = var33.i + var34.i; + /* 3: convsuswb */ + var35 = ORC_CLAMP_UB (var36.i); + /* 4: storeb */ + ptr0[i] = var35; } } @@ -2373,11 +2492,13 @@ orc_addc_convert_u8_s16 (orc_uint8 * d1, const gint16 * s1, int n) orc_program_set_backup_function (p, _backup_orc_addc_convert_u8_s16); orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 2, "s1"); - orc_program_add_constant (p, 2, 128, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_C1); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -2402,54 +2523,58 @@ void orc_subc_convert_s16_u8 (gint16 * d1, const orc_uint8 * s1, int n) { int i; - orc_int16 var0; - orc_int16 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - const orc_int16 var16 = 128; - orc_int16 var32; - - ptr0 = (orc_int16 *) d1; + orc_union16 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + orc_int8 var33; + orc_union16 var34; + orc_union16 var35; + orc_union16 var36; + + ptr0 = (orc_union16 *) d1; ptr4 = (orc_int8 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var0 = var32 - var16; - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var33 = ptr4[i]; + /* 1: convubw */ + var36.i = (orc_uint8) var33; + /* 2: loadpw */ + var34.i = 128; + /* 3: subw */ + var35.i = var36.i - var34.i; + /* 4: storew */ + ptr0[i] = var35; } } #else static void -_backup_orc_subc_convert_s16_u8 (OrcExecutor * ex) +_backup_orc_subc_convert_s16_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int16 var0; - orc_int16 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - const orc_int16 var16 = 128; - orc_int16 var32; - - ptr0 = (orc_int16 *) ex->arrays[0]; + orc_union16 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + orc_int8 var33; + orc_union16 var34; + orc_union16 var35; + orc_union16 var36; + + ptr0 = (orc_union16 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var0 = var32 - var16; - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var33 = ptr4[i]; + /* 1: convubw */ + var36.i = (orc_uint8) var33; + /* 2: loadpw */ + var34.i = 128; + /* 3: subw */ + var35.i = var36.i - var34.i; + /* 4: storew */ + ptr0[i] = var35; } } @@ -2472,11 +2597,13 @@ orc_subc_convert_s16_u8 (gint16 * d1, const orc_uint8 * s1, int n) orc_program_set_backup_function (p, _backup_orc_subc_convert_s16_u8); orc_program_add_destination (p, 2, "d1"); orc_program_add_source (p, 1, "s1"); - orc_program_add_constant (p, 2, 128, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_C1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -2501,38 +2628,42 @@ void orc_splat_u8_ns (orc_uint8 * d1, int p1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - const int var24 = p1; + orc_int8 *ORC_RESTRICT ptr0; + orc_int8 var32; + orc_int8 var33; ptr0 = (orc_int8 *) d1; for (i = 0; i < n; i++) { - /* 0: copyb */ - var0 = var24; - *ptr0 = var0; - ptr0++; + /* 0: loadpb */ + var32 = p1; + /* 1: copyb */ + var33 = var32; + /* 2: storeb */ + ptr0[i] = var33; } } #else static void -_backup_orc_splat_u8_ns (OrcExecutor * ex) +_backup_orc_splat_u8_ns (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - const int var24 = ex->params[24]; + orc_int8 *ORC_RESTRICT ptr0; + orc_int8 var32; + orc_int8 var33; ptr0 = (orc_int8 *) ex->arrays[0]; for (i = 0; i < n; i++) { - /* 0: copyb */ - var0 = var24; - *ptr0 = var0; - ptr0++; + /* 0: loadpb */ + var32 = ex->params[24]; + /* 1: copyb */ + var33 = var32; + /* 2: storeb */ + ptr0[i] = var33; } } @@ -2556,7 +2687,8 @@ orc_splat_u8_ns (orc_uint8 * d1, int p1, int n) orc_program_add_destination (p, 1, "d1"); orc_program_add_parameter (p, 1, "p1"); - orc_program_append (p, "copyb", ORC_VAR_D1, ORC_VAR_P1, ORC_VAR_D1); + orc_program_append_2 (p, "copyb", 0, ORC_VAR_D1, ORC_VAR_P1, ORC_VAR_D1, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -2581,38 +2713,42 @@ void orc_splat_s16_ns (gint16 * d1, int p1, int n) { int i; - orc_int16 var0; - orc_int16 *ptr0; - const int var24 = p1; + orc_union16 *ORC_RESTRICT ptr0; + orc_union16 var32; + orc_union16 var33; - ptr0 = (orc_int16 *) d1; + ptr0 = (orc_union16 *) d1; for (i = 0; i < n; i++) { - /* 0: copyw */ - var0 = var24; - *ptr0 = var0; - ptr0++; + /* 0: loadpw */ + var32.i = p1; + /* 1: copyw */ + var33.i = var32.i; + /* 2: storew */ + ptr0[i] = var33; } } #else static void -_backup_orc_splat_s16_ns (OrcExecutor * ex) +_backup_orc_splat_s16_ns (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int16 var0; - orc_int16 *ptr0; - const int var24 = ex->params[24]; + orc_union16 *ORC_RESTRICT ptr0; + orc_union16 var32; + orc_union16 var33; - ptr0 = (orc_int16 *) ex->arrays[0]; + ptr0 = (orc_union16 *) ex->arrays[0]; for (i = 0; i < n; i++) { - /* 0: copyw */ - var0 = var24; - *ptr0 = var0; - ptr0++; + /* 0: loadpw */ + var32.i = ex->params[24]; + /* 1: copyw */ + var33.i = var32.i; + /* 2: storew */ + ptr0[i] = var33; } } @@ -2636,7 +2772,8 @@ orc_splat_s16_ns (gint16 * d1, int p1, int n) orc_program_add_destination (p, 2, "d1"); orc_program_add_parameter (p, 2, "p1"); - orc_program_append (p, "copyw", ORC_VAR_D1, ORC_VAR_P1, ORC_VAR_D1); + orc_program_append_2 (p, "copyw", 0, ORC_VAR_D1, ORC_VAR_P1, ORC_VAR_D1, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -2662,106 +2799,116 @@ orc_matrix2_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, int p2, int p3, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 6; - const int var24 = p1; - const int var25 = p2; - const int var26 = p3; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var40.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = p1; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; - /* 5: addw */ - var37 = var36 + var26; - /* 6: shrsw */ - var38 = var37 >> var16; - /* 7: convsuswb */ - var0 = ORC_CLAMP_UB (var38); - *ptr0 = var0; - ptr0++; + var41.i = (var40.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; + /* 5: convubw */ + var42.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = p2; + /* 7: mullw */ + var43.i = (var42.i * var37.i) & 0xffff; + /* 8: addw */ + var44.i = var41.i + var43.i; + /* 9: loadpw */ + var38.i = p3; + /* 10: addw */ + var45.i = var44.i + var38.i; + /* 11: shrsw */ + var46.i = var45.i >> 6; + /* 12: convsuswb */ + var39 = ORC_CLAMP_UB (var46.i); + /* 13: storeb */ + ptr0[i] = var39; } } #else static void -_backup_orc_matrix2_u8 (OrcExecutor * ex) +_backup_orc_matrix2_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 6; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - const int var26 = ex->params[26]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var40.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = ex->params[24]; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; - /* 5: addw */ - var37 = var36 + var26; - /* 6: shrsw */ - var38 = var37 >> var16; - /* 7: convsuswb */ - var0 = ORC_CLAMP_UB (var38); - *ptr0 = var0; - ptr0++; + var41.i = (var40.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; + /* 5: convubw */ + var42.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = ex->params[25]; + /* 7: mullw */ + var43.i = (var42.i * var37.i) & 0xffff; + /* 8: addw */ + var44.i = var41.i + var43.i; + /* 9: loadpw */ + var38.i = ex->params[26]; + /* 10: addw */ + var45.i = var44.i + var38.i; + /* 11: shrsw */ + var46.i = var45.i >> 6; + /* 12: convsuswb */ + var39 = ORC_CLAMP_UB (var46.i); + /* 13: storeb */ + ptr0[i] = var39; } } @@ -2786,21 +2933,29 @@ orc_matrix2_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_add_constant (p, 2, 6, "c1"); + orc_program_add_constant (p, 2, 0x00000006, "c1"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_parameter (p, 2, "p3"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P3); - orc_program_append (p, "shrsw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P3, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -2830,134 +2985,152 @@ orc_matrix2_11_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, int p2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 16; - const orc_int16 var17 = 128; - const orc_int16 var18 = 128; - const orc_int16 var19 = 8; - const int var24 = p1; - const int var25 = p2; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var36; + orc_union16 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var36 = var32 - var16; - /* 2: mullw */ - var34 = (var36 * var24) & 0xffff; - /* 3: convubw */ - var33 = (orc_uint8) var5; - /* 4: subw */ - var37 = var33 - var17; + /* 0: loadb */ + var36 = ptr4[i]; + /* 1: convubw */ + var44.i = (orc_uint8) var36; + /* 2: loadpw */ + var37.i = 16; + /* 3: subw */ + var45.i = var44.i - var37.i; + /* 4: loadpw */ + var38.i = p1; /* 5: mullw */ - var35 = (var37 * var25) & 0xffff; - /* 6: addw */ - var38 = var34 + var35; - /* 7: addw */ - var39 = var38 + var18; - /* 8: shrsw */ - var40 = var39 >> var19; - /* 9: addw */ - var41 = var40 + var36; - /* 10: addw */ - var42 = var41 + var37; - /* 11: convsuswb */ - var0 = ORC_CLAMP_UB (var42); - *ptr0 = var0; - ptr0++; + var46.i = (var45.i * var38.i) & 0xffff; + /* 6: loadb */ + var39 = ptr5[i]; + /* 7: convubw */ + var47.i = (orc_uint8) var39; + /* 8: loadpw */ + var40.i = 128; + /* 9: subw */ + var48.i = var47.i - var40.i; + /* 10: loadpw */ + var41.i = p2; + /* 11: mullw */ + var49.i = (var48.i * var41.i) & 0xffff; + /* 12: addw */ + var50.i = var46.i + var49.i; + /* 13: loadpw */ + var42.i = 128; + /* 14: addw */ + var51.i = var50.i + var42.i; + /* 15: shrsw */ + var52.i = var51.i >> 8; + /* 16: addw */ + var53.i = var52.i + var45.i; + /* 17: addw */ + var54.i = var53.i + var48.i; + /* 18: convsuswb */ + var43 = ORC_CLAMP_UB (var54.i); + /* 19: storeb */ + ptr0[i] = var43; } } #else static void -_backup_orc_matrix2_11_u8 (OrcExecutor * ex) +_backup_orc_matrix2_11_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 16; - const orc_int16 var17 = 128; - const orc_int16 var18 = 128; - const orc_int16 var19 = 8; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var36; + orc_union16 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var36 = var32 - var16; - /* 2: mullw */ - var34 = (var36 * var24) & 0xffff; - /* 3: convubw */ - var33 = (orc_uint8) var5; - /* 4: subw */ - var37 = var33 - var17; + /* 0: loadb */ + var36 = ptr4[i]; + /* 1: convubw */ + var44.i = (orc_uint8) var36; + /* 2: loadpw */ + var37.i = 16; + /* 3: subw */ + var45.i = var44.i - var37.i; + /* 4: loadpw */ + var38.i = ex->params[24]; /* 5: mullw */ - var35 = (var37 * var25) & 0xffff; - /* 6: addw */ - var38 = var34 + var35; - /* 7: addw */ - var39 = var38 + var18; - /* 8: shrsw */ - var40 = var39 >> var19; - /* 9: addw */ - var41 = var40 + var36; - /* 10: addw */ - var42 = var41 + var37; - /* 11: convsuswb */ - var0 = ORC_CLAMP_UB (var42); - *ptr0 = var0; - ptr0++; + var46.i = (var45.i * var38.i) & 0xffff; + /* 6: loadb */ + var39 = ptr5[i]; + /* 7: convubw */ + var47.i = (orc_uint8) var39; + /* 8: loadpw */ + var40.i = 128; + /* 9: subw */ + var48.i = var47.i - var40.i; + /* 10: loadpw */ + var41.i = ex->params[25]; + /* 11: mullw */ + var49.i = (var48.i * var41.i) & 0xffff; + /* 12: addw */ + var50.i = var46.i + var49.i; + /* 13: loadpw */ + var42.i = 128; + /* 14: addw */ + var51.i = var50.i + var42.i; + /* 15: shrsw */ + var52.i = var51.i >> 8; + /* 16: addw */ + var53.i = var52.i + var45.i; + /* 17: addw */ + var54.i = var53.i + var48.i; + /* 18: convsuswb */ + var43 = ORC_CLAMP_UB (var54.i); + /* 19: storeb */ + ptr0[i] = var43; } } @@ -2982,10 +3155,10 @@ orc_matrix2_11_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_add_constant (p, 2, 16, "c1"); - orc_program_add_constant (p, 2, 128, "c2"); - orc_program_add_constant (p, 2, 128, "c3"); - orc_program_add_constant (p, 2, 8, "c4"); + orc_program_add_constant (p, 2, 0x00000010, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c2"); + orc_program_add_constant (p, 2, 0x00000080, "c3"); + orc_program_add_constant (p, 2, 0x00000008, "c4"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_temporary (p, 2, "t1"); @@ -2993,18 +3166,30 @@ orc_matrix2_11_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, orc_program_add_temporary (p, 2, "t3"); orc_program_add_temporary (p, 2, "t4"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "mullw", ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C2); - orc_program_append (p, "mullw", ORC_VAR_T4, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T4); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C3); - orc_program_append (p, "shrsw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C4); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T1); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T4, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T4, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C4, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T3, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -3033,140 +3218,158 @@ orc_matrix2_12_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, int p2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 16; - const orc_int16 var17 = 128; - const orc_int16 var18 = 128; - const orc_int16 var19 = 8; - const int var24 = p1; - const int var25 = p2; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var36; + orc_union16 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; + orc_union16 var55; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var36 = var32 - var16; - /* 2: mullw */ - var34 = (var36 * var24) & 0xffff; - /* 3: convubw */ - var33 = (orc_uint8) var5; - /* 4: subw */ - var37 = var33 - var17; + /* 0: loadb */ + var36 = ptr4[i]; + /* 1: convubw */ + var44.i = (orc_uint8) var36; + /* 2: loadpw */ + var37.i = 16; + /* 3: subw */ + var45.i = var44.i - var37.i; + /* 4: loadpw */ + var38.i = p1; /* 5: mullw */ - var35 = (var37 * var25) & 0xffff; - /* 6: addw */ - var38 = var34 + var35; - /* 7: addw */ - var39 = var38 + var18; - /* 8: shrsw */ - var40 = var39 >> var19; - /* 9: addw */ - var41 = var40 + var36; - /* 10: addw */ - var42 = var41 + var37; - /* 11: addw */ - var43 = var42 + var37; - /* 12: convsuswb */ - var0 = ORC_CLAMP_UB (var43); - *ptr0 = var0; - ptr0++; + var46.i = (var45.i * var38.i) & 0xffff; + /* 6: loadb */ + var39 = ptr5[i]; + /* 7: convubw */ + var47.i = (orc_uint8) var39; + /* 8: loadpw */ + var40.i = 128; + /* 9: subw */ + var48.i = var47.i - var40.i; + /* 10: loadpw */ + var41.i = p2; + /* 11: mullw */ + var49.i = (var48.i * var41.i) & 0xffff; + /* 12: addw */ + var50.i = var46.i + var49.i; + /* 13: loadpw */ + var42.i = 128; + /* 14: addw */ + var51.i = var50.i + var42.i; + /* 15: shrsw */ + var52.i = var51.i >> 8; + /* 16: addw */ + var53.i = var52.i + var45.i; + /* 17: addw */ + var54.i = var53.i + var48.i; + /* 18: addw */ + var55.i = var54.i + var48.i; + /* 19: convsuswb */ + var43 = ORC_CLAMP_UB (var55.i); + /* 20: storeb */ + ptr0[i] = var43; } } #else static void -_backup_orc_matrix2_12_u8 (OrcExecutor * ex) +_backup_orc_matrix2_12_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 16; - const orc_int16 var17 = 128; - const orc_int16 var18 = 128; - const orc_int16 var19 = 8; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var36; + orc_union16 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; + orc_union16 var55; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var36 = var32 - var16; - /* 2: mullw */ - var34 = (var36 * var24) & 0xffff; - /* 3: convubw */ - var33 = (orc_uint8) var5; - /* 4: subw */ - var37 = var33 - var17; + /* 0: loadb */ + var36 = ptr4[i]; + /* 1: convubw */ + var44.i = (orc_uint8) var36; + /* 2: loadpw */ + var37.i = 16; + /* 3: subw */ + var45.i = var44.i - var37.i; + /* 4: loadpw */ + var38.i = ex->params[24]; /* 5: mullw */ - var35 = (var37 * var25) & 0xffff; - /* 6: addw */ - var38 = var34 + var35; - /* 7: addw */ - var39 = var38 + var18; - /* 8: shrsw */ - var40 = var39 >> var19; - /* 9: addw */ - var41 = var40 + var36; - /* 10: addw */ - var42 = var41 + var37; - /* 11: addw */ - var43 = var42 + var37; - /* 12: convsuswb */ - var0 = ORC_CLAMP_UB (var43); - *ptr0 = var0; - ptr0++; + var46.i = (var45.i * var38.i) & 0xffff; + /* 6: loadb */ + var39 = ptr5[i]; + /* 7: convubw */ + var47.i = (orc_uint8) var39; + /* 8: loadpw */ + var40.i = 128; + /* 9: subw */ + var48.i = var47.i - var40.i; + /* 10: loadpw */ + var41.i = ex->params[25]; + /* 11: mullw */ + var49.i = (var48.i * var41.i) & 0xffff; + /* 12: addw */ + var50.i = var46.i + var49.i; + /* 13: loadpw */ + var42.i = 128; + /* 14: addw */ + var51.i = var50.i + var42.i; + /* 15: shrsw */ + var52.i = var51.i >> 8; + /* 16: addw */ + var53.i = var52.i + var45.i; + /* 17: addw */ + var54.i = var53.i + var48.i; + /* 18: addw */ + var55.i = var54.i + var48.i; + /* 19: convsuswb */ + var43 = ORC_CLAMP_UB (var55.i); + /* 20: storeb */ + ptr0[i] = var43; } } @@ -3191,10 +3394,10 @@ orc_matrix2_12_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_add_constant (p, 2, 16, "c1"); - orc_program_add_constant (p, 2, 128, "c2"); - orc_program_add_constant (p, 2, 128, "c3"); - orc_program_add_constant (p, 2, 8, "c4"); + orc_program_add_constant (p, 2, 0x00000010, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c2"); + orc_program_add_constant (p, 2, 0x00000080, "c3"); + orc_program_add_constant (p, 2, 0x00000008, "c4"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_temporary (p, 2, "t1"); @@ -3202,19 +3405,32 @@ orc_matrix2_12_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, orc_program_add_temporary (p, 2, "t3"); orc_program_add_temporary (p, 2, "t4"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "mullw", ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C2); - orc_program_append (p, "mullw", ORC_VAR_T4, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T4); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C3); - orc_program_append (p, "shrsw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C4); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T1); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T4, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T4, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C4, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T1, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T3, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -3243,29 +3459,28 @@ orc_matrix3_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int p4, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const orc_int16 var16 = 6; - const int var24 = p1; - const int var25 = p2; - const int var26 = p3; - const int var27 = p4; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_int8 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -3273,69 +3488,76 @@ orc_matrix3_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var42.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = p1; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; + var43.i = (var42.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; + var44.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = p2; + /* 7: mullw */ + var45.i = (var44.i * var37.i) & 0xffff; /* 8: addw */ - var40 = var39 + var27; - /* 9: shrsw */ - var41 = var40 >> var16; - /* 10: convsuswb */ - var0 = ORC_CLAMP_UB (var41); - *ptr0 = var0; - ptr0++; + var46.i = var43.i + var45.i; + /* 9: loadb */ + var38 = ptr6[i]; + /* 10: convubw */ + var47.i = (orc_uint8) var38; + /* 11: loadpw */ + var39.i = p3; + /* 12: mullw */ + var48.i = (var47.i * var39.i) & 0xffff; + /* 13: addw */ + var49.i = var46.i + var48.i; + /* 14: loadpw */ + var40.i = p4; + /* 15: addw */ + var50.i = var49.i + var40.i; + /* 16: shrsw */ + var51.i = var50.i >> 6; + /* 17: convsuswb */ + var41 = ORC_CLAMP_UB (var51.i); + /* 18: storeb */ + ptr0[i] = var41; } } #else static void -_backup_orc_matrix3_u8 (OrcExecutor * ex) +_backup_orc_matrix3_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const orc_int16 var16 = 6; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - const int var26 = ex->params[26]; - const int var27 = ex->params[27]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_int8 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -3343,36 +3565,44 @@ _backup_orc_matrix3_u8 (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var42.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = ex->params[24]; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; + var43.i = (var42.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; + var44.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = ex->params[25]; + /* 7: mullw */ + var45.i = (var44.i * var37.i) & 0xffff; /* 8: addw */ - var40 = var39 + var27; - /* 9: shrsw */ - var41 = var40 >> var16; - /* 10: convsuswb */ - var0 = ORC_CLAMP_UB (var41); - *ptr0 = var0; - ptr0++; + var46.i = var43.i + var45.i; + /* 9: loadb */ + var38 = ptr6[i]; + /* 10: convubw */ + var47.i = (orc_uint8) var38; + /* 11: loadpw */ + var39.i = ex->params[26]; + /* 12: mullw */ + var48.i = (var47.i * var39.i) & 0xffff; + /* 13: addw */ + var49.i = var46.i + var48.i; + /* 14: loadpw */ + var40.i = ex->params[27]; + /* 15: addw */ + var50.i = var49.i + var40.i; + /* 16: shrsw */ + var51.i = var50.i >> 6; + /* 17: convsuswb */ + var41 = ORC_CLAMP_UB (var51.i); + /* 18: storeb */ + ptr0[i] = var41; } } @@ -3398,7 +3628,7 @@ orc_matrix3_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); - orc_program_add_constant (p, 2, 6, "c1"); + orc_program_add_constant (p, 2, 0x00000006, "c1"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_parameter (p, 2, "p3"); @@ -3406,17 +3636,28 @@ orc_matrix3_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P4); - orc_program_append (p, "shrsw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P4, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -3448,36 +3689,35 @@ orc_matrix3_100_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const orc_int16 var16 = 16; - const orc_int16 var17 = 128; - const orc_int16 var18 = 128; - const orc_int16 var19 = 128; - const orc_int16 var20 = 8; - const int var24 = p1; - const int var25 = p2; - const int var26 = p3; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; - orc_int16 var44; - orc_int16 var45; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var35; + orc_union16 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_int8 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_int8 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; + orc_union16 var55; + orc_union16 var56; + orc_union16 var57; + orc_union16 var58; + orc_union16 var59; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -3485,84 +3725,97 @@ orc_matrix3_100_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var35 = var32 - var16; - /* 2: mullw */ - var34 = (var35 * var24) & 0xffff; - /* 3: convubw */ - var33 = (orc_uint8) var5; - /* 4: subw */ - var36 = var33 - var17; + /* 0: loadb */ + var35 = ptr4[i]; + /* 1: convubw */ + var46.i = (orc_uint8) var35; + /* 2: loadpw */ + var36.i = 16; + /* 3: subw */ + var47.i = var46.i - var36.i; + /* 4: loadpw */ + var37.i = p1; /* 5: mullw */ - var37 = (var36 * var25) & 0xffff; - /* 6: addw */ - var38 = var34 + var37; + var48.i = (var47.i * var37.i) & 0xffff; + /* 6: loadb */ + var38 = ptr5[i]; /* 7: convubw */ - var39 = (orc_uint8) var6; - /* 8: subw */ - var40 = var39 - var18; - /* 9: mullw */ - var41 = (var40 * var26) & 0xffff; - /* 10: addw */ - var42 = var38 + var41; - /* 11: addw */ - var43 = var42 + var19; - /* 12: shrsw */ - var44 = var43 >> var20; - /* 13: addw */ - var45 = var44 + var35; - /* 14: convsuswb */ - var0 = ORC_CLAMP_UB (var45); - *ptr0 = var0; - ptr0++; + var49.i = (orc_uint8) var38; + /* 8: loadpw */ + var39.i = 128; + /* 9: subw */ + var50.i = var49.i - var39.i; + /* 10: loadpw */ + var40.i = p2; + /* 11: mullw */ + var51.i = (var50.i * var40.i) & 0xffff; + /* 12: addw */ + var52.i = var48.i + var51.i; + /* 13: loadb */ + var41 = ptr6[i]; + /* 14: convubw */ + var53.i = (orc_uint8) var41; + /* 15: loadpw */ + var42.i = 128; + /* 16: subw */ + var54.i = var53.i - var42.i; + /* 17: loadpw */ + var43.i = p3; + /* 18: mullw */ + var55.i = (var54.i * var43.i) & 0xffff; + /* 19: addw */ + var56.i = var52.i + var55.i; + /* 20: loadpw */ + var44.i = 128; + /* 21: addw */ + var57.i = var56.i + var44.i; + /* 22: shrsw */ + var58.i = var57.i >> 8; + /* 23: addw */ + var59.i = var58.i + var47.i; + /* 24: convsuswb */ + var45 = ORC_CLAMP_UB (var59.i); + /* 25: storeb */ + ptr0[i] = var45; } } #else static void -_backup_orc_matrix3_100_u8 (OrcExecutor * ex) +_backup_orc_matrix3_100_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const orc_int16 var16 = 16; - const orc_int16 var17 = 128; - const orc_int16 var18 = 128; - const orc_int16 var19 = 128; - const orc_int16 var20 = 8; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - const int var26 = ex->params[26]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; - orc_int16 var44; - orc_int16 var45; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var35; + orc_union16 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_int8 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_int8 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; + orc_union16 var55; + orc_union16 var56; + orc_union16 var57; + orc_union16 var58; + orc_union16 var59; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -3570,44 +3823,58 @@ _backup_orc_matrix3_100_u8 (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: subw */ - var35 = var32 - var16; - /* 2: mullw */ - var34 = (var35 * var24) & 0xffff; - /* 3: convubw */ - var33 = (orc_uint8) var5; - /* 4: subw */ - var36 = var33 - var17; + /* 0: loadb */ + var35 = ptr4[i]; + /* 1: convubw */ + var46.i = (orc_uint8) var35; + /* 2: loadpw */ + var36.i = 16; + /* 3: subw */ + var47.i = var46.i - var36.i; + /* 4: loadpw */ + var37.i = ex->params[24]; /* 5: mullw */ - var37 = (var36 * var25) & 0xffff; - /* 6: addw */ - var38 = var34 + var37; + var48.i = (var47.i * var37.i) & 0xffff; + /* 6: loadb */ + var38 = ptr5[i]; /* 7: convubw */ - var39 = (orc_uint8) var6; - /* 8: subw */ - var40 = var39 - var18; - /* 9: mullw */ - var41 = (var40 * var26) & 0xffff; - /* 10: addw */ - var42 = var38 + var41; - /* 11: addw */ - var43 = var42 + var19; - /* 12: shrsw */ - var44 = var43 >> var20; - /* 13: addw */ - var45 = var44 + var35; - /* 14: convsuswb */ - var0 = ORC_CLAMP_UB (var45); - *ptr0 = var0; - ptr0++; + var49.i = (orc_uint8) var38; + /* 8: loadpw */ + var39.i = 128; + /* 9: subw */ + var50.i = var49.i - var39.i; + /* 10: loadpw */ + var40.i = ex->params[25]; + /* 11: mullw */ + var51.i = (var50.i * var40.i) & 0xffff; + /* 12: addw */ + var52.i = var48.i + var51.i; + /* 13: loadb */ + var41 = ptr6[i]; + /* 14: convubw */ + var53.i = (orc_uint8) var41; + /* 15: loadpw */ + var42.i = 128; + /* 16: subw */ + var54.i = var53.i - var42.i; + /* 17: loadpw */ + var43.i = ex->params[26]; + /* 18: mullw */ + var55.i = (var54.i * var43.i) & 0xffff; + /* 19: addw */ + var56.i = var52.i + var55.i; + /* 20: loadpw */ + var44.i = 128; + /* 21: addw */ + var57.i = var56.i + var44.i; + /* 22: shrsw */ + var58.i = var57.i >> 8; + /* 23: addw */ + var59.i = var58.i + var47.i; + /* 24: convsuswb */ + var45 = ORC_CLAMP_UB (var59.i); + /* 25: storeb */ + ptr0[i] = var45; } } @@ -3633,11 +3900,11 @@ orc_matrix3_100_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); - orc_program_add_constant (p, 2, 16, "c1"); - orc_program_add_constant (p, 2, 128, "c2"); - orc_program_add_constant (p, 2, 128, "c3"); - orc_program_add_constant (p, 2, 128, "c4"); - orc_program_add_constant (p, 2, 8, "c5"); + orc_program_add_constant (p, 2, 0x00000010, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c2"); + orc_program_add_constant (p, 2, 0x00000080, "c3"); + orc_program_add_constant (p, 2, 0x00000080, "c4"); + orc_program_add_constant (p, 2, 0x00000008, "c5"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_parameter (p, 2, "p3"); @@ -3645,21 +3912,36 @@ orc_matrix3_100_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, orc_program_add_temporary (p, 2, "t2"); orc_program_add_temporary (p, 2, "t3"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "mullw", ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C2); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "subw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C3); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C4); - orc_program_append (p, "shrsw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C5); - orc_program_append (p, "addw", ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T1); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "subw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C4, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C5, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T1, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T3, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -3690,30 +3972,29 @@ orc_matrix3_100_offset_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int p4, int p5, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = p1; - const int var25 = p2; - const int var26 = p3; - const int var27 = p4; - const int var28 = p5; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var35; + orc_union16 var36; + orc_int8 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_int8 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -3721,72 +4002,79 @@ orc_matrix3_100_offset_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var34 = (orc_uint8) var4; - /* 1: mullw */ - var32 = (var34 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var35 = ptr4[i]; + /* 1: convubw */ + var43.i = (orc_uint8) var35; + /* 2: loadpw */ + var36.i = p1; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var32 + var35; + var44.i = (var43.i * var36.i) & 0xffff; + /* 4: loadb */ + var37 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; + var45.i = (orc_uint8) var37; + /* 6: loadpw */ + var38.i = p2; + /* 7: mullw */ + var46.i = (var45.i * var38.i) & 0xffff; /* 8: addw */ - var40 = var39 + var27; - /* 9: shrsw */ - var41 = var40 >> var28; - /* 10: addw */ - var42 = var41 + var34; - /* 11: convsuswb */ - var0 = ORC_CLAMP_UB (var42); - *ptr0 = var0; - ptr0++; + var47.i = var44.i + var46.i; + /* 9: loadb */ + var39 = ptr6[i]; + /* 10: convubw */ + var48.i = (orc_uint8) var39; + /* 11: loadpw */ + var40.i = p3; + /* 12: mullw */ + var49.i = (var48.i * var40.i) & 0xffff; + /* 13: addw */ + var50.i = var47.i + var49.i; + /* 14: loadpw */ + var41.i = p4; + /* 15: addw */ + var51.i = var50.i + var41.i; + /* 16: shrsw */ + var52.i = var51.i >> p5; + /* 17: addw */ + var53.i = var52.i + var43.i; + /* 18: convsuswb */ + var42 = ORC_CLAMP_UB (var53.i); + /* 19: storeb */ + ptr0[i] = var42; } } #else static void -_backup_orc_matrix3_100_offset_u8 (OrcExecutor * ex) +_backup_orc_matrix3_100_offset_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - const int var26 = ex->params[26]; - const int var27 = ex->params[27]; - const int var28 = ex->params[28]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var35; + orc_union16 var36; + orc_int8 var37; + orc_union16 var38; + orc_int8 var39; + orc_union16 var40; + orc_union16 var41; + orc_int8 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -3794,38 +4082,46 @@ _backup_orc_matrix3_100_offset_u8 (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var34 = (orc_uint8) var4; - /* 1: mullw */ - var32 = (var34 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var35 = ptr4[i]; + /* 1: convubw */ + var43.i = (orc_uint8) var35; + /* 2: loadpw */ + var36.i = ex->params[24]; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var32 + var35; + var44.i = (var43.i * var36.i) & 0xffff; + /* 4: loadb */ + var37 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; + var45.i = (orc_uint8) var37; + /* 6: loadpw */ + var38.i = ex->params[25]; + /* 7: mullw */ + var46.i = (var45.i * var38.i) & 0xffff; /* 8: addw */ - var40 = var39 + var27; - /* 9: shrsw */ - var41 = var40 >> var28; - /* 10: addw */ - var42 = var41 + var34; - /* 11: convsuswb */ - var0 = ORC_CLAMP_UB (var42); - *ptr0 = var0; - ptr0++; + var47.i = var44.i + var46.i; + /* 9: loadb */ + var39 = ptr6[i]; + /* 10: convubw */ + var48.i = (orc_uint8) var39; + /* 11: loadpw */ + var40.i = ex->params[26]; + /* 12: mullw */ + var49.i = (var48.i * var40.i) & 0xffff; + /* 13: addw */ + var50.i = var47.i + var49.i; + /* 14: loadpw */ + var41.i = ex->params[27]; + /* 15: addw */ + var51.i = var50.i + var41.i; + /* 16: shrsw */ + var52.i = var51.i >> ex->params[28]; + /* 17: addw */ + var53.i = var52.i + var43.i; + /* 18: convsuswb */ + var42 = ORC_CLAMP_UB (var53.i); + /* 19: storeb */ + ptr0[i] = var42; } } @@ -3860,18 +4156,30 @@ orc_matrix3_100_offset_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, orc_program_add_temporary (p, 2, "t2"); orc_program_add_temporary (p, 2, "t3"); - orc_program_append (p, "convubw", ORC_VAR_T3, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P4); - orc_program_append (p, "shrsw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P5); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T3); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T3, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P4, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P5, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T3, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -3904,29 +4212,28 @@ orc_matrix3_000_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int p4, int p5, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = p1; - const int var25 = p2; - const int var26 = p3; - const int var27 = p4; - const int var28 = p5; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_int8 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -3934,69 +4241,76 @@ orc_matrix3_000_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var42.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = p1; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; + var43.i = (var42.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; + var44.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = p2; + /* 7: mullw */ + var45.i = (var44.i * var37.i) & 0xffff; /* 8: addw */ - var40 = var39 + var27; - /* 9: shrsw */ - var41 = var40 >> var28; - /* 10: convwb */ - var0 = var41; - *ptr0 = var0; - ptr0++; + var46.i = var43.i + var45.i; + /* 9: loadb */ + var38 = ptr6[i]; + /* 10: convubw */ + var47.i = (orc_uint8) var38; + /* 11: loadpw */ + var39.i = p3; + /* 12: mullw */ + var48.i = (var47.i * var39.i) & 0xffff; + /* 13: addw */ + var49.i = var46.i + var48.i; + /* 14: loadpw */ + var40.i = p4; + /* 15: addw */ + var50.i = var49.i + var40.i; + /* 16: shrsw */ + var51.i = var50.i >> p5; + /* 17: convwb */ + var41 = var51.i; + /* 18: storeb */ + ptr0[i] = var41; } } #else static void -_backup_orc_matrix3_000_u8 (OrcExecutor * ex) +_backup_orc_matrix3_000_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - const int var26 = ex->params[26]; - const int var27 = ex->params[27]; - const int var28 = ex->params[28]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_int8 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -4004,36 +4318,44 @@ _backup_orc_matrix3_000_u8 (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var42.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = ex->params[24]; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; + var43.i = (var42.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; + var44.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = ex->params[25]; + /* 7: mullw */ + var45.i = (var44.i * var37.i) & 0xffff; /* 8: addw */ - var40 = var39 + var27; - /* 9: shrsw */ - var41 = var40 >> var28; - /* 10: convwb */ - var0 = var41; - *ptr0 = var0; - ptr0++; + var46.i = var43.i + var45.i; + /* 9: loadb */ + var38 = ptr6[i]; + /* 10: convubw */ + var47.i = (orc_uint8) var38; + /* 11: loadpw */ + var39.i = ex->params[26]; + /* 12: mullw */ + var48.i = (var47.i * var39.i) & 0xffff; + /* 13: addw */ + var49.i = var46.i + var48.i; + /* 14: loadpw */ + var40.i = ex->params[27]; + /* 15: addw */ + var50.i = var49.i + var40.i; + /* 16: shrsw */ + var51.i = var50.i >> ex->params[28]; + /* 17: convwb */ + var41 = var51.i; + /* 18: storeb */ + ptr0[i] = var41; } } @@ -4067,17 +4389,28 @@ orc_matrix3_000_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P4); - orc_program_append (p, "shrsw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P5); - orc_program_append (p, "convwb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P4, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P5, + ORC_VAR_D1); + orc_program_append_2 (p, "convwb", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -4110,17 +4443,17 @@ orc_pack_123x (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int p1, int n) { int i; - orc_union32 var0; - orc_union32 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = p1; - orc_int16 var32; - orc_int16 var33; + orc_union32 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_int8 var35; + orc_int8 var36; + orc_int8 var37; + orc_union32 var38; + orc_union16 var39; + orc_union16 var40; ptr0 = (orc_union32 *) d1; ptr4 = (orc_int8 *) s1; @@ -4128,41 +4461,43 @@ orc_pack_123x (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: mergebw */ - var32 = ((orc_uint8) var4) | ((orc_uint8) var5 << 8); - /* 1: mergebw */ - var33 = ((orc_uint8) var6) | ((orc_uint8) var24 << 8); - /* 2: mergewl */ - var0.i = ((orc_uint16) var32) | ((orc_uint16) var33 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: loadb */ + var35 = ptr5[i]; + /* 2: mergebw */ + var39.i = ((orc_uint8) var34) | ((orc_uint8) var35 << 8); + /* 3: loadb */ + var36 = ptr6[i]; + /* 4: loadpb */ + var37 = p1; + /* 5: mergebw */ + var40.i = ((orc_uint8) var36) | ((orc_uint8) var37 << 8); + /* 6: mergewl */ + var38.i = ((orc_uint16) var39.i) | ((orc_uint16) var40.i << 16); + /* 7: storel */ + ptr0[i] = var38; } } #else static void -_backup_orc_pack_123x (OrcExecutor * ex) +_backup_orc_pack_123x (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_union32 var0; - orc_union32 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = ex->params[24]; - orc_int16 var32; - orc_int16 var33; + orc_union32 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_int8 var35; + orc_int8 var36; + orc_int8 var37; + orc_union32 var38; + orc_union16 var39; + orc_union16 var40; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -4170,20 +4505,22 @@ _backup_orc_pack_123x (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: mergebw */ - var32 = ((orc_uint8) var4) | ((orc_uint8) var5 << 8); - /* 1: mergebw */ - var33 = ((orc_uint8) var6) | ((orc_uint8) var24 << 8); - /* 2: mergewl */ - var0.i = ((orc_uint16) var32) | ((orc_uint16) var33 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: loadb */ + var35 = ptr5[i]; + /* 2: mergebw */ + var39.i = ((orc_uint8) var34) | ((orc_uint8) var35 << 8); + /* 3: loadb */ + var36 = ptr6[i]; + /* 4: loadpb */ + var37 = ex->params[24]; + /* 5: mergebw */ + var40.i = ((orc_uint8) var36) | ((orc_uint8) var37 << 8); + /* 6: mergewl */ + var38.i = ((orc_uint16) var39.i) | ((orc_uint16) var40.i << 16); + /* 7: storel */ + ptr0[i] = var38; } } @@ -4213,9 +4550,12 @@ orc_pack_123x (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "mergebw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_S2); - orc_program_append (p, "mergebw", ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_P1); - orc_program_append (p, "mergewl", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_S2, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -4244,17 +4584,17 @@ orc_pack_x123 (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int p1, int n) { int i; - orc_union32 var0; - orc_union32 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = p1; - orc_int16 var32; - orc_int16 var33; + orc_union32 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_int8 var35; + orc_int8 var36; + orc_int8 var37; + orc_union32 var38; + orc_union16 var39; + orc_union16 var40; ptr0 = (orc_union32 *) d1; ptr4 = (orc_int8 *) s1; @@ -4262,41 +4602,43 @@ orc_pack_x123 (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, ptr6 = (orc_int8 *) s3; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: mergebw */ - var32 = ((orc_uint8) var24) | ((orc_uint8) var4 << 8); - /* 1: mergebw */ - var33 = ((orc_uint8) var5) | ((orc_uint8) var6 << 8); - /* 2: mergewl */ - var0.i = ((orc_uint16) var32) | ((orc_uint16) var33 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadpb */ + var34 = p1; + /* 1: loadb */ + var35 = ptr4[i]; + /* 2: mergebw */ + var39.i = ((orc_uint8) var34) | ((orc_uint8) var35 << 8); + /* 3: loadb */ + var36 = ptr5[i]; + /* 4: loadb */ + var37 = ptr6[i]; + /* 5: mergebw */ + var40.i = ((orc_uint8) var36) | ((orc_uint8) var37 << 8); + /* 6: mergewl */ + var38.i = ((orc_uint16) var39.i) | ((orc_uint16) var40.i << 16); + /* 7: storel */ + ptr0[i] = var38; } } #else static void -_backup_orc_pack_x123 (OrcExecutor * ex) +_backup_orc_pack_x123 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_union32 var0; - orc_union32 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - const int var24 = ex->params[24]; - orc_int16 var32; - orc_int16 var33; + orc_union32 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var34; + orc_int8 var35; + orc_int8 var36; + orc_int8 var37; + orc_union32 var38; + orc_union16 var39; + orc_union16 var40; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -4304,20 +4646,22 @@ _backup_orc_pack_x123 (OrcExecutor * ex) ptr6 = (orc_int8 *) ex->arrays[6]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - /* 0: mergebw */ - var32 = ((orc_uint8) var24) | ((orc_uint8) var4 << 8); - /* 1: mergebw */ - var33 = ((orc_uint8) var5) | ((orc_uint8) var6 << 8); - /* 2: mergewl */ - var0.i = ((orc_uint16) var32) | ((orc_uint16) var33 << 16); - *ptr0 = var0; - ptr0++; + /* 0: loadpb */ + var34 = ex->params[24]; + /* 1: loadb */ + var35 = ptr4[i]; + /* 2: mergebw */ + var39.i = ((orc_uint8) var34) | ((orc_uint8) var35 << 8); + /* 3: loadb */ + var36 = ptr5[i]; + /* 4: loadb */ + var37 = ptr6[i]; + /* 5: mergebw */ + var40.i = ((orc_uint8) var36) | ((orc_uint8) var37 << 8); + /* 6: mergewl */ + var38.i = ((orc_uint16) var39.i) | ((orc_uint16) var40.i << 16); + /* 7: storel */ + ptr0[i] = var38; } } @@ -4347,9 +4691,12 @@ orc_pack_x123 (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "mergebw", ORC_VAR_T1, ORC_VAR_P1, ORC_VAR_S1); - orc_program_append (p, "mergebw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_S3); - orc_program_append (p, "mergewl", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T1, ORC_VAR_P1, ORC_VAR_S1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_S3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); result = orc_program_compile (p); } @@ -4378,98 +4725,104 @@ cogorc_combine2_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int p1, int p2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 8; - const int var24 = p1; - const int var25 = p2; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var39.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = p1; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; - /* 5: shruw */ - var37 = ((orc_uint16) var36) >> var16; - /* 6: convuuswb */ - var0 = ORC_CLAMP_UB ((orc_uint16) var37); - *ptr0 = var0; - ptr0++; + var40.i = (var39.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; + /* 5: convubw */ + var41.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = p2; + /* 7: mullw */ + var42.i = (var41.i * var37.i) & 0xffff; + /* 8: addw */ + var43.i = var40.i + var42.i; + /* 9: shruw */ + var44.i = ((orc_uint16) var43.i) >> 8; + /* 10: convuuswb */ + var38 = ORC_CLAMP_UB ((orc_uint16) var44.i); + /* 11: storeb */ + ptr0[i] = var38; } } #else static void -_backup_cogorc_combine2_u8 (OrcExecutor * ex) +_backup_cogorc_combine2_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - const orc_int16 var16 = 8; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_union16 var40; + orc_union16 var41; + orc_union16 var42; + orc_union16 var43; + orc_union16 var44; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var39.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = ex->params[24]; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; - /* 5: shruw */ - var37 = ((orc_uint16) var36) >> var16; - /* 6: convuuswb */ - var0 = ORC_CLAMP_UB ((orc_uint16) var37); - *ptr0 = var0; - ptr0++; + var40.i = (var39.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; + /* 5: convubw */ + var41.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = ex->params[25]; + /* 7: mullw */ + var42.i = (var41.i * var37.i) & 0xffff; + /* 8: addw */ + var43.i = var40.i + var42.i; + /* 9: shruw */ + var44.i = ((orc_uint16) var43.i) >> 8; + /* 10: convuuswb */ + var38 = ORC_CLAMP_UB ((orc_uint16) var44.i); + /* 11: storeb */ + ptr0[i] = var38; } } @@ -4494,19 +4847,26 @@ cogorc_combine2_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_add_constant (p, 2, 8, "c1"); + orc_program_add_constant (p, 2, 0x00000008, "c1"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "shruw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "convuuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "shruw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "convuuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -4536,35 +4896,34 @@ cogorc_combine4_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var7; - const orc_int8 *ptr7; - const orc_int16 var16 = 32; - const orc_int16 var17 = 6; - const int var24 = p1; - const int var25 = p2; - const int var26 = p3; - const int var27 = p4; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; - orc_int16 var44; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + const orc_int8 *ORC_RESTRICT ptr7; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_int8 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; + orc_union16 var55; + orc_union16 var56; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -4573,83 +4932,92 @@ cogorc_combine4_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, ptr7 = (orc_int8 *) s4; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - var7 = *ptr7; - ptr7++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var44.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = p1; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; + var45.i = (var44.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; - /* 8: convubw */ - var40 = (orc_uint8) var7; - /* 9: mullw */ - var41 = (var40 * var27) & 0xffff; - /* 10: addw */ - var42 = var39 + var41; - /* 11: addw */ - var43 = var42 + var16; - /* 12: shrsw */ - var44 = var43 >> var17; - /* 13: convsuswb */ - var0 = ORC_CLAMP_UB (var44); - *ptr0 = var0; - ptr0++; + var46.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = p2; + /* 7: mullw */ + var47.i = (var46.i * var37.i) & 0xffff; + /* 8: addw */ + var48.i = var45.i + var47.i; + /* 9: loadb */ + var38 = ptr6[i]; + /* 10: convubw */ + var49.i = (orc_uint8) var38; + /* 11: loadpw */ + var39.i = p3; + /* 12: mullw */ + var50.i = (var49.i * var39.i) & 0xffff; + /* 13: addw */ + var51.i = var48.i + var50.i; + /* 14: loadb */ + var40 = ptr7[i]; + /* 15: convubw */ + var52.i = (orc_uint8) var40; + /* 16: loadpw */ + var41.i = p4; + /* 17: mullw */ + var53.i = (var52.i * var41.i) & 0xffff; + /* 18: addw */ + var54.i = var51.i + var53.i; + /* 19: loadpw */ + var42.i = 32; + /* 20: addw */ + var55.i = var54.i + var42.i; + /* 21: shrsw */ + var56.i = var55.i >> 6; + /* 22: convsuswb */ + var43 = ORC_CLAMP_UB (var56.i); + /* 23: storeb */ + ptr0[i] = var43; } } #else static void -_backup_cogorc_combine4_u8 (OrcExecutor * ex) +_backup_cogorc_combine4_u8 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_int8 var4; - const orc_int8 *ptr4; - orc_int8 var5; - const orc_int8 *ptr5; - orc_int8 var6; - const orc_int8 *ptr6; - orc_int8 var7; - const orc_int8 *ptr7; - const orc_int16 var16 = 32; - const orc_int16 var17 = 6; - const int var24 = ex->params[24]; - const int var25 = ex->params[25]; - const int var26 = ex->params[26]; - const int var27 = ex->params[27]; - orc_int16 var32; - orc_int16 var33; - orc_int16 var34; - orc_int16 var35; - orc_int16 var36; - orc_int16 var37; - orc_int16 var38; - orc_int16 var39; - orc_int16 var40; - orc_int16 var41; - orc_int16 var42; - orc_int16 var43; - orc_int16 var44; + orc_int8 *ORC_RESTRICT ptr0; + const orc_int8 *ORC_RESTRICT ptr4; + const orc_int8 *ORC_RESTRICT ptr5; + const orc_int8 *ORC_RESTRICT ptr6; + const orc_int8 *ORC_RESTRICT ptr7; + orc_int8 var34; + orc_union16 var35; + orc_int8 var36; + orc_union16 var37; + orc_int8 var38; + orc_union16 var39; + orc_int8 var40; + orc_union16 var41; + orc_union16 var42; + orc_int8 var43; + orc_union16 var44; + orc_union16 var45; + orc_union16 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; + orc_union16 var53; + orc_union16 var54; + orc_union16 var55; + orc_union16 var56; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -4658,44 +5026,54 @@ _backup_cogorc_combine4_u8 (OrcExecutor * ex) ptr7 = (orc_int8 *) ex->arrays[7]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - var5 = *ptr5; - ptr5++; - var6 = *ptr6; - ptr6++; - var7 = *ptr7; - ptr7++; - /* 0: convubw */ - var32 = (orc_uint8) var4; - /* 1: mullw */ - var34 = (var32 * var24) & 0xffff; - /* 2: convubw */ - var33 = (orc_uint8) var5; + /* 0: loadb */ + var34 = ptr4[i]; + /* 1: convubw */ + var44.i = (orc_uint8) var34; + /* 2: loadpw */ + var35.i = ex->params[24]; /* 3: mullw */ - var35 = (var33 * var25) & 0xffff; - /* 4: addw */ - var36 = var34 + var35; + var45.i = (var44.i * var35.i) & 0xffff; + /* 4: loadb */ + var36 = ptr5[i]; /* 5: convubw */ - var37 = (orc_uint8) var6; - /* 6: mullw */ - var38 = (var37 * var26) & 0xffff; - /* 7: addw */ - var39 = var36 + var38; - /* 8: convubw */ - var40 = (orc_uint8) var7; - /* 9: mullw */ - var41 = (var40 * var27) & 0xffff; - /* 10: addw */ - var42 = var39 + var41; - /* 11: addw */ - var43 = var42 + var16; - /* 12: shrsw */ - var44 = var43 >> var17; - /* 13: convsuswb */ - var0 = ORC_CLAMP_UB (var44); - *ptr0 = var0; - ptr0++; + var46.i = (orc_uint8) var36; + /* 6: loadpw */ + var37.i = ex->params[25]; + /* 7: mullw */ + var47.i = (var46.i * var37.i) & 0xffff; + /* 8: addw */ + var48.i = var45.i + var47.i; + /* 9: loadb */ + var38 = ptr6[i]; + /* 10: convubw */ + var49.i = (orc_uint8) var38; + /* 11: loadpw */ + var39.i = ex->params[26]; + /* 12: mullw */ + var50.i = (var49.i * var39.i) & 0xffff; + /* 13: addw */ + var51.i = var48.i + var50.i; + /* 14: loadb */ + var40 = ptr7[i]; + /* 15: convubw */ + var52.i = (orc_uint8) var40; + /* 16: loadpw */ + var41.i = ex->params[27]; + /* 17: mullw */ + var53.i = (var52.i * var41.i) & 0xffff; + /* 18: addw */ + var54.i = var51.i + var53.i; + /* 19: loadpw */ + var42.i = 32; + /* 20: addw */ + var55.i = var54.i + var42.i; + /* 21: shrsw */ + var56.i = var55.i >> 6; + /* 22: convsuswb */ + var43 = ORC_CLAMP_UB (var56.i); + /* 23: storeb */ + ptr0[i] = var43; } } @@ -4723,8 +5101,8 @@ cogorc_combine4_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); orc_program_add_source (p, 1, "s4"); - orc_program_add_constant (p, 2, 32, "c1"); - orc_program_add_constant (p, 2, 6, "c2"); + orc_program_add_constant (p, 2, 0x00000020, "c1"); + orc_program_add_constant (p, 2, 0x00000006, "c2"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_parameter (p, 2, "p3"); @@ -4732,20 +5110,34 @@ cogorc_combine4_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); - orc_program_append (p, "convubw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "convubw", ORC_VAR_T2, ORC_VAR_S4, ORC_VAR_D1); - orc_program_append (p, "mullw", ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P4); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2); - orc_program_append (p, "addw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1); - orc_program_append (p, "shrsw", ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2); - orc_program_append (p, "convsuswb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_P1, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P3, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "convubw", 0, ORC_VAR_T2, ORC_VAR_S4, ORC_VAR_D1, + ORC_VAR_D1); + orc_program_append_2 (p, "mullw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_P4, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); + orc_program_append_2 (p, "addw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2, + ORC_VAR_D1); + orc_program_append_2 (p, "convsuswb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -4777,52 +5169,52 @@ void cogorc_unpack_axyz_0 (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_unpack_axyz_0 (OrcExecutor * ex) +_backup_cogorc_unpack_axyz_0 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -4847,8 +5239,10 @@ cogorc_unpack_axyz_0 (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select0lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select0lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -4873,52 +5267,52 @@ void cogorc_unpack_axyz_1 (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_unpack_axyz_1 (OrcExecutor * ex) +_backup_cogorc_unpack_axyz_1 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select0lw */ - var32 = (orc_uint32) var4.i & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select0lw */ + var35.i = (orc_uint32) var33.i & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -4943,8 +5337,10 @@ cogorc_unpack_axyz_1 (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select0lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select0lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -4969,52 +5365,52 @@ void cogorc_unpack_axyz_2 (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_unpack_axyz_2 (OrcExecutor * ex) +_backup_cogorc_unpack_axyz_2 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select0wb */ - var0 = (orc_uint16) var32 & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select0wb */ + var34 = (orc_uint16) var35.i & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -5039,8 +5435,10 @@ cogorc_unpack_axyz_2 (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select1lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select0wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select1lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select0wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } @@ -5065,52 +5463,52 @@ void cogorc_unpack_axyz_3 (orc_uint8 * d1, const orc_uint32 * s1, int n) { int i; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) d1; ptr4 = (orc_union32 *) s1; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } #else static void -_backup_cogorc_unpack_axyz_3 (OrcExecutor * ex) +_backup_cogorc_unpack_axyz_3 (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; - orc_int8 var0; - orc_int8 *ptr0; - orc_union32 var4; - const orc_union32 *ptr4; - orc_int16 var32; + orc_int8 *ORC_RESTRICT ptr0; + const orc_union32 *ORC_RESTRICT ptr4; + orc_union32 var33; + orc_int8 var34; + orc_union16 var35; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; for (i = 0; i < n; i++) { - var4 = *ptr4; - ptr4++; - /* 0: select1lw */ - var32 = ((orc_uint32) var4.i >> 16) & 0xffff; - /* 1: select1wb */ - var0 = ((orc_uint16) var32 >> 8) & 0xff; - *ptr0 = var0; - ptr0++; + /* 0: loadl */ + var33 = ptr4[i]; + /* 1: select1lw */ + var35.i = ((orc_uint32) var33.i >> 16) & 0xffff; + /* 2: select1wb */ + var34 = ((orc_uint16) var35.i >> 8) & 0xff; + /* 3: storeb */ + ptr0[i] = var34; } } @@ -5135,8 +5533,10 @@ cogorc_unpack_axyz_3 (orc_uint8 * d1, const orc_uint32 * s1, int n) orc_program_add_source (p, 4, "s1"); orc_program_add_temporary (p, 2, "t1"); - orc_program_append (p, "select1lw", ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1); - orc_program_append (p, "select1wb", ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1); + orc_program_append_2 (p, "select1lw", 0, ORC_VAR_T1, ORC_VAR_S1, + ORC_VAR_D1, ORC_VAR_D1); + orc_program_append_2 (p, "select1wb", 0, ORC_VAR_D1, ORC_VAR_T1, + ORC_VAR_D1, ORC_VAR_D1); result = orc_program_compile (p); } diff --git a/ext/cog/gstcogorc-dist.h b/ext/cog/gstcogorc-dist.h index 9cf1d40..6bbe2af 100644 --- a/ext/cog/gstcogorc-dist.h +++ b/ext/cog/gstcogorc-dist.h @@ -10,6 +10,8 @@ extern "C" { #endif + + #ifndef _ORC_INTEGER_TYPEDEFS_ #define _ORC_INTEGER_TYPEDEFS_ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L @@ -47,10 +49,10 @@ typedef long orc_int64; typedef unsigned long orc_uint64; #endif #endif -typedef union { orc_int32 i; float f; } orc_union32; -typedef union { orc_int64 i; double f; } orc_union64; +typedef union { orc_int16 i; orc_int8 x2[2]; } orc_union16; +typedef union { orc_int32 i; float f; orc_int16 x2[2]; orc_int8 x4[4]; } orc_union32; +typedef union { orc_int64 i; double f; orc_int32 x2[2]; orc_int16 x4[4]; } orc_union64; #endif - void cogorc_downsample_horiz_cosite_1tap (orc_uint8 * d1, const orc_uint16 * s1, int n); void cogorc_downsample_horiz_cosite_3tap (orc_uint8 * d1, const orc_uint16 * s1, const orc_uint16 * s2, int n); void cogorc_downsample_420_jpeg (orc_uint8 * d1, const orc_uint16 * s1, const orc_uint16 * s2, int n); diff --git a/po/af.po b/po/af.po index caf5886..db0634f 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.7.6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2004-03-18 14:16+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" diff --git a/po/az.po b/po/az.po index fb59e11..a133c52 100644 --- a/po/az.po +++ b/po/az.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2004-03-19 18:29+0200\n" "Last-Translator: Metin Amiroff \n" "Language-Team: Azerbaijani \n" diff --git a/po/bg.po b/po/bg.po index bf892ee..e30b13b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-09-24 15:33+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" diff --git a/po/ca.po b/po/ca.po index e6d3d7c..2749941 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2004-08-05 15:48+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 91276c1..396774f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-29 01:48+0200\n" "Last-Translator: Petr Kovar \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index 817736c..3a4a8d6 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad-0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-12 11:28+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 32a9aae..2fe70f5 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-22 16:58+0200\n" "Last-Translator: Christian Kirbach \n" "Language-Team: German \n" diff --git a/po/en_GB.po b/po/en_GB.po index b609bdb..44e7f40 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2004-04-26 10:41-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" diff --git a/po/es.po b/po/es.po index 5a1907d..ba5d7c6 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-09-29 23:12+0200\n" "Last-Translator: Jorge González González \n" "Language-Team: Spanish \n" diff --git a/po/eu.po b/po/eu.po index 958619c..17402b8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad-0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2010-03-25 12:30+0100\n" "Last-Translator: Mikel Olasagasti Uranga \n" "Language-Team: Basque \n" diff --git a/po/fi.po b/po/fi.po index 319e9e3..38bd091 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-12 22:13+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 43657ad..e1d240d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-09-22 20:27+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" diff --git a/po/hu.po b/po/hu.po index f110803..dd8ff0a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-12 23:33+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" diff --git a/po/id.po b/po/id.po index b842185..2e42d38 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-24 11:38-0400\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" diff --git a/po/it.po b/po/it.po index 33879ab..65dd133 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-14 00:12+0200\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index a721ff1..e0b7008 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.11.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-06-01 20:27+0900\n" "Last-Translator: Makoto Kato \n" "Language-Team: Japanese \n" diff --git a/po/ky.po b/po/ky.po index 71c0a36..db2c215 100644 --- a/po/ky.po +++ b/po/ky.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.5\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2007-11-13 17:16+0600\n" "Last-Translator: Ilyas Bakirov \n" "Language-Team: Kirghiz \n" diff --git a/po/lt.po b/po/lt.po index 910561d..338935d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad-0.10.6.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2008-05-14 02:13+0300\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" diff --git a/po/lv.po b/po/lv.po index 9ef6f00..fcf7318 100644 --- a/po/lv.po +++ b/po/lv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-12 20:33+0100\n" "Last-Translator: Rihards Priedītis \n" "Language-Team: Latvian \n" diff --git a/po/mt.po b/po/mt.po index 5a5c9cd..8c43d0a 100644 --- a/po/mt.po +++ b/po/mt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad-0.10.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2008-10-26 20:27+0100\n" "Last-Translator: Michel Bugeja \n" "Language-Team: Maltese \n" diff --git a/po/nb.po b/po/nb.po index a4cff25..53cd2d7 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.5\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2007-11-03 14:46+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmaal \n" diff --git a/po/nl.po b/po/nl.po index cbc88af..2819eff 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-13 00:06+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff --git a/po/or.po b/po/or.po index ab3aa28..172cda4 100644 --- a/po/or.po +++ b/po/or.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2004-09-27 13:32+0530\n" "Last-Translator: Gora Mohanty \n" "Language-Team: Oriya \n" diff --git a/po/pl.po b/po/pl.po index 6ecf66a..7c7e6db 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-26 16:52+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9d6399f..11808fb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad-0.10.18.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2010-05-26 00:00-0300\n" "Last-Translator: Fabrício Godoy \n" "Language-Team: Brazilian Portuguese \n" diff --git a/po/ru.po b/po/ru.po index daa34c4..ce36ac7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.9.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-02-12 15:00+0200\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index f68fc19..328cf34 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2010-03-08 09:20+0100\n" "Last-Translator: Peter Tuhársky \n" "Language-Team: Slovak \n" diff --git a/po/sq.po b/po/sq.po index c62a610..844bed2 100644 --- a/po/sq.po +++ b/po/sq.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2008-08-15 16:07+0200\n" "Last-Translator: Laurent Dhima \n" "Language-Team: Albanian \n" diff --git a/po/sr.po b/po/sr.po index c3d841a..0024c02 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.7.6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2004-03-13 00:18+0100\n" "Last-Translator: Danilo Segan \n" "Language-Team: Serbian \n" diff --git a/po/sv.po b/po/sv.po index 49ff18e..18f0bdd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-12 20:29+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index e2ebcdf..c4c5fa5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad-0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-08-12 19:51+0200\n" "Last-Translator: Server Acim \n" "Language-Team: Turkish \n" diff --git a/po/uk.po b/po/uk.po index f14a7e2..7b9dbb1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.5\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2007-07-04 12:19+0200\n" "Last-Translator: Maxim V. Dziumanenko \n" "Language-Team: Ukrainian \n" diff --git a/po/vi.po b/po/vi.po index 63efa69..002e9ab 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2010-03-06 22:09+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index ad09b0c..397a3bf 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-bad 0.10.16.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-05-31 02:06+0100\n" +"POT-Creation-Date: 2010-08-21 21:29+0200\n" "PO-Revision-Date: 2009-11-20 18:12中国标准时间\n" "Last-Translator: Ji ZhengYu \n" "Language-Team: Chinese (simplified) \n" diff --git a/win32/common/config.h b/win32/common/config.h index fa61520..f949e9b 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -199,7 +199,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.19.3" +#define VERSION "0.10.19.4" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -- 2.7.4