From 2c4dfa101ae941b2daf5f5e3bc5eb461dc7796de Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 15 Feb 2018 07:14:20 +0100 Subject: [PATCH] Update disted backup ORC files --- gst-libs/gst/audio/gstaudiopack-dist.c | 54 +++++++++++++++----------- gst/audiomixer/gstaudiomixerorc-dist.c | 20 +++++----- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/gst-libs/gst/audio/gstaudiopack-dist.c b/gst-libs/gst/audio/gstaudiopack-dist.c index c6de8f782f..0bd19e99fe 100644 --- a/gst-libs/gst/audio/gstaudiopack-dist.c +++ b/gst-libs/gst/audio/gstaudiopack-dist.c @@ -4788,27 +4788,30 @@ audio_orc_pack_u32_swap (guint8 * ORC_RESTRICT d1, int i; orc_union32 *ORC_RESTRICT ptr0; const orc_union32 *ORC_RESTRICT ptr4; - orc_union32 var32; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var33; -#else orc_union32 var33; -#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var34; +#else orc_union32 var34; +#endif + orc_union32 var35; + orc_union32 var36; ptr0 = (orc_union32 *) d1; ptr4 = (orc_union32 *) s1; /* 1: loadpl */ - var33.i = 0x80000000; /* -2147483648 or 1.061e-314f */ + var34.i = 0x80000000; /* -2147483648 or 1.061e-314f */ for (i = 0; i < n; i++) { /* 0: loadl */ - var32 = ptr4[i]; + var33 = ptr4[i]; /* 2: xorl */ - var34.i = var32.i ^ var33.i; - /* 3: storel */ - ptr0[i] = var34; + var36.i = var33.i ^ var34.i; + /* 3: swapl */ + var35.i = ORC_SWAP_L (var36.i); + /* 4: storel */ + ptr0[i] = var35; } } @@ -4821,27 +4824,30 @@ _backup_audio_orc_pack_u32_swap (OrcExecutor * ORC_RESTRICT ex) int n = ex->n; orc_union32 *ORC_RESTRICT ptr0; const orc_union32 *ORC_RESTRICT ptr4; - orc_union32 var32; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var33; -#else orc_union32 var33; -#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var34; +#else orc_union32 var34; +#endif + orc_union32 var35; + orc_union32 var36; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; /* 1: loadpl */ - var33.i = 0x80000000; /* -2147483648 or 1.061e-314f */ + var34.i = 0x80000000; /* -2147483648 or 1.061e-314f */ for (i = 0; i < n; i++) { /* 0: loadl */ - var32 = ptr4[i]; + var33 = ptr4[i]; /* 2: xorl */ - var34.i = var32.i ^ var33.i; - /* 3: storel */ - ptr0[i] = var34; + var36.i = var33.i ^ var34.i; + /* 3: swapl */ + var35.i = ORC_SWAP_L (var36.i); + /* 4: storel */ + ptr0[i] = var35; } } @@ -4864,7 +4870,8 @@ audio_orc_pack_u32_swap (guint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 23, 97, 117, 100, 105, 111, 95, 111, 114, 99, 95, 112, 97, 99, 107, 95, 117, 51, 50, 95, 115, 119, 97, 112, 11, 4, 4, 12, 4, 4, - 14, 4, 0, 0, 0, 128, 132, 0, 4, 16, 2, 0, + 14, 4, 0, 0, 0, 128, 20, 4, 132, 32, 4, 16, 184, 0, 32, 2, + 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_audio_orc_pack_u32_swap); @@ -4875,8 +4882,11 @@ audio_orc_pack_u32_swap (guint8 * ORC_RESTRICT d1, orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0x80000000, "c1"); + orc_program_add_temporary (p, 4, "t1"); - orc_program_append_2 (p, "xorl", 0, ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_C1, + orc_program_append_2 (p, "xorl", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_C1, + ORC_VAR_D1); + orc_program_append_2 (p, "swapl", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1, ORC_VAR_D1); #endif diff --git a/gst/audiomixer/gstaudiomixerorc-dist.c b/gst/audiomixer/gstaudiomixerorc-dist.c index be377f7054..fae10cf260 100644 --- a/gst/audiomixer/gstaudiomixerorc-dist.c +++ b/gst/audiomixer/gstaudiomixerorc-dist.c @@ -137,11 +137,11 @@ void audiomixer_orc_add_volume_f64 (double *ORC_RESTRICT d1, #define ORC_MAX(a,b) ((a)>(b) ? (a) : (b)) #define ORC_SB_MAX 127 #define ORC_SB_MIN (-1-ORC_SB_MAX) -#define ORC_UB_MAX 255 +#define ORC_UB_MAX (orc_uint8) 255 #define ORC_UB_MIN 0 #define ORC_SW_MAX 32767 #define ORC_SW_MIN (-1-ORC_SW_MAX) -#define ORC_UW_MAX 65535 +#define ORC_UW_MAX (orc_uint16)65535 #define ORC_UW_MIN 0 #define ORC_SL_MAX 2147483647 #define ORC_SL_MIN (-1-ORC_SL_MAX) @@ -1129,7 +1129,7 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) ptr0 = (orc_int8 *) d1; /* 1: loadpb */ - var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var35 = 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = p1; @@ -1175,7 +1175,7 @@ _backup_audiomixer_orc_volume_u8 (OrcExecutor * ORC_RESTRICT ex) ptr0 = (orc_int8 *) ex->arrays[0]; /* 1: loadpb */ - var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var35 = 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = ex->params[24]; @@ -1292,7 +1292,7 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, ptr4 = (orc_int8 *) s1; /* 1: loadpb */ - var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var35 = 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = p1; @@ -1346,7 +1346,7 @@ _backup_audiomixer_orc_add_volume_u8 (OrcExecutor * ORC_RESTRICT ex) ptr4 = (orc_int8 *) ex->arrays[4]; /* 1: loadpb */ - var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var35 = 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = ex->params[24]; @@ -1622,7 +1622,7 @@ audiomixer_orc_add_volume_u16 (guint16 * ORC_RESTRICT d1, ptr4 = (orc_union16 *) s1; /* 1: loadpw */ - var35.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ + var35.i = 0x00008000; /* 32768 or 1.61895e-319f */ /* 3: loadpw */ var36.i = p1; @@ -1676,7 +1676,7 @@ _backup_audiomixer_orc_add_volume_u16 (OrcExecutor * ORC_RESTRICT ex) ptr4 = (orc_union16 *) ex->arrays[4]; /* 1: loadpw */ - var35.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ + var35.i = 0x00008000; /* 32768 or 1.61895e-319f */ /* 3: loadpw */ var36.i = ex->params[24]; @@ -1956,7 +1956,7 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, ptr4 = (orc_union32 *) s1; /* 1: loadpl */ - var35.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ + var35.i = 0x80000000; /* -2147483648 or 1.061e-314f */ /* 3: loadpl */ var36.i = p1; @@ -2012,7 +2012,7 @@ _backup_audiomixer_orc_add_volume_u32 (OrcExecutor * ORC_RESTRICT ex) ptr4 = (orc_union32 *) ex->arrays[4]; /* 1: loadpl */ - var35.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ + var35.i = 0x80000000; /* -2147483648 or 1.061e-314f */ /* 3: loadpl */ var36.i = ex->params[24];