[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/13] target/mips: Let raise_mmu_exception() take MMUAccessType
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 10/13] target/mips: Let raise_mmu_exception() take MMUAccessType argument |
Date: |
Thu, 28 Jan 2021 15:41:22 +0100 |
Both mips_cpu_tlb_fill() and cpu_mips_translate_address() pass
MMUAccessType to raise_mmu_exception(). 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/tlb_helper.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c
index e9c3adeade6..21b7d38f11c 100644
--- a/target/mips/tlb_helper.c
+++ b/target/mips/tlb_helper.c
@@ -405,12 +405,12 @@ void cpu_mips_tlb_flush(CPUMIPSState *env)
#endif /* !CONFIG_USER_ONLY */
static void raise_mmu_exception(CPUMIPSState *env, target_ulong address,
- int rw, int tlb_error)
+ MMUAccessType access_type, int tlb_error)
{
CPUState *cs = env_cpu(env);
int exception = 0, error_code = 0;
- if (rw == MMU_INST_FETCH) {
+ if (access_type == MMU_INST_FETCH) {
error_code |= EXCP_INST_NOTAVAIL;
}
@@ -419,7 +419,7 @@ static void raise_mmu_exception(CPUMIPSState *env,
target_ulong address,
case TLBRET_BADADDR:
/* Reference to kernel address from user mode or supervisor mode */
/* Reference to supervisor address from user mode */
- if (rw == MMU_DATA_STORE) {
+ if (access_type == MMU_DATA_STORE) {
exception = EXCP_AdES;
} else {
exception = EXCP_AdEL;
@@ -427,7 +427,7 @@ static void raise_mmu_exception(CPUMIPSState *env,
target_ulong address,
break;
case TLBRET_NOMATCH:
/* No TLB match for a mapped address */
- if (rw == MMU_DATA_STORE) {
+ if (access_type == MMU_DATA_STORE) {
exception = EXCP_TLBS;
} else {
exception = EXCP_TLBL;
@@ -436,7 +436,7 @@ static void raise_mmu_exception(CPUMIPSState *env,
target_ulong address,
break;
case TLBRET_INVALID:
/* TLB match with no valid bit */
- if (rw == MMU_DATA_STORE) {
+ if (access_type == MMU_DATA_STORE) {
exception = EXCP_TLBS;
} else {
exception = EXCP_TLBL;
--
2.26.2
- [PATCH 00/13] target/mips: Replace integer by MMUAccessType enum when possible, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 01/13] target/mips: Remove access_type argument from map_address() handler, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 02/13] target/mips: Remove access_type argument from get_seg_physical_address, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 03/13] target/mips: Remove access_type arg from get_segctl_physical_address(), Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 04/13] target/mips: Remove access_type argument from get_physical_address(), Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 05/13] target/mips: Remove unused MMU definitions, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 06/13] target/mips: Replace magic value by MMU_DATA_LOAD definition, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 07/13] target/mips: Let page_table_walk_refill() take MMUAccessType argument, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 08/13] target/mips: Let do_translate_address() take MMUAccessType argument, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 09/13] target/mips: Let cpu_mips_translate_address() take MMUAccessType arg, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 10/13] target/mips: Let raise_mmu_exception() take MMUAccessType argument,
Philippe Mathieu-Daudé <=
- [PATCH 12/13] target/mips: Let get_seg*_physical_address() take MMUAccessType arg, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 11/13] target/mips: Let get_physical_address() take MMUAccessType argument, Philippe Mathieu-Daudé, 2021/01/28
- [PATCH 13/13] target/mips: Let CPUMIPSTLBContext::map_address() take MMUAccessType, Philippe Mathieu-Daudé, 2021/01/28