Commit d39e8222 authored by Avi Kivity's avatar Avi Kivity
Browse files

Uninline get_page_addr_code() 



Its use of IO_MEM_ROM and friends will later cause #include loops; and it
is too large to merit inlining.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent 1d393fa2

exec-all.h

+1 −25
Original line number Diff line number Diff line
@@ -339,31 +339,7 @@ static inline tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong add 
    return addr;

}

#else

/* NOTE: this function can trigger an exception */

/* NOTE2: the returned address is not exactly the physical address: it

   is the offset relative to phys_ram_base */

static inline tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong addr)

{

    int mmu_idx, page_index, pd;

    void *p;



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

    mmu_idx = cpu_mmu_index(env1);

    if (unlikely(env1->tlb_table[mmu_idx][page_index].addr_code !=

                 (addr & TARGET_PAGE_MASK))) {

        ldub_code(addr);

    }

    pd = env1->tlb_table[mmu_idx][page_index].addr_code & ~TARGET_PAGE_MASK;

    if (pd != IO_MEM_RAM && pd != IO_MEM_ROM && !(pd & IO_MEM_ROMD)) {

#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_SPARC)

        cpu_unassigned_access(env1, addr, 0, 1, 0, 4);

#else

        cpu_abort(env1, "Trying to execute code outside RAM or ROM at 0x" TARGET_FMT_lx "\n", addr);

#endif

    }

    p = (void *)((uintptr_t)addr + env1->tlb_table[mmu_idx][page_index].addend);

    return qemu_ram_addr_from_host_nofail(p);

}

tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong addr);

#endif



typedef void (CPUDebugExcpHandler)(CPUState *env);

exec.c

+26 −0
Original line number Diff line number Diff line
@@ -4499,6 +4499,32 @@ void dump_exec_info(FILE *f, fprintf_function cpu_fprintf) 
    tcg_dump_info(f, cpu_fprintf);

}



/* NOTE: this function can trigger an exception */

/* NOTE2: the returned address is not exactly the physical address: it

   is the offset relative to phys_ram_base */

tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong addr)

{

    int mmu_idx, page_index, pd;

    void *p;



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

    mmu_idx = cpu_mmu_index(env1);

    if (unlikely(env1->tlb_table[mmu_idx][page_index].addr_code !=

                 (addr & TARGET_PAGE_MASK))) {

        ldub_code(addr);

    }

    pd = env1->tlb_table[mmu_idx][page_index].addr_code & ~TARGET_PAGE_MASK;

    if (pd != IO_MEM_RAM && pd != IO_MEM_ROM && !(pd & IO_MEM_ROMD)) {

#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_SPARC)

        cpu_unassigned_access(env1, addr, 0, 1, 0, 4);

#else

        cpu_abort(env1, "Trying to execute code outside RAM or ROM at 0x" TARGET_FMT_lx "\n", addr);

#endif

    }

    p = (void *)((uintptr_t)addr + env1->tlb_table[mmu_idx][page_index].addend);

    return qemu_ram_addr_from_host_nofail(p);

}



#define MMUSUFFIX _cmmu

#undef GETPC

#define GETPC() NULL