Commit dbdbe0cd authored by Richard Henderson's avatar Richard Henderson
Browse files

exec: Delete is_tcg_gen_code and GETRA_EXT 



All implementations now boil down to GETRA.

Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent 023261ef

include/exec/exec-all.h

+0 −12
Original line number Diff line number Diff line
@@ -320,18 +320,6 @@ extern uintptr_t tci_tb_ptr; 


#define GETPC()  (GETRA() - GETPC_ADJ)



/* ??? Delete these once they are no longer used.  */

bool is_tcg_gen_code(uintptr_t pc_ptr);

#ifdef GETRA_LDST

# define GETRA_EXT()  tcg_getra_ext(GETRA())

static inline uintptr_t tcg_getra_ext(uintptr_t ra)

{

    return is_tcg_gen_code(ra) ? GETRA_LDST(ra) : ra;

}

#else

# define GETRA_EXT()  GETRA()

#endif



#if !defined(CONFIG_USER_ONLY)



void phys_mem_set_alloc(void *(*alloc)(ram_addr_t));

include/exec/softmmu_template.h

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, 
                                         int mmu_idx)

{

    return glue(glue(helper_ret_ld, USUFFIX), MMUSUFFIX)(env, addr, mmu_idx,

                                                        GETRA_EXT());

                                                         GETRA());

}



#ifndef SOFTMMU_CODE_ACCESS
@@ -285,7 +285,7 @@ glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, 
                                         DATA_TYPE val, int mmu_idx)

{

    glue(glue(helper_ret_st, SUFFIX), MMUSUFFIX)(env, addr, val, mmu_idx,

                                                 GETRA_EXT());

                                                 GETRA());

}



#endif /* !defined(SOFTMMU_CODE_ACCESS) */

translate-all.c

+0 −12
Original line number Diff line number Diff line
@@ -1318,18 +1318,6 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, 
    mmap_unlock();

}



#if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU)

/* check whether the given addr is in TCG generated code buffer or not */

bool is_tcg_gen_code(uintptr_t tc_ptr)

{

    /* This can be called during code generation, code_gen_buffer_size

       is used instead of code_gen_ptr for upper boundary checking */

    return (tc_ptr >= (uintptr_t)tcg_ctx.code_gen_buffer &&

            tc_ptr < (uintptr_t)(tcg_ctx.code_gen_buffer +

                    tcg_ctx.code_gen_buffer_size));

}

#endif



/* find the TB 'tb' such that tb[0].tc_ptr <= tc_ptr <

   tb[1].tc_ptr. Return NULL if not found */

static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)