Commit ab1103de authored by Evgeny Voevodin's avatar Evgeny Voevodin Committed by Blue Swirl
Browse files

TCG: Use gen_opc_instr_start from context instead of global variable. 



Signed-off-by: default avatarEvgeny Voevodin <e.voevodin@samsung.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent c9c99c22

target-alpha/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -3410,10 +3410,10 @@ static inline void gen_intermediate_code_internal(CPUAlphaState *env, 
            if (lj < j) {

                lj++;

                while (lj < j)

                    gen_opc_instr_start[lj++] = 0;

                    tcg_ctx.gen_opc_instr_start[lj++] = 0;

            }

            tcg_ctx.gen_opc_pc[lj] = ctx.pc;

            gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_icount[lj] = num_insns;

        }

        if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO))
@@ -3468,7 +3468,7 @@ static inline void gen_intermediate_code_internal(CPUAlphaState *env, 
        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

        lj++;

        while (lj <= j)

            gen_opc_instr_start[lj++] = 0;

            tcg_ctx.gen_opc_instr_start[lj++] = 0;

    } else {

        tb->size = ctx.pc - pc_start;

        tb->icount = num_insns;

target-arm/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -9838,11 +9838,11 @@ static inline void gen_intermediate_code_internal(CPUARMState *env, 
            if (lj < j) {

                lj++;

                while (lj < j)

                    gen_opc_instr_start[lj++] = 0;

                    tcg_ctx.gen_opc_instr_start[lj++] = 0;

            }

            tcg_ctx.gen_opc_pc[lj] = dc->pc;

            gen_opc_condexec_bits[lj] = (dc->condexec_cond << 4) | (dc->condexec_mask >> 1);

            gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_icount[lj] = num_insns;

        }
@@ -9977,7 +9977,7 @@ done_generating: 
        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

        lj++;

        while (lj <= j)

            gen_opc_instr_start[lj++] = 0;

            tcg_ctx.gen_opc_instr_start[lj++] = 0;

    } else {

        tb->size = dc->pc - pc_start;

        tb->icount = num_insns;

target-cris/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -3301,7 +3301,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb, 
            if (lj < j) {

                lj++;

                while (lj < j) {

                    gen_opc_instr_start[lj++] = 0;

                    tcg_ctx.gen_opc_instr_start[lj++] = 0;

                }

            }

            if (dc->delayed_branch == 1) {
@@ -3309,7 +3309,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb, 
            } else {

                tcg_ctx.gen_opc_pc[lj] = dc->pc;

            }

            gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_icount[lj] = num_insns;

        }
@@ -3439,7 +3439,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb, 
        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

        lj++;

        while (lj <= j) {

            gen_opc_instr_start[lj++] = 0;

            tcg_ctx.gen_opc_instr_start[lj++] = 0;

        }

    } else {

        tb->size = dc->pc - pc_start;

target-i386/translate.c

+4 −4
Original line number Diff line number Diff line
@@ -7988,11 +7988,11 @@ static inline void gen_intermediate_code_internal(CPUX86State *env, 
            if (lj < j) {

                lj++;

                while (lj < j)

                    gen_opc_instr_start[lj++] = 0;

                    tcg_ctx.gen_opc_instr_start[lj++] = 0;

            }

            tcg_ctx.gen_opc_pc[lj] = pc_ptr;

            gen_opc_cc_op[lj] = dc->cc_op;

            gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_icount[lj] = num_insns;

        }

        if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO))
@@ -8037,7 +8037,7 @@ static inline void gen_intermediate_code_internal(CPUX86State *env, 
        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

        lj++;

        while (lj <= j)

            gen_opc_instr_start[lj++] = 0;

            tcg_ctx.gen_opc_instr_start[lj++] = 0;

    }



#ifdef DEBUG_DISAS
@@ -8080,7 +8080,7 @@ void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb, int pc_pos) 
        int i;

        qemu_log("RESTORE:\n");

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

            if (gen_opc_instr_start[i]) {

            if (tcg_ctx.gen_opc_instr_start[i]) {

                qemu_log("0x%04x: " TARGET_FMT_lx "\n", i,

                        tcg_ctx.gen_opc_pc[i]);

            }

target-lm32/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -1051,11 +1051,11 @@ static void gen_intermediate_code_internal(CPULM32State *env, 
            if (lj < j) {

                lj++;

                while (lj < j) {

                    gen_opc_instr_start[lj++] = 0;

                    tcg_ctx.gen_opc_instr_start[lj++] = 0;

                }

            }

            tcg_ctx.gen_opc_pc[lj] = dc->pc;

            gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_instr_start[lj] = 1;

            tcg_ctx.gen_opc_icount[lj] = num_insns;

        }
@@ -1110,7 +1110,7 @@ static void gen_intermediate_code_internal(CPULM32State *env, 
        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

        lj++;

        while (lj <= j) {

            gen_opc_instr_start[lj++] = 0;

            tcg_ctx.gen_opc_instr_start[lj++] = 0;

        }

    } else {

        tb->size = dc->pc - pc_start;