[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/14] target/sh4: Replace magic value by MMUAccessType definition
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 02/14] target/sh4: Replace magic value by MMUAccessType definitions |
Date: |
Sat, 6 Mar 2021 16:36:09 +0100 |
Replace the 0/1/2 magic values by the corresponding MMUAccessType.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210127232151.3523581-3-f4bug@amsat.org>
---
target/sh4/helper.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/target/sh4/helper.c b/target/sh4/helper.c
index fc816137766..4303ebf018b 100644
--- a/target/sh4/helper.c
+++ b/target/sh4/helper.c
@@ -338,7 +338,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong
* physical,
use_asid = !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD));
- if (rw == 2) {
+ if (rw == MMU_INST_FETCH) {
n = find_itlb_entry(env, address, use_asid);
if (n >= 0) {
matching = &env->itlb[n];
@@ -371,11 +371,11 @@ static int get_mmu_address(CPUSH4State * env,
target_ulong * physical,
if (n >= 0) {
matching = &env->utlb[n];
if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) {
- n = (rw == 1)
+ n = (rw == MMU_DATA_STORE)
? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ;
- } else if ((rw == 1) && !(matching->pr & 1)) {
+ } else if ((rw == MMU_DATA_STORE) && !(matching->pr & 1)) {
n = MMU_DTLB_VIOLATION_WRITE;
- } else if ((rw == 1) && !matching->d) {
+ } else if ((rw == MMU_DATA_STORE) && !matching->d) {
n = MMU_DTLB_INITIAL_WRITE;
} else {
*prot = PAGE_READ;
@@ -384,7 +384,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong
* physical,
}
}
} else if (n == MMU_DTLB_MISS) {
- n = (rw == 1)
+ n = (rw == MMU_DATA_STORE)
? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ;
}
}
@@ -406,9 +406,9 @@ static int get_physical_address(CPUSH4State * env,
target_ulong * physical,
&& (address < 0xe0000000 || address >= 0xe4000000)) {
/* Unauthorized access in user mode (only store queues are
available) */
qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n");
- if (rw == 0) {
+ if (rw == MMU_DATA_LOAD) {
return MMU_DADDR_ERROR_READ;
- } else if (rw == 1) {
+ } else if (rw == MMU_DATA_STORE) {
return MMU_DADDR_ERROR_WRITE;
} else {
return MMU_IADDR_ERROR;
@@ -441,7 +441,7 @@ hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr
addr)
target_ulong physical;
int prot;
- get_physical_address(&cpu->env, &physical, &prot, addr, 0, 0);
+ get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD, 0);
return physical;
}
--
2.26.2
- [PULL 00/14] Renesas patches for 2021-03-06, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 01/14] target/sh4: Fix code style for checkpatch.pl, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 02/14] target/sh4: Replace magic value by MMUAccessType definitions,
Philippe Mathieu-Daudé <=
- [PULL 03/14] target/sh4: Remove unused 'int access_type' argument, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 04/14] target/sh4: Let get_physical_address() use MMUAccessType access_type, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 05/14] target/sh4: Remove unused definitions, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 06/14] hw/sh4: Add missing license, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 07/14] hw/sh4: Add missing Kconfig dependency on SH7750 for the R2D board, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 08/14] hw/intc: Introduce SH_INTC Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 09/14] hw/char: Introduce SH_SCI Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 10/14] hw/timer: Introduce SH_TIMER Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 11/14] hw/block: Introduce TC58128 eeprom Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 12/14] hw/pci-host: Introduce SH_PCI Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06