Commit 894d354f authored by Peter Maydell's avatar Peter Maydell
Browse files

Remove unassigned_access CPU hook 



All targets have now migrated away from the old unassigned_access
hook to the new do_transaction_failed hook. This means we can remove
the core-code infrastructure for that hook and the code that calls it.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20191108173732.11816-1-peter.maydell@linaro.org
parent af2a580f

accel/tcg/cputlb.c

+0 −2
Original line number Diff line number Diff line
@@ -931,8 +931,6 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, 
        cpu_io_recompile(cpu, retaddr);

    }



    cpu->mem_io_access_type = access_type;



    if (mr->global_locking && !qemu_mutex_iothread_locked()) {

        qemu_mutex_lock_iothread();

        locked = true;

include/hw/core/cpu.h

+0 −24
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ typedef enum MMUAccessType { 


typedef struct CPUWatchpoint CPUWatchpoint;



typedef void (*CPUUnassignedAccess)(CPUState *cpu, hwaddr addr,

                                    bool is_write, bool is_exec, int opaque,

                                    unsigned size);



struct TranslationBlock;



/**
@@ -87,8 +83,6 @@ struct TranslationBlock; 
 * @reset_dump_flags: #CPUDumpFlags to use for reset logging.

 * @has_work: Callback for checking if there is work to do.

 * @do_interrupt: Callback for interrupt handling.

 * @do_unassigned_access: Callback for unassigned access handling.

 * (this is deprecated: new targets should use do_transaction_failed instead)

 * @do_unaligned_access: Callback for unaligned access handling, if

 * the target defines #TARGET_ALIGNED_ONLY.

 * @do_transaction_failed: Callback for handling failed memory transactions
@@ -175,7 +169,6 @@ typedef struct CPUClass { 
    int reset_dump_flags;

    bool (*has_work)(CPUState *cpu);

    void (*do_interrupt)(CPUState *cpu);

    CPUUnassignedAccess do_unassigned_access;

    void (*do_unaligned_access)(CPUState *cpu, vaddr addr,

                                MMUAccessType access_type,

                                int mmu_idx, uintptr_t retaddr);
@@ -415,12 +408,6 @@ struct CPUState { 
     * we store some rarely used information in the CPU context.

     */

    uintptr_t mem_io_pc;

    /*

     * This is only needed for the legacy cpu_unassigned_access() hook;

     * when all targets using it have been converted to use

     * cpu_transaction_failed() instead it can be removed.

     */

    MMUAccessType mem_io_access_type;



    int kvm_fd;

    struct KVMState *kvm_state;
@@ -896,17 +883,6 @@ void cpu_interrupt(CPUState *cpu, int mask); 
#ifdef NEED_CPU_H



#ifdef CONFIG_SOFTMMU

static inline void cpu_unassigned_access(CPUState *cpu, hwaddr addr,

                                         bool is_write, bool is_exec,

                                         int opaque, unsigned size)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);



    if (cc->do_unassigned_access) {

        cc->do_unassigned_access(cpu, addr, is_write, is_exec, opaque, size);

    }

}



static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr,

                                        MMUAccessType access_type,

                                        int mmu_idx, uintptr_t retaddr)

memory.c

+0 −7
Original line number Diff line number Diff line
@@ -1257,10 +1257,6 @@ static uint64_t unassigned_mem_read(void *opaque, hwaddr addr, 
#ifdef DEBUG_UNASSIGNED

    printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);

#endif

    if (current_cpu != NULL) {

        bool is_exec = current_cpu->mem_io_access_type == MMU_INST_FETCH;

        cpu_unassigned_access(current_cpu, addr, false, is_exec, 0, size);

    }

    return 0;

}
@@ -1270,9 +1266,6 @@ static void unassigned_mem_write(void *opaque, hwaddr addr, 
#ifdef DEBUG_UNASSIGNED

    printf("Unassigned mem write " TARGET_FMT_plx " = 0x%"PRIx64"\n", addr, val);

#endif

    if (current_cpu != NULL) {

        cpu_unassigned_access(current_cpu, addr, true, false, 0, size);

    }

}



static bool unassigned_mem_accepts(void *opaque, hwaddr addr,