cpu: Introduce CPUNegativeOffsetState

Nothing in there so far, but all of the plumbing done
within the target ArchCPU state.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2019-03-22 17:16:06 -07:00
parent 7506ed902e
commit 5b146dc716
23 changed files with 57 additions and 3 deletions

View file

@ -404,4 +404,28 @@ static inline CPUState *env_cpu(CPUArchState *env)
return &env_archcpu(env)->parent_obj;
}
/**
* env_neg(env)
* @env: The architecture environment
*
* Return the CPUNegativeOffsetState associated with the environment.
*/
static inline CPUNegativeOffsetState *env_neg(CPUArchState *env)
{
ArchCPU *arch_cpu = container_of(env, ArchCPU, env);
return &arch_cpu->neg;
}
/**
* cpu_neg(cpu)
* @cpu: The generic CPUState
*
* Return the CPUNegativeOffsetState associated with the cpu.
*/
static inline CPUNegativeOffsetState *cpu_neg(CPUState *cpu)
{
ArchCPU *arch_cpu = container_of(cpu, ArchCPU, parent_obj);
return &arch_cpu->neg;
}
#endif /* CPU_ALL_H */

View file

@ -227,4 +227,12 @@ typedef struct CPUTLB {
#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */
/*
* This structure must be placed in ArchCPU immedately
* before CPUArchState, as a field named "neg".
*/
typedef struct CPUNegativeOffsetState {
/* Empty */
} CPUNegativeOffsetState;
#endif

View file

@ -272,6 +272,7 @@ struct AlphaCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUAlphaState env;
/* This alarm doesn't exist in real hardware; we wish it did. */

View file

@ -721,6 +721,7 @@ struct ARMCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUARMState env;
/* Coprocessor information */

View file

@ -180,6 +180,7 @@ struct CRISCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUCRISState env;
};

View file

@ -218,6 +218,7 @@ struct HPPACPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUHPPAState env;
QEMUTimer *alarm_timer;
};

View file

@ -1369,6 +1369,7 @@ struct X86CPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUX86State env;
bool hyperv_vapic;

View file

@ -186,6 +186,7 @@ struct LM32CPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPULM32State env;
uint32_t revision;

View file

@ -160,6 +160,7 @@ struct M68kCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUM68KState env;
};

View file

@ -287,6 +287,9 @@ struct MicroBlazeCPU {
/*< public >*/
CPUNegativeOffsetState neg;
CPUMBState env;
/* Microblaze Configuration Settings */
struct {
bool stackprot;
@ -306,8 +309,6 @@ struct MicroBlazeCPU {
char *version;
uint8_t pvr;
} cfg;
CPUMBState env;
};

View file

@ -1068,6 +1068,7 @@ struct MIPSCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUMIPSState env;
};

View file

@ -87,6 +87,7 @@ typedef struct MoxieCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUMoxieState env;
} MoxieCPU;

View file

@ -182,7 +182,9 @@ typedef struct Nios2CPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUNios2State env;
bool mmu_present;
uint32_t pid_num_bits;
uint32_t tlb_num_ways;

View file

@ -313,8 +313,8 @@ typedef struct OpenRISCCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUOpenRISCState env;
} OpenRISCCPU;

View file

@ -1184,7 +1184,9 @@ struct PowerPCCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUPPCState env;
int vcpu_id;
uint32_t compat_pvr;
PPCVirtualHypervisor *vhyp;

View file

@ -210,6 +210,7 @@ typedef struct RISCVCPU {
/*< private >*/
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPURISCVState env;
/* Configuration Settings */

View file

@ -156,6 +156,7 @@ struct S390CPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUS390XState env;
S390CPUModel *model;
/* needed for live migration */

View file

@ -204,6 +204,7 @@ struct SuperHCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUSH4State env;
};

View file

@ -529,6 +529,7 @@ struct SPARCCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUSPARCState env;
};

View file

@ -135,6 +135,7 @@ typedef struct TileGXCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUTLGState env;
} TileGXCPU;

View file

@ -205,6 +205,7 @@ struct TriCoreCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUTriCoreState env;
};

View file

@ -73,6 +73,7 @@ struct UniCore32CPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUUniCore32State env;
};

View file

@ -556,6 +556,7 @@ struct XtensaCPU {
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUXtensaState env;
};