Commit 15fc7daa authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg: Remove unused opcodes 



We no longer need INDEX_op_end to terminate the list, nor do we
need 5 forms of nop, since we just remove the TCGOp instead.

Reviewed-by: default avatarBastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent a4ce099a

tcg/tcg-opc.h

+0 −9
Original line number Diff line number Diff line
@@ -27,15 +27,6 @@ 
 */



/* predefined ops */

DEF(end, 0, 0, 0, TCG_OPF_NOT_PRESENT) /* must be kept first */

DEF(nop, 0, 0, 0, TCG_OPF_NOT_PRESENT)

DEF(nop1, 0, 0, 1, TCG_OPF_NOT_PRESENT)

DEF(nop2, 0, 0, 2, TCG_OPF_NOT_PRESENT)

DEF(nop3, 0, 0, 3, TCG_OPF_NOT_PRESENT)



/* variable number of parameters */

DEF(nopn, 0, 0, 1, TCG_OPF_NOT_PRESENT)



DEF(discard, 1, 0, 0, TCG_OPF_NOT_PRESENT)

DEF(set_label, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT)

tcg/tcg.c

+2 −5
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ void tcg_op_remove(TCGContext *s, TCGOp *op) 
        s->gen_first_op_idx = next;

    }



    *op = (TCGOp){ .opc = INDEX_op_nop, .next = -1, .prev = -1 };

    memset(op, -1, sizeof(*op));



#ifdef CONFIG_PROFILER

    s->del_op_count++;
@@ -1385,8 +1385,6 @@ static void tcg_liveness_analysis(TCGContext *s) 
            }

            break;

        case INDEX_op_debug_insn_start:

        case INDEX_op_nop:

        case INDEX_op_end:

            break;

        case INDEX_op_discard:

            /* mark the temporary as dead */
@@ -2244,7 +2242,7 @@ void tcg_dump_op_count(FILE *f, fprintf_function cpu_fprintf) 
{

    int i;



    for(i = INDEX_op_end; i < NB_OPS; i++) {

    for (i = 0; i < NB_OPS; i++) {

        cpu_fprintf(f, "%s %" PRId64 "\n", tcg_op_defs[i].name,

                    tcg_table_op_count[i]);

    }
@@ -2328,7 +2326,6 @@ static inline int tcg_gen_code_common(TCGContext *s, 
            tcg_reg_alloc_movi(s, args, dead_args, sync_args);

            break;

        case INDEX_op_debug_insn_start:

        case INDEX_op_nop:

            break;

        case INDEX_op_discard:

            temp_dead(s, args[0]);

tci.c

+0 −13
Original line number Diff line number Diff line
@@ -506,19 +506,6 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) 
        tb_ptr += 2;



        switch (opc) {

        case INDEX_op_end:

        case INDEX_op_nop:

            break;

        case INDEX_op_nop1:

        case INDEX_op_nop2:

        case INDEX_op_nop3:

        case INDEX_op_nopn:

        case INDEX_op_discard:

            TODO();

            break;

        case INDEX_op_set_label:

            TODO();

            break;

        case INDEX_op_call:

            t0 = tci_read_ri(&tb_ptr);

#if TCG_TARGET_REG_BITS == 32