vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-cris: reduce v32isms from v10 log dumps 

Use the correct register names for v10 and don't dump support function
registers for pre-v32.

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Hans-Peter Nilsson <hp@axis.com>
Signed-off-by: Rabin Vincent <rabinv@axis.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
master
Hans-Peter Nilsson 2016-08-15 13:44:46 +02:00 committed by Edgar E. Iglesias
parent 85b3ed1db5
commit 17bc37b75e
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
target-cris/translate.c
View File

@ -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); cpu_abort(CPU(dc->cpu), "%s:%d\n", file, line);
} }
static const char *regnames[] = static const char *regnames_v32[] =
{ {
"$r0", "$r1", "$r2", "$r3", "$r0", "$r1", "$r2", "$r3",
"$r4", "$r5", "$r6", "$r7", "$r4", "$r5", "$r6", "$r7",
"$r8", "$r9", "$r10", "$r11", "$r8", "$r9", "$r10", "$r11",
"$r12", "$r13", "$sp", "$acr", "$r12", "$r13", "$sp", "$acr",
}; };
static const char *pregnames[] = static const char *pregnames_v32[] =
{ {
"$bz", "$vr", "$pid", "$srs", "$bz", "$vr", "$pid", "$srs",
"$wz", "$exs", "$eda", "$mof", "$wz", "$exs", "$eda", "$mof",
@ -3327,12 +3327,20 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
{ {
CRISCPU *cpu = CRIS_CPU(cs); CRISCPU *cpu = CRIS_CPU(cs);
CPUCRISState *env = &cpu->env; CPUCRISState *env = &cpu->env;
const char **regnames;
const char **pregnames;
int i; int i;
uint32_t srs;
if (!env || !f) { if (!env || !f) {
return; 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" 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", "cc_op=%d cc_src=%d cc_dest=%d cc_result=%x cc_mask=%x\n",
@ -3354,14 +3362,16 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
cpu_fprintf(f, "\n"); cpu_fprintf(f, "\n");
} }
} }
srs = env->pregs[PR_SRS]; if (env->pregs[PR_VR] >= 32) {
cpu_fprintf(f, "\nsupport function regs bank %x:\n", srs); uint32_t srs = env->pregs[PR_SRS];
if (srs < ARRAY_SIZE(env->sregs)) { cpu_fprintf(f, "\nsupport function regs bank %x:\n", srs);
for (i = 0; i < 16; i++) { if (srs < ARRAY_SIZE(env->sregs)) {
cpu_fprintf(f, "s%2.2d=%8.8x ", for (i = 0; i < 16; i++) {
i, env->sregs[srs][i]); cpu_fprintf(f, "s%2.2d=%8.8x ",
if ((i + 1) % 4 == 0) { i, env->sregs[srs][i]);
cpu_fprintf(f, "\n"); if ((i + 1) % 4 == 0) {
cpu_fprintf(f, "\n");
}
} }
} }
} }
@ -3406,12 +3416,12 @@ void cris_initialize_tcg(void)
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
cpu_R[i] = tcg_global_mem_new(cpu_env, cpu_R[i] = tcg_global_mem_new(cpu_env,
offsetof(CPUCRISState, regs[i]), offsetof(CPUCRISState, regs[i]),
regnames[i]); regnames_v32[i]);
} }
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
cpu_PR[i] = tcg_global_mem_new(cpu_env, cpu_PR[i] = tcg_global_mem_new(cpu_env,
offsetof(CPUCRISState, pregs[i]), offsetof(CPUCRISState, pregs[i]),
pregnames[i]); pregnames_v32[i]);
} }
} }