[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 23/39] target/riscv: Use env_cpu, env_archcpu
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v4 23/39] target/riscv: Use env_cpu, env_archcpu |
Date: |
Tue, 4 Jun 2019 15:33:35 -0500 |
Cleanup in the boilerplate that each target must define.
Replace riscv_env_get_cpu with env_archcpu. The combination
CPU(riscv_env_get_cpu) should have used ENV_GET_CPU to begin;
use env_cpu now.
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/riscv/cpu.h | 5 -----
linux-user/riscv/cpu_loop.c | 2 +-
target/riscv/cpu_helper.c | 10 ++++------
target/riscv/csr.c | 12 ++++++------
target/riscv/op_helper.c | 7 +++----
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 9ab038bac3..29a1e08f03 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -221,11 +221,6 @@ typedef struct RISCVCPU {
} cfg;
} RISCVCPU;
-static inline RISCVCPU *riscv_env_get_cpu(CPURISCVState *env)
-{
- return container_of(env, RISCVCPU, env);
-}
-
static inline int riscv_has_ext(CPURISCVState *env, target_ulong ext)
{
return (env->misa & ext) != 0;
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index 31700f75d0..c1134597fd 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -25,7 +25,7 @@
void cpu_loop(CPURISCVState *env)
{
- CPUState *cs = CPU(riscv_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
int trapnr, signum, sigcode;
target_ulong sigaddr;
target_ulong ret;
diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index c577a262b8..8b6754b917 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -89,14 +89,12 @@ struct CpuAsyncInfo {
static void riscv_cpu_update_mip_irqs_async(CPUState *target_cpu_state,
run_on_cpu_data data)
{
- CPURISCVState *env = &RISCV_CPU(target_cpu_state)->env;
- RISCVCPU *cpu = riscv_env_get_cpu(env);
struct CpuAsyncInfo *info = (struct CpuAsyncInfo *) data.host_ptr;
if (info->new_mip) {
- cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
+ cpu_interrupt(target_cpu_state, CPU_INTERRUPT_HARD);
} else {
- cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
+ cpu_reset_interrupt(target_cpu_state, CPU_INTERRUPT_HARD);
}
g_free(info);
@@ -212,7 +210,7 @@ static int get_physical_address(CPURISCVState *env, hwaddr
*physical,
}
}
- CPUState *cs = CPU(riscv_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
int va_bits = PGSHIFT + levels * ptidxbits;
target_ulong mask = (1L << (TARGET_LONG_BITS - (va_bits - 1))) - 1;
target_ulong masked_msbs = (addr >> (va_bits - 1)) & mask;
@@ -341,7 +339,7 @@ restart:
static void raise_mmu_exception(CPURISCVState *env, target_ulong address,
MMUAccessType access_type)
{
- CPUState *cs = CPU(riscv_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
int page_fault_exceptions =
(env->priv_ver >= PRIV_VERSION_1_10_0) &&
get_field(env->satp, SATP_MODE) != VM_1_10_MBARE;
diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index f9e2910643..c67d29e206 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -296,7 +296,7 @@ static int write_mstatus(CPURISCVState *env, int csrno,
target_ulong val)
if (env->priv_ver <= PRIV_VERSION_1_09_1) {
if ((val ^ mstatus) & (MSTATUS_MXR | MSTATUS_MPP |
MSTATUS_MPRV | MSTATUS_SUM | MSTATUS_VM)) {
- tlb_flush(CPU(riscv_env_get_cpu(env)));
+ tlb_flush(env_cpu(env));
}
mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE |
MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM |
@@ -307,7 +307,7 @@ static int write_mstatus(CPURISCVState *env, int csrno,
target_ulong val)
if (env->priv_ver >= PRIV_VERSION_1_10_0) {
if ((val ^ mstatus) & (MSTATUS_MXR | MSTATUS_MPP | MSTATUS_MPV |
MSTATUS_MPRV | MSTATUS_SUM)) {
- tlb_flush(CPU(riscv_env_get_cpu(env)));
+ tlb_flush(env_cpu(env));
}
mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE |
MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM |
@@ -382,7 +382,7 @@ static int write_misa(CPURISCVState *env, int csrno,
target_ulong val)
/* flush translation cache */
if (val != env->misa) {
- tb_flush(CPU(riscv_env_get_cpu(env)));
+ tb_flush(env_cpu(env));
}
env->misa = val;
@@ -549,7 +549,7 @@ static int write_mbadaddr(CPURISCVState *env, int csrno,
target_ulong val)
static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value,
target_ulong new_value, target_ulong write_mask)
{
- RISCVCPU *cpu = riscv_env_get_cpu(env);
+ RISCVCPU *cpu = env_archcpu(env);
/* Allow software control of delegable interrupts not claimed by hardware
*/
target_ulong mask = write_mask & delegable_ints & ~env->miclaim;
uint32_t old_mip;
@@ -712,7 +712,7 @@ static int write_satp(CPURISCVState *env, int csrno,
target_ulong val)
return 0;
}
if (env->priv_ver <= PRIV_VERSION_1_09_1 && (val ^ env->sptbr)) {
- tlb_flush(CPU(riscv_env_get_cpu(env)));
+ tlb_flush(env_cpu(env));
env->sptbr = val & (((target_ulong)
1 << (TARGET_PHYS_ADDR_SPACE_BITS - PGSHIFT)) - 1);
}
@@ -724,7 +724,7 @@ static int write_satp(CPURISCVState *env, int csrno,
target_ulong val)
return -1;
} else {
if((val ^ env->satp) & SATP_ASID) {
- tlb_flush(CPU(riscv_env_get_cpu(env)));
+ tlb_flush(env_cpu(env));
}
env->satp = val;
}
diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c
index 644d0fb35f..331cc36232 100644
--- a/target/riscv/op_helper.c
+++ b/target/riscv/op_helper.c
@@ -28,7 +28,7 @@
void QEMU_NORETURN riscv_raise_exception(CPURISCVState *env,
uint32_t exception, uintptr_t pc)
{
- CPUState *cs = CPU(riscv_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
qemu_log_mask(CPU_LOG_INT, "%s: %d\n", __func__, exception);
cs->exception_index = exception;
cpu_loop_exit_restore(cs, pc);
@@ -128,7 +128,7 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong
cpu_pc_deb)
void helper_wfi(CPURISCVState *env)
{
- CPUState *cs = CPU(riscv_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
if (env->priv == PRV_S &&
env->priv_ver >= PRIV_VERSION_1_10_0 &&
@@ -143,8 +143,7 @@ void helper_wfi(CPURISCVState *env)
void helper_tlb_flush(CPURISCVState *env)
{
- RISCVCPU *cpu = riscv_env_get_cpu(env);
- CPUState *cs = CPU(cpu);
+ CPUState *cs = env_cpu(env);
if (!(env->priv >= PRV_S) ||
(env->priv == PRV_S &&
env->priv_ver >= PRIV_VERSION_1_10_0 &&
--
2.17.1
- [Qemu-devel] [PATCH v4 06/39] cpu: Replace ENV_GET_CPU with env_cpu, (continued)
- [Qemu-devel] [PATCH v4 06/39] cpu: Replace ENV_GET_CPU with env_cpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 15/39] target/lm32: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 14/39] target/i386: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 16/39] target/m68k: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 17/39] target/microblaze: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 19/39] target/moxie: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 18/39] target/mips: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 20/39] target/nios2: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 21/39] target/openrisc: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 23/39] target/riscv: Use env_cpu, env_archcpu,
Richard Henderson <=
- [Qemu-devel] [PATCH v4 25/39] target/sh4: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 22/39] target/ppc: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 24/39] target/s390x: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 26/39] target/sparc: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 27/39] target/tilegx: Use env_cpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 28/39] target/tricore: Use env_cpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 29/39] target/unicore32: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 30/39] target/xtensa: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 32/39] cpu: Introduce cpu_set_cpustate_pointers, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 31/39] cpu: Move ENV_OFFSET to exec/gen-icount.h, Richard Henderson, 2019/06/04