[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] target-cris: reduce v32isms from v10 log dumps
From: |
Rabin Vincent |
Subject: |
[Qemu-devel] [PATCH 6/9] target-cris: reduce v32isms from v10 log dumps |
Date: |
Mon, 5 Sep 2016 13:54:09 +0200 |
From: Hans-Peter Nilsson <address@hidden>
Use the correct register names for v10 and don't dump support function
registers for pre-v32.
Signed-off-by: Hans-Peter Nilsson <address@hidden>
Signed-off-by: Rabin Vincent <address@hidden>
---
target-cris/translate.c | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/target-cris/translate.c b/target-cris/translate.c
index c280e24..a4512b5 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -140,14 +140,14 @@ static void gen_BUG(DisasContext *dc, const char *file,
int line)
cpu_abort(CPU(dc->cpu), "%s:%d\n", file, line);
}
-static const char *regnames[] =
+static const char *regnames_v32[] =
{
"$r0", "$r1", "$r2", "$r3",
"$r4", "$r5", "$r6", "$r7",
"$r8", "$r9", "$r10", "$r11",
"$r12", "$r13", "$sp", "$acr",
};
-static const char *pregnames[] =
+static const char *pregnames_v32[] =
{
"$bz", "$vr", "$pid", "$srs",
"$wz", "$exs", "$eda", "$mof",
@@ -3336,12 +3336,20 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f,
fprintf_function cpu_fprintf,
{
CRISCPU *cpu = CRIS_CPU(cs);
CPUCRISState *env = &cpu->env;
+ const char **regnames;
+ const char **pregnames;
int i;
- uint32_t srs;
if (!env || !f) {
return;
}
+ if (env->pregs[PR_VR] < 32) {
+ pregnames = pregnames_v10;
+ regnames = regnames_v10;
+ } else {
+ pregnames = pregnames_v32;
+ regnames = regnames_v32;
+ }
cpu_fprintf(f, "PC=%x CCS=%x btaken=%d btarget=%x\n"
"cc_op=%d cc_src=%d cc_dest=%d cc_result=%x cc_mask=%x\n",
@@ -3363,14 +3371,16 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f,
fprintf_function cpu_fprintf,
cpu_fprintf(f, "\n");
}
}
- srs = env->pregs[PR_SRS];
- cpu_fprintf(f, "\nsupport function regs bank %x:\n", srs);
- if (srs < ARRAY_SIZE(env->sregs)) {
- for (i = 0; i < 16; i++) {
- cpu_fprintf(f, "s%2.2d=%8.8x ",
- i, env->sregs[srs][i]);
- if ((i + 1) % 4 == 0) {
- cpu_fprintf(f, "\n");
+ if (env->pregs[PR_SRS] >= 32) {
+ uint32_t srs = env->pregs[PR_SRS];
+ cpu_fprintf(f, "\nsupport function regs bank %x:\n", srs);
+ if (srs < ARRAY_SIZE(env->sregs)) {
+ for (i = 0; i < 16; i++) {
+ cpu_fprintf(f, "s%2.2d=%8.8x ",
+ i, env->sregs[srs][i]);
+ if ((i + 1) % 4 == 0) {
+ cpu_fprintf(f, "\n");
+ }
}
}
}
@@ -3415,12 +3425,12 @@ void cris_initialize_tcg(void)
for (i = 0; i < 16; i++) {
cpu_R[i] = tcg_global_mem_new(cpu_env,
offsetof(CPUCRISState, regs[i]),
- regnames[i]);
+ regnames_v32[i]);
}
for (i = 0; i < 16; i++) {
cpu_PR[i] = tcg_global_mem_new(cpu_env,
offsetof(CPUCRISState, pregs[i]),
- pregnames[i]);
+ pregnames_v32[i]);
}
}
--
2.1.4
- [Qemu-devel] [PATCH 8/9] target-cris: add v17 CPU, (continued)
- [Qemu-devel] [PATCH 5/9] target-cris: sync CC state at load/stores., Rabin Vincent, 2016/09/05
- [Qemu-devel] [PATCH 6/9] target-cris: reduce v32isms from v10 log dumps,
Rabin Vincent <=
- [Qemu-devel] [PATCH 4/9] tests: cris: remove check_time1, Rabin Vincent, 2016/09/05
- Re: [Qemu-devel] [PATCH 1/9] tests: cris: force inlining, Edgar E. Iglesias, 2016/09/06
- Re: [Qemu-devel] [PATCH 1/9] tests: cris: force inlining, Peter Maydell, 2016/09/08