Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
pull/2/head
Mans Rullgard 14 years ago
parent e4b5a204aa
commit 3fc4e36c78
1 changed files with 37 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      libavcodec/x86/h264_i386.h

72
libavcodec/x86/h264_i386.h
Unescape View File

@ -42,31 +42,32 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
void *end= significant_coeff_ctx_base + max_coeff - 1;
int minusstart= -(int)significant_coeff_ctx_base;
int minusindex= 4-(int)index;
int bit;
x86_reg coeff_count;
int low;
__asm__ volatile(
"movl %a9(%4), %%esi \n\t"
"movl %a10(%4), %3 \n\t"
"movl %a10(%5), %%esi \n\t"
"movl %a11(%5), %3 \n\t"
"2: \n\t"
BRANCHLESS_GET_CABAC("%%edx", "%4", "(%1)", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a11")
BRANCHLESS_GET_CABAC("%4", "%5", "(%1)", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a12")
"test $1, %%edx \n\t"
"test $1, %4 \n\t"
" jz 3f \n\t"
"add %8, %1 \n\t"
"add %9, %1 \n\t"
BRANCHLESS_GET_CABAC("%%edx", "%4", "(%1)", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a11")
BRANCHLESS_GET_CABAC("%4", "%5", "(%1)", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a12")
"sub %8, %1 \n\t"
"sub %9, %1 \n\t"
"mov %2, %0 \n\t"
"movl %5, %%ecx \n\t"
"movl %6, %%ecx \n\t"
"add %1, %%"REG_c" \n\t"
"movl %%ecx, (%0) \n\t"
"test $1, %%edx \n\t"
"test $1, %4 \n\t"
" jnz 4f \n\t"
"add $4, %0 \n\t"
@ -74,24 +75,24 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
"3: \n\t"
"add $1, %1 \n\t"
"cmp %6, %1 \n\t"
"cmp %7, %1 \n\t"
" jb 2b \n\t"
"mov %2, %0 \n\t"
"movl %5, %%ecx \n\t"
"movl %6, %%ecx \n\t"
"add %1, %%"REG_c" \n\t"
"movl %%ecx, (%0) \n\t"
"4: \n\t"
"add %7, %k0 \n\t"
"add %8, %k0 \n\t"
"shr $2, %k0 \n\t"
"movl %%esi, %a9(%4) \n\t"
"movl %3, %a10(%4) \n\t"
"movl %%esi, %a10(%5) \n\t"
"movl %3, %a11(%5) \n\t"
:"=&r"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
"=&r"(low)
"=&r"(low), "=&r"(bit)
:"r"(c), "m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off),
"i"(offsetof(CABACContext, range)), "i"(offsetof(CABACContext, low)),
"i"(offsetof(CABACContext, bytestream))
: "%"REG_c, "%edx", "%esi", "memory"
: "%"REG_c, "%esi", "memory"
);
return coeff_count;
}
@ -100,39 +101,40 @@ static int decode_significance_8x8_x86(CABACContext *c,
uint8_t *significant_coeff_ctx_base,
int *index, x86_reg last_off, const uint8_t *sig_off){
int minusindex= 4-(int)index;
int bit;
x86_reg coeff_count;
int low;
x86_reg last=0;
__asm__ volatile(
"movl %a9(%4), %%esi \n\t"
"movl %a10(%4), %3 \n\t"
"movl %a10(%5), %%esi \n\t"
"movl %a11(%5), %3 \n\t"
"mov %1, %%"REG_D" \n\t"
"2: \n\t"
"mov %7, %0 \n\t"
"mov %8, %0 \n\t"
"movzbl (%0, %%"REG_D"), %%edi \n\t"
"add %6, %%"REG_D" \n\t"
"add %7, %%"REG_D" \n\t"
BRANCHLESS_GET_CABAC("%%edx", "%4", "(%%"REG_D")", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a11")
BRANCHLESS_GET_CABAC("%4", "%5", "(%%"REG_D")", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a12")
"mov %1, %%edi \n\t"
"test $1, %%edx \n\t"
"test $1, %4 \n\t"
" jz 3f \n\t"
"movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%%edi), %%edi\n\t"
"add %6, %%"REG_D" \n\t"
"add %8, %%"REG_D" \n\t"
"add %7, %%"REG_D" \n\t"
"add %9, %%"REG_D" \n\t"
BRANCHLESS_GET_CABAC("%%edx", "%4", "(%%"REG_D")", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a11")
BRANCHLESS_GET_CABAC("%4", "%5", "(%%"REG_D")", "%3",
"%w3", "%%esi", "%k0", "%b0", "%a12")
"mov %2, %0 \n\t"
"mov %1, %%edi \n\t"
"movl %%edi, (%0) \n\t"
"test $1, %%edx \n\t"
"test $1, %4 \n\t"
" jnz 4f \n\t"
"add $4, %0 \n\t"
@ -146,16 +148,16 @@ static int decode_significance_8x8_x86(CABACContext *c,
"mov %2, %0 \n\t"
"movl %%edi, (%0) \n\t"
"4: \n\t"
"addl %5, %k0 \n\t"
"addl %6, %k0 \n\t"
"shr $2, %k0 \n\t"
"movl %%esi, %a9(%4) \n\t"
"movl %3, %a10(%4) \n\t"
:"=&r"(coeff_count),"+m"(last), "+m"(index), "=&r"(low)
"movl %%esi, %a10(%5) \n\t"
"movl %3, %a11(%5) \n\t"
:"=&r"(coeff_count),"+m"(last), "+m"(index), "=&r"(low), "=&r"(bit)
:"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off), "m"(last_off),
"i"(offsetof(CABACContext, range)), "i"(offsetof(CABACContext, low)),
"i"(offsetof(CABACContext, bytestream))
: "%"REG_c, "%edx", "%esi", "%"REG_D, "memory"
: "%"REG_c, "%esi", "%"REG_D, "memory"
);
return coeff_count;
}

Write Preview
Loading…
Cancel
Save