Revision fa01a208 tcg/optimize.c

b/tcg/optimize.c
394 394 
                args[3] = tcg_swap_cond(args[3]);
395 395 
            }
396 396 
            break;
397 
        CASE_OP_32_64(movcond):
398 
            if (temps[args[1]].state == TCG_TEMP_CONST
399 
                && temps[args[2]].state != TCG_TEMP_CONST) {
400 
                tmp = args[1];
401 
                args[1] = args[2];
402 
                args[2] = tmp;
403 
                args[5] = tcg_swap_cond(args[5]);
404 
            }
397 405 
        default:
398 406 
            break;
399 407 
        }
......
614 622 
            }
615 623 
            args += 4;
616 624 
            break;
625 
        CASE_OP_32_64(movcond):
626 
            if (temps[args[1]].state == TCG_TEMP_CONST
627 
                && temps[args[2]].state == TCG_TEMP_CONST) {
628 
                tmp = do_constant_folding_cond(op, temps[args[1]].val,
629 
                                               temps[args[2]].val, args[5]);
630 
                if (args[0] == args[4-tmp]
631 
                    || (temps[args[4-tmp]].state == TCG_TEMP_COPY
632 
                        && temps[args[4-tmp]].val == args[0])) {
633 
                    gen_opc_buf[op_index] = INDEX_op_nop;
634 
                } else if (temps[args[4-tmp]].state == TCG_TEMP_CONST) {
635 
                    gen_opc_buf[op_index] = op_to_movi(op);
636 
                    tcg_opt_gen_movi(gen_args, args[0], temps[args[4-tmp]].val,
637 
                                     nb_temps, nb_globals);
638 
                    gen_args += 2;
639 
                } else {
640 
                    gen_opc_buf[op_index] = op_to_mov(op);
641 
                    tcg_opt_gen_mov(gen_args, args[0], args[4-tmp],
642 
                                    nb_temps, nb_globals);
643 
                    gen_args += 2;
644 
                }
645 
            } else {
646 
                reset_temp(args[0], nb_temps, nb_globals);
647 
                gen_args[0] = args[0];
648 
                gen_args[1] = args[1];
649 
                gen_args[2] = args[2];
650 
                gen_args[3] = args[3];
651 
                gen_args[4] = args[4];
652 
                gen_args[5] = args[5];
653 
                gen_args += 6;
654 
            }
655 
            args += 6;
656 
            break;
617 657 
        case INDEX_op_call:
618 658 
            nb_call_args = (args[0] >> 16) + (args[0] & 0xffff);
619 659 
            if (!(args[nb_call_args + 1] & (TCG_CALL_CONST | TCG_CALL_PURE))) {

Also available in: Unified diff