cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().

diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index adf4fc39b22014d8851a16be7e75f89c8aec9842..e03a4dec9c3d02b16c51d07207b58f27d8d1142a 100644 (file)
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -89,11 +89,11 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c,
     int bit, tmp;
 
     __asm__ volatile(
-        BRANCHLESS_GET_CABAC("%0", "(%5)", "%1", "%w1", "%2",
-                             "%3", "%b3", "%4")
-        :"=&r"(bit), "+&r"(c->low), "+&r"(c->range), "=&q"(tmp),
-         "+m"(c->bytestream)
-        :"r"(state)
+        BRANCHLESS_GET_CABAC("%0", "(%4)", "%1", "%w1",
+                             "%2", "%3", "%b3", "%a6(%5)")
+        : "=&r"(bit), "+&r"(c->low), "+&r"(c->range), "=&q"(tmp)
+        : "r"(state), "r"(c),
+          "i"(offsetof(CABACContext, bytestream))
         : "%"REG_c, "memory"
     );
     return bit & 1;

diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h
index e195e04879810bd5593539c36f9f9460467637ba..2cfcbddfb22e4e4d73a11c330e06692383e2962a 100644 (file)
--- a/libavcodec/x86/h264_i386.h
+++ b/libavcodec/x86/h264_i386.h
@@ -48,15 +48,15 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
     __asm__ volatile(
         "2:                                     \n\t"
 
-        BRANCHLESS_GET_CABAC("%4", "(%1)", "%3",
-                             "%w3", "%5", "%k0", "%b0", "%6")
+        BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", "%w3",
+                             "%5", "%k0", "%b0", "%a11(%6)")
 
         "test $1, %4                            \n\t"
         " jz 3f                                 \n\t"
         "add  %10, %1                           \n\t"
 
-        BRANCHLESS_GET_CABAC("%4", "(%1)", "%3",
-                             "%w3", "%5", "%k0", "%b0", "%6")
+        BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", "%w3",
+                             "%5", "%k0", "%b0", "%a11(%6)")
 
         "sub  %10, %1                           \n\t"
         "mov  %2, %0                            \n\t"
@@ -80,10 +80,10 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
         "4:                                     \n\t"
         "add  %9, %k0                           \n\t"
         "shr $2, %k0                            \n\t"
-        :"=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
-         "+&r"(c->low), "=&r"(bit), "+&r"(c->range),
-         "+m"(c->bytestream)
-        :"m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off)
+        : "=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
+          "+&r"(c->low), "=&r"(bit), "+&r"(c->range)
+        : "r"(c), "m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off),
+          "i"(offsetof(CABACContext, bytestream))
         : "%"REG_c, "memory"
     );
     return coeff_count;
@@ -105,8 +105,8 @@ static int decode_significance_8x8_x86(CABACContext *c,
         "movzbl (%0, %6), %k6                   \n\t"
         "add %9, %6                             \n\t"
 
-        BRANCHLESS_GET_CABAC("%4", "(%6)", "%3",
-                             "%w3", "%5", "%k0", "%b0", "%7")
+        BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", "%w3",
+                             "%5", "%k0", "%b0", "%a12(%7)")
 
         "mov %1, %k6                            \n\t"
         "test $1, %4                            \n\t"
@@ -115,8 +115,8 @@ static int decode_significance_8x8_x86(CABACContext *c,
         "movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%k6), %k6\n\t"
         "add %11, %6                            \n\t"
 
-        BRANCHLESS_GET_CABAC("%4", "(%6)", "%3",
-                             "%w3", "%5", "%k0", "%b0", "%7")
+        BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", "%w3",
+                             "%5", "%k0", "%b0", "%a12(%7)")
 
         "mov %2, %0                             \n\t"
         "mov %1, %k6                            \n\t"
@@ -137,9 +137,11 @@ static int decode_significance_8x8_x86(CABACContext *c,
         "4:                                     \n\t"
         "addl %8, %k0                           \n\t"
         "shr $2, %k0                            \n\t"
-        :"=&q"(coeff_count),"+m"(last), "+m"(index), "+&r"(c->low), "=&r"(bit),
-         "+&r"(c->range), "=&r"(state), "+m"(c->bytestream)
-        :"m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off), "m"(last_coeff_ctx_base)
+        : "=&q"(coeff_count), "+m"(last), "+m"(index), "+&r"(c->low),
+          "=&r"(bit), "+&r"(c->range), "=&r"(state)
+        : "r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base),
+          "m"(sig_off), "m"(last_coeff_ctx_base),
+          "i"(offsetof(CABACContext, bytestream))
         : "%"REG_c, "memory"
     );
     return coeff_count;