Commit 00b941e5 authored by Andreas Färber's avatar Andreas Färber
Browse files

cpu: Turn cpu_get_phys_page_debug() into a CPUClass hook 



Change breakpoint_invalidate() argument to CPUState alongside.

Since all targets now assign a softmmu-only field, we can drop helpers
cpu_class_set_{do_unassigned_access,vmsd}() and device_class_set_vmsd().

Prepares for changing cpu_memory_rw_debug() argument to CPUState.

Acked-by: Max Filippov <jcmvbkbc@gmail.com> (for xtensa)
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 385b9f0e

exec.c

+11 −9
Original line number Diff line number Diff line
@@ -415,14 +415,14 @@ void cpu_exec_init(CPUArchState *env) 


#if defined(TARGET_HAS_ICE)

#if defined(CONFIG_USER_ONLY)

static void breakpoint_invalidate(CPUArchState *env, target_ulong pc)

static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

{

    tb_invalidate_phys_page_range(pc, pc + 1, 0);

}

#else

static void breakpoint_invalidate(CPUArchState *env, target_ulong pc)

static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

{

    tb_invalidate_phys_addr(cpu_get_phys_page_debug(env, pc) |

    tb_invalidate_phys_addr(cpu_get_phys_page_debug(cpu, pc) |

            (pc & ~TARGET_PAGE_MASK));

}

#endif
@@ -525,15 +525,17 @@ int cpu_breakpoint_insert(CPUArchState *env, target_ulong pc, int flags, 
    bp->flags = flags;



    /* keep all GDB-injected breakpoints in front */

    if (flags & BP_GDB)

    if (flags & BP_GDB) {

        QTAILQ_INSERT_HEAD(&env->breakpoints, bp, entry);

    else

    } else {

        QTAILQ_INSERT_TAIL(&env->breakpoints, bp, entry);

    }



    breakpoint_invalidate(env, pc);

    breakpoint_invalidate(ENV_GET_CPU(env), pc);



    if (breakpoint)

    if (breakpoint) {

        *breakpoint = bp;

    }

    return 0;

#else

    return -ENOSYS;
@@ -564,7 +566,7 @@ void cpu_breakpoint_remove_by_ref(CPUArchState *env, CPUBreakpoint *breakpoint) 
#if defined(TARGET_HAS_ICE)

    QTAILQ_REMOVE(&env->breakpoints, breakpoint, entry);



    breakpoint_invalidate(env, breakpoint->pc);

    breakpoint_invalidate(ENV_GET_CPU(env), breakpoint->pc);



    g_free(breakpoint);

#endif
@@ -2613,7 +2615,7 @@ int cpu_memory_rw_debug(CPUArchState *env, target_ulong addr, 


    while (len > 0) {

        page = addr & TARGET_PAGE_MASK;

        phys_addr = cpu_get_phys_page_debug(env, page);

        phys_addr = cpu_get_phys_page_debug(ENV_GET_CPU(env), page);

        /* if no physical page mapped, return an error */

        if (phys_addr == -1)

            return -1;

hw/i386/kvmvapic.c

+4 −2
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static void update_guest_rom_state(VAPICROMState *s) 


static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env)

{

    CPUState *cs = CPU(x86_env_get_cpu(env));

    hwaddr paddr;

    target_ulong addr;
@@ -158,7 +159,7 @@ static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env) 
     * virtual address space for the APIC mapping.

     */

    for (addr = 0xfffff000; addr >= 0x80000000; addr -= TARGET_PAGE_SIZE) {

        paddr = cpu_get_phys_page_debug(env, addr);

        paddr = cpu_get_phys_page_debug(cs, addr);

        if (paddr != APIC_DEFAULT_ADDRESS) {

            continue;

        }
@@ -271,6 +272,7 @@ instruction_ok: 


static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong ip)

{

    CPUState *cs = CPU(x86_env_get_cpu(env));

    hwaddr paddr;

    uint32_t rom_state_vaddr;

    uint32_t pos, patch, offset;
@@ -287,7 +289,7 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i 


    /* find out virtual address of the ROM */

    rom_state_vaddr = s->rom_state_paddr + (ip & 0xf0000000);

    paddr = cpu_get_phys_page_debug(env, rom_state_vaddr);

    paddr = cpu_get_phys_page_debug(cs, rom_state_vaddr);

    if (paddr == -1) {

        return -1;

    }

hw/xtensa/xtensa_lx60.c

+5 −3
Original line number Diff line number Diff line
@@ -144,9 +144,11 @@ static void lx60_net_init(MemoryRegion *address_space, 
    memory_region_add_subregion(address_space, buffers, ram);

}



static uint64_t translate_phys_addr(void *env, uint64_t addr)

static uint64_t translate_phys_addr(void *opaque, uint64_t addr)

{

    return cpu_get_phys_page_debug(env, addr);

    XtensaCPU *cpu = opaque;



    return cpu_get_phys_page_debug(CPU(cpu), addr);

}



static void lx60_reset(void *opaque)
@@ -252,7 +254,7 @@ static void lx_init(const LxBoardDesc *board, QEMUMachineInitArgs *args) 
        }

        uint64_t elf_entry;

        uint64_t elf_lowaddr;

        int success = load_elf(kernel_filename, translate_phys_addr, env,

        int success = load_elf(kernel_filename, translate_phys_addr, cpu,

                &elf_entry, &elf_lowaddr, NULL, be, ELF_MACHINE, 0);

        if (success > 0) {

            env->pc = elf_entry;

hw/xtensa/xtensa_sim.c

+6 −4
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ 
#include "exec/memory.h"

#include "exec/address-spaces.h"



static uint64_t translate_phys_addr(void *env, uint64_t addr)

static uint64_t translate_phys_addr(void *opaque, uint64_t addr)

{

    return cpu_get_phys_page_debug(env, addr);

    XtensaCPU *cpu = opaque;



    return cpu_get_phys_page_debug(CPU(cpu), addr);

}



static void sim_reset(void *opaque)
@@ -88,10 +90,10 @@ static void xtensa_sim_init(QEMUMachineInitArgs *args) 
        uint64_t elf_entry;

        uint64_t elf_lowaddr;

#ifdef TARGET_WORDS_BIGENDIAN

        int success = load_elf(kernel_filename, translate_phys_addr, env,

        int success = load_elf(kernel_filename, translate_phys_addr, cpu,

                &elf_entry, &elf_lowaddr, NULL, 1, ELF_MACHINE, 0);

#else

        int success = load_elf(kernel_filename, translate_phys_addr, env,

        int success = load_elf(kernel_filename, translate_phys_addr, cpu,

                &elf_entry, &elf_lowaddr, NULL, 0, ELF_MACHINE, 0);

#endif

        if (success > 0) {

include/exec/cpu-all.h

+0 −5
Original line number Diff line number Diff line
@@ -430,11 +430,6 @@ void cpu_watchpoint_remove_all(CPUArchState *env, int mask); 


#if !defined(CONFIG_USER_ONLY)



/* Return the physical page corresponding to a virtual one. Use it

   only for debugging because no protection checks are done. Return -1

   if no page found. */

hwaddr cpu_get_phys_page_debug(CPUArchState *env, target_ulong addr);



/* memory API */



extern ram_addr_t ram_size;