15.06.2016, 06:03, "David Gibson" <da...@gibson.dropbear.id.au>:
> On Tue, Jun 14, 2016 at 03:26:17PM +0300, Sergey Sorokin wrote:
>> 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: Sergey Sorokin <afaral...@yandex.ru>
>> ---
>> In the second version of the patch a type of access_type argument
>> was changed from int to MMUAccessType. To allow it the declaration of
>> MMUAccessType was moved from exec/cpu-common.h into qom/cpu.h
>> The series of two patches was merged into one.
>>
>> include/exec/cpu-common.h | 6 ------
>> include/exec/exec-all.h | 4 ++--
>> include/qom/cpu.h | 15 +++++++++++----
>> target-alpha/cpu.h | 3 ++-
>> target-alpha/mem_helper.c | 7 ++++---
>> target-arm/internals.h | 5 +++--
>> target-arm/op_helper.c | 30 +++++++++++++++++-------------
>> target-cris/op_helper.c | 6 +++---
>> target-i386/mem_helper.c | 6 +++---
>> target-lm32/op_helper.c | 6 +++---
>> target-m68k/op_helper.c | 6 +++---
>> target-microblaze/op_helper.c | 6 +++---
>> target-mips/cpu.h | 3 ++-
>> target-mips/op_helper.c | 10 +++++-----
>> target-moxie/helper.c | 6 +++---
>> target-openrisc/mmu_helper.c | 4 ++--
>> target-ppc/mmu_helper.c | 8 ++++----
>> target-s390x/mem_helper.c | 6 +++---
>> target-sh4/op_helper.c | 6 +++---
>> target-sparc/cpu.h | 7 ++++---
>> target-sparc/ldst_helper.c | 13 +++++++------
>> target-tricore/op_helper.c | 6 +++---
>> target-unicore32/op_helper.c | 4 ++--
>> target-xtensa/cpu.h | 3 ++-
>> target-xtensa/op_helper.c | 11 ++++++-----
>> 25 files changed, 100 insertions(+), 87 deletions(-)
>>
>> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
>> index aaee995..9ac1eaf 100644
>> --- a/include/exec/cpu-common.h
>> +++ b/include/exec/cpu-common.h
>> @@ -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 {
>> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
>> index c1f59fa..db79ab6 100644
>> --- a/include/exec/exec-all.h
>> +++ b/include/exec/exec-all.h
>> @@ -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
>>
>> diff --git a/include/qom/cpu.h b/include/qom/cpu.h
>> index 32f3af3..422ac41 100644
>> --- a/include/qom/cpu.h
>> +++ b/include/qom/cpu.h
>> @@ -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
>>
>> diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
>> index e71ea70..cfbb615 100644
>> --- a/target-alpha/cpu.h
>> +++ b/target-alpha/cpu.h
>> @@ -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_exec cpu_alpha_exec
>> diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
>> index 7f4d15f..1b2be50 100644
>> --- a/target-alpha/mem_helper.c
>> +++ b/target-alpha/mem_helper.c
>> @@ -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);
>> diff --git a/target-arm/internals.h b/target-arm/internals.h
>> index 728ecba..e0d37da 100644
>> --- a/target-arm/internals.h
>> +++ b/target-arm/internals.h
>> @@ -476,7 +476,8 @@ bool arm_tlb_fill(CPUState *cpu, vaddr address, int rw,
>> int mmu_idx,
>> bool arm_s1_regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx);
>>
>> /* Raise a data fault alignment exception for the specified virtual
>> address */
>> -void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, int is_write,
>> - int is_user, uintptr_t retaddr);
>> +void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
>> + MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr);
>>
>> #endif
>> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
>> index 35912a1..3ee2284 100644
>> --- a/target-arm/op_helper.c
>> +++ b/target-arm/op_helper.c
>> @@ -79,7 +79,7 @@ uint32_t HELPER(neon_tbl)(CPUARMState *env, uint32_t
>> ireg, uint32_t def,
>> static inline uint32_t merge_syn_data_abort(uint32_t template_syn,
>> unsigned int target_el,
>> bool same_el,
>> - bool s1ptw, int is_write,
>> + bool s1ptw, bool is_write,
>> int fsc)
>> {
>> uint32_t syn;
>> @@ -97,7 +97,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t
>> template_syn,
>> */
>> if (!(template_syn & ARM_EL_ISV) || target_el != 2 || s1ptw) {
>> syn = syn_data_abort_no_iss(same_el,
>> - 0, 0, s1ptw, is_write == 1, fsc);
>> + 0, 0, s1ptw, is_write, fsc);
>> } else {
>> /* Fields: IL, ISV, SAS, SSE, SRT, SF and AR come from the template
>> * syndrome created at translation time.
>> @@ -105,7 +105,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t
>> template_syn,
>> */
>> syn = syn_data_abort_with_iss(same_el,
>> 0, 0, 0, 0, 0,
>> - 0, 0, s1ptw, is_write == 1, fsc,
>> + 0, 0, s1ptw, is_write, fsc,
>> false);
>> /* Merge the runtime syndrome with the template syndrome. */
>> syn |= template_syn;
>> @@ -117,14 +117,14 @@ static inline uint32_t merge_syn_data_abort(uint32_t
>> template_syn,
>> * NULL, it means that the function was called in C code (i.e. not
>> * from generated code or from helper.c)
>> */
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> bool ret;
>> uint32_t fsr = 0;
>> ARMMMUFaultInfo fi = {};
>>
>> - ret = arm_tlb_fill(cs, addr, is_write, mmu_idx, &fsr, &fi);
>> + ret = arm_tlb_fill(cs, addr, access_type, mmu_idx, &fsr, &fi);
>> if (unlikely(ret)) {
>> ARMCPU *cpu = ARM_CPU(cs);
>> CPUARMState *env = &cpu->env;
>> @@ -149,13 +149,15 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
>> is_write, int mmu_idx,
>> /* For insn and data aborts we assume there is no instruction
>> syndrome
>> * information; this is always true for exceptions reported to EL1.
>> */
>> - if (is_write == 2) {
>> + if (access_type == MMU_INST_FETCH) {
>> syn = syn_insn_abort(same_el, 0, fi.s1ptw, syn);
>> exc = EXCP_PREFETCH_ABORT;
>> } else {
>> syn = merge_syn_data_abort(env->exception.syndrome, target_el,
>> - same_el, fi.s1ptw, is_write, syn);
>> - if (is_write == 1 && arm_feature(env, ARM_FEATURE_V6)) {
>> + same_el, fi.s1ptw,
>> + access_type == MMU_DATA_STORE, syn);
>> + if (access_type == MMU_DATA_STORE
>> + && arm_feature(env, ARM_FEATURE_V6)) {
>> fsr |= (1 << 11);
>> }
>> exc = EXCP_DATA_ABORT;
>> @@ -168,8 +170,9 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
>> is_write, int mmu_idx,
>> }
>>
>> /* Raise a data fault alignment exception for the specified virtual
>> address */
>> -void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, int is_write,
>> - int is_user, uintptr_t retaddr)
>> +void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
>> + MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> ARMCPU *cpu = ARM_CPU(cs);
>> CPUARMState *env = &cpu->env;
>> @@ -196,12 +199,13 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr
>> vaddr, int is_write,
>> env->exception.fsr = 0x1;
>> }
>>
>> - if (is_write == 1 && arm_feature(env, ARM_FEATURE_V6)) {
>> + if (access_type == MMU_DATA_STORE && arm_feature(env, ARM_FEATURE_V6)) {
>> env->exception.fsr |= (1 << 11);
>> }
>>
>> syn = merge_syn_data_abort(env->exception.syndrome, target_el,
>> - same_el, 0, is_write, 0x21);
>> + same_el, 0, access_type == MMU_DATA_STORE,
>> + 0x21);
>> raise_exception(env, EXCP_DATA_ABORT, syn, target_el);
>> }
>>
>> diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
>> index 675ab86..5043039 100644
>> --- a/target-cris/op_helper.c
>> +++ b/target-cris/op_helper.c
>> @@ -41,8 +41,8 @@
>> /* Try to fill the TLB and return an exception if error. If retaddr is
>> NULL, it means that the function was called in C code (i.e. not
>> from generated code or from helper.c) */
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> CRISCPU *cpu = CRIS_CPU(cs);
>> CPUCRISState *env = &cpu->env;
>> @@ -50,7 +50,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
>> is_write, int mmu_idx,
>>
>> D_LOG("%s pc=%x tpc=%x ra=%p\n", __func__,
>> env->pc, env->pregs[PR_EDA], (void *)retaddr);
>> - ret = cris_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = cris_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret)) {
>> if (retaddr) {
>> /* now we have a real cpu fault */
>> diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
>> index c2f4769..5bc0594 100644
>> --- a/target-i386/mem_helper.c
>> +++ b/target-i386/mem_helper.c
>> @@ -140,12 +140,12 @@ void helper_boundl(CPUX86State *env, target_ulong a0,
>> int v)
>> * 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, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = x86_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = x86_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (ret) {
>> X86CPU *cpu = X86_CPU(cs);
>> CPUX86State *env = &cpu->env;
>> diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
>> index 7a550d1..2177c8a 100644
>> --- a/target-lm32/op_helper.c
>> +++ b/target-lm32/op_helper.c
>> @@ -144,12 +144,12 @@ uint32_t HELPER(rcsr_jrx)(CPULM32State *env)
>> * NULL, it means that the function was called in C code (i.e. not
>> * from generated code or from helper.c)
>> */
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = lm32_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = lm32_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret)) {
>> if (retaddr) {
>> /* now we have a real cpu fault */
>> diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
>> index ff32e35..e41ae46 100644
>> --- a/target-m68k/op_helper.c
>> +++ b/target-m68k/op_helper.c
>> @@ -39,12 +39,12 @@ static inline void
>> do_interrupt_m68k_hardirq(CPUM68KState *env)
>> /* Try to fill the TLB and return an exception if error. If retaddr is
>> NULL, it means that the function was called in C code (i.e. not
>> from generated code or from helper.c) */
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = m68k_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = m68k_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret)) {
>> if (retaddr) {
>> /* now we have a real cpu fault */
>> diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
>> index 0533939..c52253d 100644
>> --- a/target-microblaze/op_helper.c
>> +++ b/target-microblaze/op_helper.c
>> @@ -33,12 +33,12 @@
>> * NULL, it means that the function was called in C code (i.e. not
>> * from generated code or from helper.c)
>> */
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = mb_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = mb_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret)) {
>> if (retaddr) {
>> /* now we have a real cpu fault */
>> diff --git a/target-mips/cpu.h b/target-mips/cpu.h
>> index 4ce9d47..3e6221a 100644
>> --- a/target-mips/cpu.h
>> +++ b/target-mips/cpu.h
>> @@ -651,7 +651,8 @@ hwaddr mips_cpu_get_phys_page_debug(CPUState *cpu,
>> vaddr addr);
>> int mips_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
>> int mips_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
>> void mips_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);
>>
>> #if !defined(CONFIG_USER_ONLY)
>> int no_mmu_map_address (CPUMIPSState *env, hwaddr *physical, int *prot,
>> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
>> index 7cf9807..11ee8ac 100644
>> --- a/target-mips/op_helper.c
>> +++ b/target-mips/op_helper.c
>> @@ -2383,8 +2383,8 @@ void helper_wait(CPUMIPSState *env)
>> #if !defined(CONFIG_USER_ONLY)
>>
>> void mips_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
>> - int access_type, int is_user,
>> - uintptr_t retaddr)
>> + MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> MIPSCPU *cpu = MIPS_CPU(cs);
>> CPUMIPSState *env = &cpu->env;
>> @@ -2405,12 +2405,12 @@ void mips_cpu_do_unaligned_access(CPUState *cs,
>> vaddr addr,
>> do_raise_exception_err(env, excp, error_code, retaddr);
>> }
>>
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = mips_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = mips_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (ret) {
>> MIPSCPU *cpu = MIPS_CPU(cs);
>> CPUMIPSState *env = &cpu->env;
>> diff --git a/target-moxie/helper.c b/target-moxie/helper.c
>> index d51e9b9..330299f 100644
>> --- a/target-moxie/helper.c
>> +++ b/target-moxie/helper.c
>> @@ -29,12 +29,12 @@
>> /* Try to fill the TLB and return an exception if error. If retaddr is
>> NULL, it means that the function was called in C code (i.e. not
>> from generated code or from helper.c) */
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = moxie_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = moxie_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret)) {
>> if (retaddr) {
>> cpu_restore_state(cs, retaddr);
>> diff --git a/target-openrisc/mmu_helper.c b/target-openrisc/mmu_helper.c
>> index c0658c3..a44d0aa 100644
>> --- a/target-openrisc/mmu_helper.c
>> +++ b/target-openrisc/mmu_helper.c
>> @@ -25,12 +25,12 @@
>>
>> #ifndef CONFIG_USER_ONLY
>>
>> -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 = openrisc_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = openrisc_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>>
>> if (ret) {
>> if (retaddr) {
>> diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
>> index 485d5b8..3eb3cd7 100644
>> --- a/target-ppc/mmu_helper.c
>> +++ b/target-ppc/mmu_helper.c
>> @@ -2878,8 +2878,8 @@ void helper_check_tlb_flush(CPUPPCState *env)
>> 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, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>
> If you're using MMUAccessType here..
>
>> {
>> PowerPCCPU *cpu = POWERPC_CPU(cs);
>> PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);
>> @@ -2887,9 +2887,9 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
>> is_write, int mmu_idx,
>> int ret;
>>
>> if (pcc->handle_mmu_fault) {
>> - ret = pcc->handle_mmu_fault(cpu, addr, is_write, mmu_idx);
>> + ret = pcc->handle_mmu_fault(cpu, addr, access_type, mmu_idx);
>> } else {
>> - ret = cpu_ppc_handle_mmu_fault(env, addr, is_write, mmu_idx);
>> + ret = cpu_ppc_handle_mmu_fault(env, addr, access_type, mmu_idx);
>
> ..surely the prototype of cpu_ppc_handle_mmu_fault() and all the
> others should be change to use it as well.
>
>> }
>> if (unlikely(ret != 0)) {
>> if (likely(retaddr)) {
>> diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
>> index ec8059a..99bc5e2 100644
>> --- a/target-s390x/mem_helper.c
>> +++ b/target-s390x/mem_helper.c
>> @@ -36,12 +36,12 @@
>> 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, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = s390_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = s390_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret != 0)) {
>> if (likely(retaddr)) {
>> /* now we have a real cpu fault */
>> diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
>> index 303e83e..0204b03 100644
>> --- a/target-sh4/op_helper.c
>> +++ b/target-sh4/op_helper.c
>> @@ -24,12 +24,12 @@
>>
>> #ifndef CONFIG_USER_ONLY
>>
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = superh_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = superh_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (ret) {
>> /* now we have a real cpu fault */
>> if (retaddr) {
>> diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
>> index ba37f4b..78c9010 100644
>> --- a/target-sparc/cpu.h
>> +++ b/target-sparc/cpu.h
>> @@ -540,9 +540,10 @@ void sparc_cpu_dump_state(CPUState *cpu, FILE *f,
>> hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
>> int sparc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
>> int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
>> -void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cpu,
>> - vaddr addr, int is_write,
>> - int is_user, uintptr_t retaddr);
>> +void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
>> + MMUAccessType access_type,
>> + int mmu_idx,
>> + uintptr_t retaddr);
>>
>> #ifndef NO_CPU_IO_DEFS
>> /* cpu_init.c */
>> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
>> index f73cf6d..e941cac 100644
>> --- a/target-sparc/ldst_helper.c
>> +++ b/target-sparc/ldst_helper.c
>> @@ -2420,9 +2420,10 @@ void sparc_cpu_unassigned_access(CPUState *cs,
>> hwaddr addr,
>> #endif
>>
>> #if !defined(CONFIG_USER_ONLY)
>> -void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs,
>> - vaddr addr, int is_write,
>> - int is_user, uintptr_t retaddr)
>> +void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
>> + MMUAccessType access_type,
>> + int mmu_idx,
>> + uintptr_t retaddr)
>> {
>> SPARCCPU *cpu = SPARC_CPU(cs);
>> CPUSPARCState *env = &cpu->env;
>> @@ -2441,12 +2442,12 @@ void QEMU_NORETURN
>> sparc_cpu_do_unaligned_access(CPUState *cs,
>> 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, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>>
>> - ret = sparc_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = sparc_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (ret) {
>> if (retaddr) {
>> cpu_restore_state(cs, retaddr);
>> diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
>> index a73ed53..873a123 100644
>> --- a/target-tricore/op_helper.c
>> +++ b/target-tricore/op_helper.c
>> @@ -2833,11 +2833,11 @@ static inline void QEMU_NORETURN
>> do_raise_exception_err(CPUTriCoreState *env,
>> cpu_loop_exit(cs);
>> }
>>
>> -void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
>> - uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> int ret;
>> - ret = cpu_tricore_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = cpu_tricore_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (ret) {
>> TriCoreCPU *cpu = TRICORE_CPU(cs);
>> CPUTriCoreState *env = &cpu->env;
>> diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
>> index a782d33..0872c29 100644
>> --- a/target-unicore32/op_helper.c
>> +++ b/target-unicore32/op_helper.c
>> @@ -244,12 +244,12 @@ uint32_t HELPER(ror_cc)(CPUUniCore32State *env,
>> uint32_t x, uint32_t i)
>> }
>>
>> #ifndef CONFIG_USER_ONLY
>> -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 = uc32_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx);
>> + ret = uc32_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
>> if (unlikely(ret)) {
>> if (retaddr) {
>> /* now we have a real cpu fault */
>> diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
>> index 442176a..3c1aaf4 100644
>> --- a/target-xtensa/cpu.h
>> +++ b/target-xtensa/cpu.h
>> @@ -414,7 +414,8 @@ hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu,
>> vaddr addr);
>> int xtensa_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
>> int xtensa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
>> void xtensa_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_exec cpu_xtensa_exec
>> #define cpu_signal_handler cpu_xtensa_signal_handler
>> diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
>> index bc3667f..0a4b214 100644
>> --- a/target-xtensa/op_helper.c
>> +++ b/target-xtensa/op_helper.c
>> @@ -35,7 +35,8 @@
>> #include "qemu/timer.h"
>>
>> void xtensa_cpu_do_unaligned_access(CPUState *cs,
>> - vaddr addr, int is_write, int is_user, uintptr_t retaddr)
>> + vaddr addr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> XtensaCPU *cpu = XTENSA_CPU(cs);
>> CPUXtensaState *env = &cpu->env;
>> @@ -48,19 +49,19 @@ void xtensa_cpu_do_unaligned_access(CPUState *cs,
>> }
>> }
>>
>> -void tlb_fill(CPUState *cs,
>> - target_ulong vaddr, int is_write, int mmu_idx, uintptr_t retaddr)
>> +void tlb_fill(CPUState *cs, target_ulong vaddr, MMUAccessType access_type,
>> + int mmu_idx, uintptr_t retaddr)
>> {
>> XtensaCPU *cpu = XTENSA_CPU(cs);
>> CPUXtensaState *env = &cpu->env;
>> uint32_t paddr;
>> uint32_t page_size;
>> unsigned access;
>> - int ret = xtensa_get_physical_addr(env, true, vaddr, is_write, mmu_idx,
>> + int ret = xtensa_get_physical_addr(env, true, vaddr, access_type, mmu_idx,
>> &paddr, &page_size, &access);
>>
>> qemu_log_mask(CPU_LOG_MMU, "%s(%08x, %d, %d) -> %08x, ret = %d\n",
>> - __func__, vaddr, is_write, mmu_idx, paddr, ret);
>> + __func__, vaddr, access_type, mmu_idx, paddr, ret);
>>
>> if (ret == 0) {
>> tlb_set_page(cs,
>
> --
> David Gibson | I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
> | _way_ _around_!
> http://www.ozlabs.org/~dgibson
I agree. But I think it's a subject for a separate patch.
May be I'll fix it later, but I didn't plan it for a nearest future.
