Commit 92fddfbd authored by Richard Henderson's avatar Richard Henderson
Browse files

target/xtensa: Use env_cpu, env_archcpu 



Cleanup in the boilerplate that each target must define.
Replace xtensa_env_get_cpu with env_archcpu.  The combination
CPU(xtensa_env_get_cpu) should have used ENV_GET_CPU to begin;
use env_cpu now.

Move cpu_get_tb_cpu_state below the include of "exec/cpu-all.h"
so that the definition of env_cpu is available.

Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 31266e68

hw/xtensa/pic_cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


void check_interrupts(CPUXtensaState *env)

{

    CPUState *cs = CPU(xtensa_env_get_cpu(env));

    CPUState *cs = env_cpu(env);

    int minlevel = xtensa_get_cintlevel(env);

    uint32_t int_set_enabled = env->sregs[INTSET] & env->sregs[INTENABLE];

    int level;

linux-user/xtensa/cpu_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void xtensa_underflow12(CPUXtensaState *env) 


void cpu_loop(CPUXtensaState *env)

{

    CPUState *cs = CPU(xtensa_env_get_cpu(env));

    CPUState *cs = env_cpu(env);

    target_siginfo_t info;

    abi_ulong ret;

    int trapnr;

target/xtensa/cpu.h

+6 −11
Original line number Diff line number Diff line
@@ -559,11 +559,6 @@ struct XtensaCPU { 
    CPUXtensaState env;

};



static inline XtensaCPU *xtensa_env_get_cpu(const CPUXtensaState *env)

{

    return container_of(env, XtensaCPU, env);

}



#define ENV_OFFSET offsetof(XtensaCPU, env)
@@ -724,10 +719,15 @@ static inline int cpu_mmu_index(CPUXtensaState *env, bool ifetch) 
#define XTENSA_CSBASE_LBEG_OFF_MASK 0x00ff0000

#define XTENSA_CSBASE_LBEG_OFF_SHIFT 16



typedef CPUXtensaState CPUArchState;

typedef XtensaCPU ArchCPU;



#include "exec/cpu-all.h"



static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc,

        target_ulong *cs_base, uint32_t *flags)

{

    CPUState *cs = CPU(xtensa_env_get_cpu(env));

    CPUState *cs = env_cpu(env);



    *pc = env->pc;

    *cs_base = 0;
@@ -797,9 +797,4 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc, 
    }

}



typedef CPUXtensaState CPUArchState;

typedef XtensaCPU ArchCPU;



#include "exec/cpu-all.h"



#endif

target/xtensa/dbg_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void HELPER(wsr_ibreaka)(CPUXtensaState *env, uint32_t i, uint32_t v) 
static void set_dbreak(CPUXtensaState *env, unsigned i, uint32_t dbreaka,

        uint32_t dbreakc)

{

    CPUState *cs = CPU(xtensa_env_get_cpu(env));

    CPUState *cs = env_cpu(env);

    int flags = BP_CPU | BP_STOP_BEFORE_ACCESS;

    uint32_t mask = dbreakc | ~DBREAKC_MASK;
@@ -118,7 +118,7 @@ void HELPER(wsr_dbreakc)(CPUXtensaState *env, uint32_t i, uint32_t v) 
            set_dbreak(env, i, env->sregs[DBREAKA + i], v);

        } else {

            if (env->cpu_watchpoint[i]) {

                CPUState *cs = CPU(xtensa_env_get_cpu(env));

                CPUState *cs = env_cpu(env);



                cpu_watchpoint_remove_by_ref(cs, env->cpu_watchpoint[i]);

                env->cpu_watchpoint[i] = NULL;

target/xtensa/exc_helper.c

+4 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


void HELPER(exception)(CPUXtensaState *env, uint32_t excp)

{

    CPUState *cs = CPU(xtensa_env_get_cpu(env));

    CPUState *cs = env_cpu(env);



    cs->exception_index = excp;

    if (excp == EXCP_YIELD) {
@@ -100,7 +100,7 @@ void HELPER(debug_exception)(CPUXtensaState *env, uint32_t pc, uint32_t cause) 


void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel)

{

    CPUState *cpu;

    CPUState *cpu = env_cpu(env);



    env->pc = pc;

    env->sregs[PS] = (env->sregs[PS] & ~PS_INTLEVEL) |
@@ -111,11 +111,10 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) 
    qemu_mutex_unlock_iothread();



    if (env->pending_irq_level) {

        cpu_loop_exit(CPU(xtensa_env_get_cpu(env)));

        cpu_loop_exit(cpu);

        return;

    }



    cpu = CPU(xtensa_env_get_cpu(env));

    cpu->halted = 1;

    HELPER(exception)(env, EXCP_HLT);

}
@@ -165,7 +164,7 @@ static void handle_interrupt(CPUXtensaState *env) 
        (env->config->level_mask[level] &

         env->sregs[INTSET] &

         env->sregs[INTENABLE])) {

        CPUState *cs = CPU(xtensa_env_get_cpu(env));

        CPUState *cs = env_cpu(env);



        if (level > 1) {

            env->sregs[EPC1 + level - 1] = env->pc;