[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/68] target/nios2: Rename CR_TLBMISC_WR to CR_TLBMISC_WE
From: |
Richard Henderson |
Subject: |
[PULL 28/68] target/nios2: Rename CR_TLBMISC_WR to CR_TLBMISC_WE |
Date: |
Tue, 26 Apr 2022 11:18:27 -0700 |
WE is the architectural name of the field, not WR.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220421151735.31996-29-richard.henderson@linaro.org>
---
target/nios2/cpu.h | 2 +-
target/nios2/helper.c | 4 ++--
target/nios2/mmu.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index bfa86edd97..54bb6cd9be 100644
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -134,7 +134,7 @@ FIELD(CR_TLBACC, IG, 25, 7)
#define CR_TLBMISC_WAY_SHIFT 20
#define CR_TLBMISC_WAY_MASK (0xF << CR_TLBMISC_WAY_SHIFT)
#define CR_TLBMISC_RD (1 << 19)
-#define CR_TLBMISC_WR (1 << 18)
+#define CR_TLBMISC_WE (1 << 18)
#define CR_TLBMISC_PID_SHIFT 4
#define CR_TLBMISC_PID_MASK (0x3FFF << CR_TLBMISC_PID_SHIFT)
#define CR_TLBMISC_DBL (1 << 3)
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index c2d0afe1b6..31d83e0291 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -69,7 +69,7 @@ void nios2_cpu_do_interrupt(CPUState *cs)
cs->exception_index);
env->ctrl[CR_TLBMISC] &= ~CR_TLBMISC_DBL;
- env->ctrl[CR_TLBMISC] |= CR_TLBMISC_WR;
+ env->ctrl[CR_TLBMISC] |= CR_TLBMISC_WE;
env->regs[R_EA] = env->pc + 4;
env->pc = cpu->fast_tlb_miss_addr;
@@ -104,7 +104,7 @@ void nios2_cpu_do_interrupt(CPUState *cs)
cs->exception_index);
if ((env->ctrl[CR_STATUS] & CR_STATUS_EH) == 0) {
- env->ctrl[CR_TLBMISC] |= CR_TLBMISC_WR;
+ env->ctrl[CR_TLBMISC] |= CR_TLBMISC_WE;
}
env->regs[R_EA] = env->pc + 4;
diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c
index 826cd2afb4..0f33ea5e04 100644
--- a/target/nios2/mmu.c
+++ b/target/nios2/mmu.c
@@ -95,7 +95,7 @@ void helper_mmu_write_tlbacc(CPUNios2State *env, uint32_t v)
FIELD_EX32(v, CR_TLBACC, PFN));
/* if tlbmisc.WE == 1 then trigger a TLB write on writes to TLBACC */
- if (env->ctrl[CR_TLBMISC] & CR_TLBMISC_WR) {
+ if (env->ctrl[CR_TLBMISC] & CR_TLBMISC_WE) {
int way = (env->ctrl[CR_TLBMISC] >> CR_TLBMISC_WAY_SHIFT);
int vpn = FIELD_EX32(env->mmu.pteaddr_wr, CR_PTEADDR, VPN);
int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4;
@@ -133,7 +133,7 @@ void helper_mmu_write_tlbmisc(CPUNios2State *env, uint32_t
v)
trace_nios2_mmu_write_tlbmisc(v >> CR_TLBMISC_WAY_SHIFT,
(v & CR_TLBMISC_RD) ? 'R' : '.',
- (v & CR_TLBMISC_WR) ? 'W' : '.',
+ (v & CR_TLBMISC_WE) ? 'W' : '.',
(v & CR_TLBMISC_DBL) ? '2' : '.',
(v & CR_TLBMISC_BAD) ? 'B' : '.',
(v & CR_TLBMISC_PERM) ? 'P' : '.',
--
2.34.1
- [PULL 02/68] linux-user/nios2: Fix clone child return, (continued)
- [PULL 02/68] linux-user/nios2: Fix clone child return, Richard Henderson, 2022/04/26
- [PULL 06/68] linux-user/nios2: Remove do_sigreturn, Richard Henderson, 2022/04/26
- [PULL 10/68] target/nios2: Remove nios2_cpu_record_sigsegv, Richard Henderson, 2022/04/26
- [PULL 13/68] target/nios2: Check supervisor on eret, Richard Henderson, 2022/04/26
- [PULL 14/68] target/nios2: Stop generating code if gen_check_supervisor fails, Richard Henderson, 2022/04/26
- [PULL 18/68] target/nios2: Fix BRET instruction, Richard Henderson, 2022/04/26
- [PULL 20/68] linux-user/nios2: Only initialize SP and PC in target_cpu_copy_regs, Richard Henderson, 2022/04/26
- [PULL 21/68] target/nios2: Remove cpu_interrupts_enabled, Richard Henderson, 2022/04/26
- [PULL 23/68] target/nios2: Clean up nios2_cpu_dump_state, Richard Henderson, 2022/04/26
- [PULL 25/68] target/nios2: Use hw/registerfields.h for CR_EXCEPTION fields, Richard Henderson, 2022/04/26
- [PULL 28/68] target/nios2: Rename CR_TLBMISC_WR to CR_TLBMISC_WE,
Richard Henderson <=
- [PULL 29/68] target/nios2: Use hw/registerfields.h for CR_TLBMISC fields, Richard Henderson, 2022/04/26
- [PULL 38/68] target/nios2: Implement cpuid, Richard Henderson, 2022/04/26
- [PULL 32/68] target/nios2: Clean up nios2_cpu_do_interrupt, Richard Henderson, 2022/04/26
- [PULL 37/68] target/nios2: Prevent writes to read-only or reserved control fields, Richard Henderson, 2022/04/26
- [PULL 39/68] target/nios2: Implement CR_STATUS.RSIE, Richard Henderson, 2022/04/26
- [PULL 09/68] target/nios2: Remove user-only nios2_cpu_do_interrupt, Richard Henderson, 2022/04/26
- [PULL 15/68] target/nios2: Add NUM_GP_REGS and NUM_CP_REGS, Richard Henderson, 2022/04/26
- [PULL 19/68] target/nios2: Do not create TCGv for control registers, Richard Henderson, 2022/04/26
- [PULL 24/68] target/nios2: Use hw/registerfields.h for CR_STATUS fields, Richard Henderson, 2022/04/26
- [PULL 27/68] target/nios2: Use hw/registerfields.h for CR_TLBACC fields, Richard Henderson, 2022/04/26