Revision a0490b32

View differences:

libavcodec/cabac.h
449 449
        : "%ecx", "%ebx", "%edx", "%esi"
450 450
    );
451 451
    bit&=1;
452
#else
452
#else /* BRANCHLESS_CABAC_DECODER */
453 453
    asm volatile(
454 454
        "movzbl (%1), %%eax                     \n\t"
455 455
        "movl "RANGE    "(%2), %%ebx            \n\t"
......
467 467
        "andl %%ecx, %%edx                      \n\t"
468 468
        "subl %%edx, %%ebx                      \n\t"
469 469
        "xorl %%ecx, %%eax                      \n\t"
470
#else
470
#else /* CMOV_IS_FAST */
471 471
        "movl %%edx, %%ecx                      \n\t"
472 472
        "subl %%ebx, %%edx                      \n\t"
473 473
        "sarl $31, %%edx                        \n\t" //lps_mask
......
477 477
        "andl %%edx, %%ecx                      \n\t"
478 478
        "subl %%ecx, %%ebx                      \n\t"
479 479
        "xorl %%edx, %%eax                      \n\t"
480
#endif
480
#endif /* CMOV_IS_FAST */
481 481

  
482 482
//eax:state ebx:low edx:mask esi:range
483 483
        "movzbl "MANGLE(ff_h264_mps_state)"(%%eax), %%ecx   \n\t"
......
519 519
        : "%ecx", "%ebx", "%edx", "%esi"
520 520
    );
521 521
    bit&=1;
522
#endif
523
#else
522
#endif /* BRANCHLESS_CABAC_DECODER */
523
#else /* ARCH_X86 */
524 524
    int s = *state;
525 525
    int RangeLPS= ff_h264_lps_range[s][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1);
526 526
    int bit, lps_mask attribute_unused;
......
543 543
            refill2(c);
544 544
        }
545 545
    }
546
#else
546
#else /* BRANCHLESS_CABAC_DECODER */
547 547
    lps_mask= (c->range - c->low)>>31;
548 548

  
549 549
    c->low -= c->range & lps_mask;
......
558 558
    c->low  <<= lps_mask;
559 559
    if(!(c->low & CABAC_MASK))
560 560
        refill2(c);
561
#endif
562
#endif
561
#endif /* BRANCHLESS_CABAC_DECODER */
562
#endif /* ARCH_X86 */
563 563
    return bit;
564 564
}
565 565

  

Also available in: Unified diff