Commit 3213525f authored by Sergey Fedorov's avatar Sergey Fedorov Committed by Richard Henderson
Browse files

tcg: Remove needless CPUState::current_tb 



This field was used for telling cpu_interrupt() to unlink a chain of TBs
being executed when it worked that way. Now, cpu_interrupt() don't do
this anymore. So we don't need this field anymore.

Signed-off-by: default avatarSergey Fedorov <serge.fdrv@gmail.com>
Signed-off-by: default avatarSergey Fedorov <sergey.fedorov@linaro.org>
Message-Id: <1462273462-14036-1-git-send-email-sergey.fedorov@linaro.org>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent a0522c7a

cpu-exec-common.c

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ void cpu_reloading_memory_map(void) 


void cpu_loop_exit(CPUState *cpu)

{

    cpu->current_tb = NULL;

    siglongjmp(cpu->jmp_env, 1);

}
@@ -77,6 +76,5 @@ void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc) 
    if (pc) {

        cpu_restore_state(cpu, pc);

    }

    cpu->current_tb = NULL;

    siglongjmp(cpu->jmp_env, 1);

}

cpu-exec.c

+0 −4
Original line number Diff line number Diff line
@@ -216,11 +216,9 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles, 
                         | (ignore_icount ? CF_IGNORE_ICOUNT : 0));

    tb->orig_tb = cpu->tb_flushed ? NULL : orig_tb;

    cpu->tb_flushed |= old_tb_flushed;

    cpu->current_tb = tb;

    /* execute the generated code */

    trace_exec_tb_nocache(tb, tb->pc);

    cpu_tb_exec(cpu, tb);

    cpu->current_tb = NULL;

    tb_phys_invalidate(tb, -1);

    tb_free(tb);

}
@@ -532,9 +530,7 @@ int cpu_exec(CPUState *cpu) 
                    uintptr_t ret;

                    trace_exec_tb(tb, tb->pc);

                    /* execute the generated code */

                    cpu->current_tb = tb;

                    ret = cpu_tb_exec(cpu, tb);

                    cpu->current_tb = NULL;

                    last_tb = (TranslationBlock *)(ret & ~TB_EXIT_MASK);

                    tb_exit = ret & TB_EXIT_MASK;

                    switch (tb_exit) {

cputlb.c

+0 −13
Original line number Diff line number Diff line
@@ -76,10 +76,6 @@ void tlb_flush(CPUState *cpu, int flush_global) 


    tlb_debug("(%d)\n", flush_global);



    /* must reset current TB so that interrupts cannot modify the

       links while we are modifying them */

    cpu->current_tb = NULL;



    memset(env->tlb_table, -1, sizeof(env->tlb_table));

    memset(env->tlb_v_table, -1, sizeof(env->tlb_v_table));

    memset(cpu->tb_jmp_cache, 0, sizeof(cpu->tb_jmp_cache));
@@ -95,9 +91,6 @@ static inline void v_tlb_flush_by_mmuidx(CPUState *cpu, va_list argp) 
    CPUArchState *env = cpu->env_ptr;



    tlb_debug("start\n");

    /* must reset current TB so that interrupts cannot modify the

       links while we are modifying them */

    cpu->current_tb = NULL;



    for (;;) {

        int mmu_idx = va_arg(argp, int);
@@ -152,9 +145,6 @@ void tlb_flush_page(CPUState *cpu, target_ulong addr) 
        tlb_flush(cpu, 1);

        return;

    }

    /* must reset current TB so that interrupts cannot modify the

       links while we are modifying them */

    cpu->current_tb = NULL;



    addr &= TARGET_PAGE_MASK;

    i = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
@@ -193,9 +183,6 @@ void tlb_flush_page_by_mmuidx(CPUState *cpu, target_ulong addr, ...) 
        va_end(argp);

        return;

    }

    /* must reset current TB so that interrupts cannot modify the

       links while we are modifying them */

    cpu->current_tb = NULL;



    addr &= TARGET_PAGE_MASK;

    i = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);

hw/i386/kvmvapic.c

+0 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) 
    resume_all_vcpus();



    if (!kvm_enabled()) {

        cs->current_tb = NULL;

        tb_gen_code(cs, current_pc, current_cs_base, current_flags, 1);

        cpu_resume_from_signal(cs, NULL);

    }

include/qom/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ struct kvm_run; 
 * @as: Pointer to the first AddressSpace, for the convenience of targets which

 *      only have a single AddressSpace

 * @env_ptr: Pointer to subclass-specific CPUArchState field.

 * @current_tb: Currently executing TB.

 * @gdb_regs: Additional GDB registers.

 * @gdb_num_regs: Number of total registers accessible to GDB.

 * @gdb_num_g_regs: Number of registers in GDB 'g' packets.
@@ -305,7 +304,6 @@ struct CPUState { 
    MemoryRegion *memory;



    void *env_ptr; /* CPUArchState */

    struct TranslationBlock *current_tb;

    struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE];

    struct GDBRegisterState *gdb_regs;

    int gdb_num_regs;