target-mips: rename CP0_LLAddr into lladdr
The variable CP0_LLAddr represent the full lladdr, not the actual
register value, which is only part of this value and depends on the
CPU.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/linux-user/main.c b/linux-user/main.c
index bcc36f2..67336d7 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1849,7 +1849,7 @@
int reg;
int d;
- addr = env->CP0_LLAddr;
+ addr = env->lladdr;
page_addr = addr & TARGET_PAGE_MASK;
start_exclusive();
mmap_lock();
@@ -1879,7 +1879,7 @@
}
}
}
- env->CP0_LLAddr = -1;
+ env->lladdr = -1;
if (!segv) {
env->active_tc.PC += 4;
}
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index cefa5ae..45f3987 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -372,7 +372,7 @@
int32_t CP0_Config6;
int32_t CP0_Config7;
/* XXX: Maybe make LLAddr per-TC? */
- target_ulong CP0_LLAddr;
+ target_ulong lladdr;
target_ulong llval;
target_ulong llnewval;
target_ulong llreg;
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 4519319..9ffac71 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -127,7 +127,7 @@
qemu_put_sbe32s(f, &env->CP0_Config3);
qemu_put_sbe32s(f, &env->CP0_Config6);
qemu_put_sbe32s(f, &env->CP0_Config7);
- qemu_put_betls(f, &env->CP0_LLAddr);
+ qemu_put_betls(f, &env->lladdr);
for(i = 0; i < 8; i++)
qemu_put_betls(f, &env->CP0_WatchLo[i]);
for(i = 0; i < 8; i++)
@@ -279,7 +279,7 @@
qemu_get_sbe32s(f, &env->CP0_Config3);
qemu_get_sbe32s(f, &env->CP0_Config6);
qemu_get_sbe32s(f, &env->CP0_Config7);
- qemu_get_betls(f, &env->CP0_LLAddr);
+ qemu_get_betls(f, &env->lladdr);
for(i = 0; i < 8; i++)
qemu_get_betls(f, &env->CP0_WatchLo[i]);
for(i = 0; i < 8; i++)
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 83734b1..d2a81f0 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -730,7 +730,7 @@
target_ulong helper_mfc0_lladdr (void)
{
- return (int32_t)env->CP0_LLAddr >> 4;
+ return (int32_t)env->lladdr >> 4;
}
target_ulong helper_mfc0_watchlo (uint32_t sel)
@@ -795,7 +795,7 @@
target_ulong helper_dmfc0_lladdr (void)
{
- return env->CP0_LLAddr >> 4;
+ return env->lladdr >> 4;
}
target_ulong helper_dmfc0_watchlo (uint32_t sel)
@@ -959,7 +959,7 @@
{
env->active_tc.PC = arg1;
env->active_tc.CP0_TCStatus &= ~(1 << CP0TCSt_TDS);
- env->CP0_LLAddr = 0ULL;
+ env->lladdr = 0ULL;
/* MIPS16 not implemented. */
}
@@ -970,12 +970,12 @@
if (other_tc == env->current_tc) {
env->active_tc.PC = arg1;
env->active_tc.CP0_TCStatus &= ~(1 << CP0TCSt_TDS);
- env->CP0_LLAddr = 0ULL;
+ env->lladdr = 0ULL;
/* MIPS16 not implemented. */
} else {
env->tcs[other_tc].PC = arg1;
env->tcs[other_tc].CP0_TCStatus &= ~(1 << CP0TCSt_TDS);
- env->CP0_LLAddr = 0ULL;
+ env->lladdr = 0ULL;
/* MIPS16 not implemented. */
}
}
@@ -1702,7 +1702,7 @@
}
compute_hflags(env);
debug_post_eret();
- env->CP0_LLAddr = 1;
+ env->lladdr = 1;
}
void helper_deret (void)
@@ -1712,7 +1712,7 @@
env->hflags &= MIPS_HFLAG_DM;
compute_hflags(env);
debug_post_eret();
- env->CP0_LLAddr = 1;
+ env->lladdr = 1;
}
#endif /* !CONFIG_USER_ONLY */
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 7bae541..63737e2 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -918,7 +918,7 @@
TCGv t0 = tcg_temp_new(); \
tcg_gen_mov_tl(t0, arg1); \
tcg_gen_qemu_##fname(ret, arg1, ctx->mem_idx); \
- tcg_gen_st_tl(t0, cpu_env, offsetof(CPUState, CP0_LLAddr)); \
+ tcg_gen_st_tl(t0, cpu_env, offsetof(CPUState, lladdr)); \
tcg_gen_st_tl(ret, cpu_env, offsetof(CPUState, llval)); \
tcg_temp_free(t0); \
}
@@ -941,7 +941,7 @@
tcg_gen_st_tl(arg2, cpu_env, offsetof(CPUState, CP0_BadVAddr)); \
generate_exception(ctx, EXCP_AdES); \
gen_set_label(l1); \
- tcg_gen_ld_tl(t0, cpu_env, offsetof(CPUState, CP0_LLAddr)); \
+ tcg_gen_ld_tl(t0, cpu_env, offsetof(CPUState, lladdr)); \
tcg_gen_brcond_tl(TCG_COND_NE, arg2, t0, l2); \
tcg_gen_movi_tl(t0, rt | ((almask << 3) & 0x20)); \
tcg_gen_st_tl(t0, cpu_env, offsetof(CPUState, llreg)); \
@@ -967,7 +967,7 @@
tcg_gen_st_tl(arg2, cpu_env, offsetof(CPUState, CP0_BadVAddr)); \
generate_exception(ctx, EXCP_AdES); \
gen_set_label(l1); \
- tcg_gen_ld_tl(t0, cpu_env, offsetof(CPUState, CP0_LLAddr)); \
+ tcg_gen_ld_tl(t0, cpu_env, offsetof(CPUState, lladdr)); \
tcg_gen_brcond_tl(TCG_COND_NE, arg2, t0, l2); \
tcg_gen_ld_tl(t0, cpu_env, offsetof(CPUState, llval)); \
tcg_gen_qemu_##ldname(t1, arg2, ctx->mem_idx); \
@@ -8501,8 +8501,8 @@
if (!SIGN_EXT_P(env->CP0_EPC))
cpu_fprintf(f, "BROKEN: EPC=0x" TARGET_FMT_lx "\n", env->CP0_EPC);
- if (!SIGN_EXT_P(env->CP0_LLAddr))
- cpu_fprintf(f, "BROKEN: LLAddr=0x" TARGET_FMT_lx "\n", env->CP0_LLAddr);
+ if (!SIGN_EXT_P(env->lladdr))
+ cpu_fprintf(f, "BROKEN: LLAddr=0x" TARGET_FMT_lx "\n", env->lladdr);
}
#endif
@@ -8526,7 +8526,7 @@
cpu_fprintf(f, "CP0 Status 0x%08x Cause 0x%08x EPC 0x" TARGET_FMT_lx "\n",
env->CP0_Status, env->CP0_Cause, env->CP0_EPC);
cpu_fprintf(f, " Config0 0x%08x Config1 0x%08x LLAddr 0x" TARGET_FMT_lx "\n",
- env->CP0_Config0, env->CP0_Config1, env->CP0_LLAddr);
+ env->CP0_Config0, env->CP0_Config1, env->lladdr);
if (env->hflags & MIPS_HFLAG_FPU)
fpu_dump_state(env, f, cpu_fprintf, flags);
#if defined(TARGET_MIPS64) && defined(MIPS_DEBUG_SIGN_EXTENSIONS)
