mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/nios2: Prefer fast cpu_env() over slower CPU QOM cast macro

Browse Source 
Mechanical patch produced running the command documented
in scripts/coccinelle/cpu_env.cocci_template header.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240129164514.73104-20-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-01-29 17:45:01 +01:00 committed by Thomas Huth
parent 4c44a98051
commit 6fed7e43fa
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/nios2/cpu.c
View File

@ -28,28 +28,19 @@
static void nios2_cpu_set_pc(CPUState *cs, vaddr value) static void nios2_cpu_set_pc(CPUState *cs, vaddr value)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); cpu_env(cs)->pc = value;
CPUNios2State *env = &cpu->env;
env->pc = value;
} }
static vaddr nios2_cpu_get_pc(CPUState *cs) static vaddr nios2_cpu_get_pc(CPUState *cs)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); return cpu_env(cs)->pc;
CPUNios2State *env = &cpu->env;
return env->pc;
} }
static void nios2_restore_state_to_opc(CPUState *cs, static void nios2_restore_state_to_opc(CPUState *cs,
const TranslationBlock *tb, const TranslationBlock *tb,
const uint64_t *data) const uint64_t *data)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); cpu_env(cs)->pc = data[0];
CPUNios2State *env = &cpu->env;
env->pc = data[0];
} }
static bool nios2_cpu_has_work(CPUState *cs) static bool nios2_cpu_has_work(CPUState *cs)

3
target/nios2/helper.c
View File

@ -287,8 +287,7 @@ void nios2_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
MMUAccessType access_type, MMUAccessType access_type,
int mmu_idx, uintptr_t retaddr) int mmu_idx, uintptr_t retaddr)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); CPUNios2State *env = cpu_env(cs);
CPUNios2State *env = &cpu->env;
env->ctrl[CR_BADADDR] = addr; env->ctrl[CR_BADADDR] = addr;
cs->exception_index = EXCP_UNALIGN; cs->exception_index = EXCP_UNALIGN;

6
target/nios2/nios2-semi.c
View File

@ -75,8 +75,7 @@ static int host_to_gdb_errno(int err)
static void nios2_semi_u32_cb(CPUState *cs, uint64_t ret, int err) static void nios2_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); CPUNios2State *env = cpu_env(cs);
CPUNios2State *env = &cpu->env;
target_ulong args = env->regs[R_ARG1]; target_ulong args = env->regs[R_ARG1];
if (put_user_u32(ret, args) || if (put_user_u32(ret, args) ||
@ -93,8 +92,7 @@ static void nios2_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
static void nios2_semi_u64_cb(CPUState *cs, uint64_t ret, int err) static void nios2_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); CPUNios2State *env = cpu_env(cs);
CPUNios2State *env = &cpu->env;
target_ulong args = env->regs[R_ARG1]; target_ulong args = env->regs[R_ARG1];
if (put_user_u32(ret >> 32, args) || if (put_user_u32(ret >> 32, args) ||

3
target/nios2/translate.c
View File

@ -970,7 +970,6 @@ static void nios2_tr_insn_start(DisasContextBase *dcbase, CPUState *cs)
static void nios2_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) static void nios2_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
{ {
DisasContext *dc = container_of(dcbase, DisasContext, base); DisasContext *dc = container_of(dcbase, DisasContext, base);
CPUNios2State *env = cpu_env(cs);
const Nios2Instruction *instr; const Nios2Instruction *instr;
uint32_t code, pc; uint32_t code, pc;
uint8_t op; uint8_t op;
@ -980,7 +979,7 @@ static void nios2_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
dc->base.pc_next = pc + 4; dc->base.pc_next = pc + 4;
/* Decode an instruction */ /* Decode an instruction */
code = cpu_ldl_code(env, pc); code = cpu_ldl_code(cpu_env(cs), pc);
op = get_opcode(code); op = get_opcode(code);
if (unlikely(op >= ARRAY_SIZE(i_type_instructions))) { if (unlikely(op >= ARRAY_SIZE(i_type_instructions))) {