| Message ID | 20210128144125.3696119-10-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/mips: Replace integer by MMUAccessType enum when possible | expand |
在 2021/1/28 下午10:41, Philippe Mathieu-Daudé 写道: > The single caller, do_translate_address(), passes MMUAccessType > to cpu_mips_translate_address(). Let the prototype use it as > argument, as it is stricter than an integer. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > --- > target/mips/internal.h | 2 +- > target/mips/tlb_helper.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/target/mips/internal.h b/target/mips/internal.h > index d09afded5ea..34915c275c4 100644 > --- a/target/mips/internal.h > +++ b/target/mips/internal.h > @@ -146,7 +146,7 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, > int mmu_idx, MemTxAttrs attrs, > MemTxResult response, uintptr_t retaddr); > hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, > - int rw); > + MMUAccessType access_type); > #endif > > #define cpu_signal_handler cpu_mips_signal_handler > diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c > index afcc269750d..e9c3adeade6 100644 > --- a/target/mips/tlb_helper.c > +++ b/target/mips/tlb_helper.c > @@ -903,17 +903,17 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, > > #ifndef CONFIG_USER_ONLY > hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, > - int rw) > + MMUAccessType access_type) > { > hwaddr physical; > int prot; > int ret = 0; > > /* data access */ > - ret = get_physical_address(env, &physical, &prot, address, rw, > + ret = get_physical_address(env, &physical, &prot, address, access_type, > cpu_mmu_index(env, false)); > if (ret != TLBRET_MATCH) { > - raise_mmu_exception(env, address, rw, ret); > + raise_mmu_exception(env, address, access_type, ret); > return -1LL; > } else { > return physical;
diff --git a/target/mips/internal.h b/target/mips/internal.h index d09afded5ea..34915c275c4 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -146,7 +146,7 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr); hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, - int rw); + MMUAccessType access_type); #endif #define cpu_signal_handler cpu_mips_signal_handler diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index afcc269750d..e9c3adeade6 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -903,17 +903,17 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, #ifndef CONFIG_USER_ONLY hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, - int rw) + MMUAccessType access_type) { hwaddr physical; int prot; int ret = 0; /* data access */ - ret = get_physical_address(env, &physical, &prot, address, rw, + ret = get_physical_address(env, &physical, &prot, address, access_type, cpu_mmu_index(env, false)); if (ret != TLBRET_MATCH) { - raise_mmu_exception(env, address, rw, ret); + raise_mmu_exception(env, address, access_type, ret); return -1LL; } else { return physical;
The single caller, do_translate_address(), passes MMUAccessType to cpu_mips_translate_address(). Let the prototype use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- target/mips/internal.h | 2 +- target/mips/tlb_helper.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)