Commit b35399bb authored by Sergey Sorokin's avatar Sergey Sorokin Committed by Peter Maydell
Browse files

Fix confusing argument names in some common functions 



There are functions tlb_fill(), cpu_unaligned_access() and
do_unaligned_access() that are called with access type and mmu index
arguments. But these arguments are named 'is_write' and 'is_user' in their
declarations. The patches fix the arguments to avoid a confusion.

Signed-off-by: default avatarSergey Sorokin <afarallax@yandex.ru>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Message-id: 1465907177-1399402-1-git-send-email-afarallax@yandex.ru
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 74e1b782

include/exec/cpu-common.h

+0 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ typedef struct CPUListState { 
    FILE *file;

} CPUListState;



typedef enum MMUAccessType {

    MMU_DATA_LOAD  = 0,

    MMU_DATA_STORE = 1,

    MMU_INST_FETCH = 2

} MMUAccessType;



#if !defined(CONFIG_USER_ONLY)



enum device_endian {

include/exec/exec-all.h

+2 −2
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ extern uintptr_t tci_tb_ptr; 
struct MemoryRegion *iotlb_to_region(CPUState *cpu,

                                     hwaddr index, MemTxAttrs attrs);



void tlb_fill(CPUState *cpu, target_ulong addr, int is_write, int mmu_idx,

              uintptr_t retaddr);

void tlb_fill(CPUState *cpu, target_ulong addr, MMUAccessType access_type,

              int mmu_idx, uintptr_t retaddr);



#endif

include/qom/cpu.h

+11 −4
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ typedef uint64_t vaddr; 
#define CPU_CLASS(class) OBJECT_CLASS_CHECK(CPUClass, (class), TYPE_CPU)

#define CPU_GET_CLASS(obj) OBJECT_GET_CLASS(CPUClass, (obj), TYPE_CPU)



typedef enum MMUAccessType {

    MMU_DATA_LOAD  = 0,

    MMU_DATA_STORE = 1,

    MMU_INST_FETCH = 2

} MMUAccessType;



typedef struct CPUWatchpoint CPUWatchpoint;



typedef void (*CPUUnassignedAccess)(CPUState *cpu, hwaddr addr,
@@ -142,7 +148,8 @@ typedef struct CPUClass { 
    void (*do_interrupt)(CPUState *cpu);

    CPUUnassignedAccess do_unassigned_access;

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

                                int is_write, int is_user, uintptr_t retaddr);

                                MMUAccessType access_type,

                                int mmu_idx, uintptr_t retaddr);

    bool (*virtio_is_big_endian)(CPUState *cpu);

    int (*memory_rw_debug)(CPUState *cpu, vaddr addr,

                           uint8_t *buf, int len, bool is_write);
@@ -716,12 +723,12 @@ static inline void cpu_unassigned_access(CPUState *cpu, hwaddr addr, 
}



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

                                        int is_write, int is_user,

                                        uintptr_t retaddr)

                                        MMUAccessType access_type,

                                        int mmu_idx, uintptr_t retaddr)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);



    cc->do_unaligned_access(cpu, addr, is_write, is_user, retaddr);

    cc->do_unaligned_access(cpu, addr, access_type, mmu_idx, retaddr);

}

#endif

target-alpha/cpu.h

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ hwaddr alpha_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); 
int alpha_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);

int alpha_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);

void alpha_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,

                                   int is_write, int is_user, uintptr_t retaddr);

                                   MMUAccessType access_type,

                                   int mmu_idx, uintptr_t retaddr);



#define cpu_list alpha_cpu_list

#define cpu_signal_handler cpu_alpha_signal_handler

target-alpha/mem_helper.c

+4 −3
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ uint64_t helper_stq_c_phys(CPUAlphaState *env, uint64_t p, uint64_t v) 
}



void alpha_cpu_do_unaligned_access(CPUState *cs, vaddr addr,

                                   int is_write, int is_user, uintptr_t retaddr)

                                   MMUAccessType access_type,

                                   int mmu_idx, uintptr_t retaddr)

{

    AlphaCPU *cpu = ALPHA_CPU(cs);

    CPUAlphaState *env = &cpu->env;
@@ -144,12 +145,12 @@ void alpha_cpu_unassigned_access(CPUState *cs, hwaddr addr, 
   NULL, it means that the function was called in C code (i.e. not

   from generated code or from helper.c) */

/* XXX: fix it to restore all registers */

void tlb_fill(CPUState *cs, target_ulong addr, int is_write,

void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,

              int mmu_idx, uintptr_t retaddr)

{

    int ret;



    ret = alpha_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);

    ret = alpha_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);

    if (unlikely(ret != 0)) {

        if (retaddr) {

            cpu_restore_state(cs, retaddr);