target-alpha: Clean up ENV_GET_CPU() usage
Commits2c17449b30
,fdfba1a298
,ab1da85791
andf606604f1c
added usages of ENV_GET_CPU() macro in target-specific code. Use alpha_env_get_cpu() instead. Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
9d111183d5
commit
d2810ffd34
|
@ -213,7 +213,7 @@ static int get_physical_address(CPUAlphaState *env, target_ulong addr,
|
||||||
int prot_need, int mmu_idx,
|
int prot_need, int mmu_idx,
|
||||||
target_ulong *pphys, int *pprot)
|
target_ulong *pphys, int *pprot)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
target_long saddr = addr;
|
target_long saddr = addr;
|
||||||
target_ulong phys = 0;
|
target_ulong phys = 0;
|
||||||
target_ulong L1pte, L2pte, L3pte;
|
target_ulong L1pte, L2pte, L3pte;
|
||||||
|
|
|
@ -26,45 +26,45 @@
|
||||||
|
|
||||||
uint64_t helper_ldl_phys(CPUAlphaState *env, uint64_t p)
|
uint64_t helper_ldl_phys(CPUAlphaState *env, uint64_t p)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
return (int32_t)ldl_phys(cs->as, p);
|
return (int32_t)ldl_phys(cs->as, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t helper_ldq_phys(CPUAlphaState *env, uint64_t p)
|
uint64_t helper_ldq_phys(CPUAlphaState *env, uint64_t p)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
return ldq_phys(cs->as, p);
|
return ldq_phys(cs->as, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t helper_ldl_l_phys(CPUAlphaState *env, uint64_t p)
|
uint64_t helper_ldl_l_phys(CPUAlphaState *env, uint64_t p)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
env->lock_addr = p;
|
env->lock_addr = p;
|
||||||
return env->lock_value = (int32_t)ldl_phys(cs->as, p);
|
return env->lock_value = (int32_t)ldl_phys(cs->as, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t helper_ldq_l_phys(CPUAlphaState *env, uint64_t p)
|
uint64_t helper_ldq_l_phys(CPUAlphaState *env, uint64_t p)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
env->lock_addr = p;
|
env->lock_addr = p;
|
||||||
return env->lock_value = ldq_phys(cs->as, p);
|
return env->lock_value = ldq_phys(cs->as, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
void helper_stl_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
void helper_stl_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
stl_phys(cs->as, p, v);
|
stl_phys(cs->as, p, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
void helper_stq_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
void helper_stq_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
stq_phys(cs->as, p, v);
|
stq_phys(cs->as, p, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t helper_stl_c_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
uint64_t helper_stl_c_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
uint64_t ret = 0;
|
uint64_t ret = 0;
|
||||||
|
|
||||||
if (p == env->lock_addr) {
|
if (p == env->lock_addr) {
|
||||||
|
@ -81,7 +81,7 @@ uint64_t helper_stl_c_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
||||||
|
|
||||||
uint64_t helper_stq_c_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
uint64_t helper_stq_c_phys(CPUAlphaState *env, uint64_t p, uint64_t v)
|
||||||
{
|
{
|
||||||
CPUState *cs = ENV_GET_CPU(env);
|
CPUState *cs = CPU(alpha_env_get_cpu(env));
|
||||||
uint64_t ret = 0;
|
uint64_t ret = 0;
|
||||||
|
|
||||||
if (p == env->lock_addr) {
|
if (p == env->lock_addr) {
|
||||||
|
|
Loading…
Reference in a new issue