openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

unicore32: Disintegrate cpu_dump_state_ucf64 function 

This patch disintegrates cpu_dump_state_ucf64 function from cpu_dump_state.

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Guan Xuetao 2012-08-10 14:42:37 +08:00 committed by Blue Swirl
parent e8ede0a8bb
commit c5240d8232
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
target-unicore32/translate.c
View File

@ -2139,11 +2139,11 @@ static const char *cpu_mode_names[16] = {
}; };
#define UCF64_DUMP_STATE #define UCF64_DUMP_STATE
void cpu_dump_state(CPUUniCore32State *env, FILE *f, fprintf_function cpu_fprintf, #ifdef UCF64_DUMP_STATE
int flags) static void cpu_dump_state_ucf64(CPUUniCore32State *env, FILE *f,
fprintf_function cpu_fprintf, int flags)
{ {
int i; int i;
#ifdef UCF64_DUMP_STATE
union { union {
uint32_t i; uint32_t i;
float s; float s;
@ -2155,7 +2155,28 @@ void cpu_dump_state(CPUUniCore32State *env, FILE *f, fprintf_function cpu_fprint
float64 f64; float64 f64;
double d; double d;
} d0; } d0;
for (i = 0; i < 16; i++) {
d.d = env->ucf64.regs[i];
s0.i = d.l.lower;
s1.i = d.l.upper;
d0.f64 = d.d;
cpu_fprintf(f, "s%02d=%08x(%8g) s%02d=%08x(%8g)",
i * 2, (int)s0.i, s0.s,
i * 2 + 1, (int)s1.i, s1.s);
cpu_fprintf(f, " d%02d=%" PRIx64 "(%8g)\n",
i, (uint64_t)d0.f64, d0.d);
}
cpu_fprintf(f, "FPSCR: %08x\n", (int)env->ucf64.xregs[UC32_UCF64_FPSCR]);
}
#else
#define cpu_dump_state_ucf64(env, file, pr, flags) do { } while (0)
#endif #endif
void cpu_dump_state(CPUUniCore32State *env, FILE *f,
fprintf_function cpu_fprintf, int flags)
{
int i;
uint32_t psr; uint32_t psr;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
@ -2175,19 +2196,7 @@ void cpu_dump_state(CPUUniCore32State *env, FILE *f, fprintf_function cpu_fprint
psr & (1 << 28) ? 'V' : '-', psr & (1 << 28) ? 'V' : '-',
cpu_mode_names[psr & 0xf]); cpu_mode_names[psr & 0xf]);
#ifdef UCF64_DUMP_STATE cpu_dump_state_ucf64(env, f, cpu_fprintf, flags);
for (i = 0; i < 16; i++) {
d.d = env->ucf64.regs[i];
s0.i = d.l.lower;
s1.i = d.l.upper;
d0.f64 = d.d;
cpu_fprintf(f, "s%02d=%08x(%8g) s%02d=%08x(%8g) d%02d=%" PRIx64 "(%8g)\n",
i * 2, (int)s0.i, s0.s,
i * 2 + 1, (int)s1.i, s1.s,
i, (uint64_t)d0.f64, d0.d);
}
cpu_fprintf(f, "FPSCR: %08x\n", (int)env->ucf64.xregs[UC32_UCF64_FPSCR]);
#endif
} }
void restore_state_to_opc(CPUUniCore32State *env, TranslationBlock *tb, int pc_pos) void restore_state_to_opc(CPUUniCore32State *env, TranslationBlock *tb, int pc_pos)