ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/mips: Also display exception names in user-mode 

Currently MIPS exceptions are displayed as string in system-mode
emulation, but as number in user-mode.
Unify by extracting the current system-mode code as excp_name()
and use that in user-mode.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201119160536.1980329-1-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-11-18 17:47:29 +01:00
parent 5777c8a905
commit 90c429ee76
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target/mips/helper.c
View File

@ -978,6 +978,7 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address,
return physical; return physical;
} }
} }
#endif /* !CONFIG_USER_ONLY */
static const char * const excp_names[EXCP_LAST + 1] = { static const char * const excp_names[EXCP_LAST + 1] = {
[EXCP_RESET] = "reset", [EXCP_RESET] = "reset",
@ -1018,7 +1019,14 @@ static const char * const excp_names[EXCP_LAST + 1] = {
[EXCP_MSADIS] = "MSA disabled", [EXCP_MSADIS] = "MSA disabled",
[EXCP_MSAFPE] = "MSA floating point", [EXCP_MSAFPE] = "MSA floating point",
}; };
#endif
static const char *mips_exception_name(int32_t exception)
{
if (exception < 0 || exception > EXCP_LAST) {
return "unknown";
}
return excp_names[exception];
}
target_ulong exception_resume_pc(CPUMIPSState *env) target_ulong exception_resume_pc(CPUMIPSState *env)
{ {
@ -1091,19 +1099,13 @@ void mips_cpu_do_interrupt(CPUState *cs)
bool update_badinstr = 0; bool update_badinstr = 0;
target_ulong offset; target_ulong offset;
int cause = -1; int cause = -1;
const char *name;
if (qemu_loglevel_mask(CPU_LOG_INT) if (qemu_loglevel_mask(CPU_LOG_INT)
&& cs->exception_index != EXCP_EXT_INTERRUPT) { && cs->exception_index != EXCP_EXT_INTERRUPT) {
if (cs->exception_index < 0 || cs->exception_index > EXCP_LAST) {
name = "unknown";
} else {
name = excp_names[cs->exception_index];
}
qemu_log("%s enter: PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx qemu_log("%s enter: PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx
" %s exception\n", " %s exception\n",
__func__, env->active_tc.PC, env->CP0_EPC, name); __func__, env->active_tc.PC, env->CP0_EPC,
mips_exception_name(cs->exception_index));
} }
if (cs->exception_index == EXCP_EXT_INTERRUPT && if (cs->exception_index == EXCP_EXT_INTERRUPT &&
(env->hflags & MIPS_HFLAG_DM)) { (env->hflags & MIPS_HFLAG_DM)) {
@ -1490,8 +1492,9 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
{ {
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n", qemu_log_mask(CPU_LOG_INT, "%s: %d (%s) %d\n",
__func__, exception, error_code); __func__, exception, mips_exception_name(exception),
error_code);
cs->exception_index = exception; cs->exception_index = exception;
env->error_code = error_code; env->error_code = error_code;