arm: move arm_log_exception into .c file

Avoid need for qemu/log.h inclusion, and make the function static too.

Backports commit 27a7ea8a1f351578ce869b41ba1ba662c063fd62 from qemu
This commit is contained in:
Paolo Bonzini 2018-02-24 01:52:30 -05:00 committed by Lioncash
parent 37f26922dd
commit 058624b9e4
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 15 additions and 15 deletions

View File

@ -5066,6 +5066,21 @@ static void do_v7m_exception_exit(CPUARMState *env)
pointer. */
}
static void arm_log_exception(int idx)
{
if (qemu_loglevel_mask(CPU_LOG_INT)) {
const char *exc = NULL;
if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {
exc = excnames[idx];
}
if (!exc) {
exc = "unknown";
}
qemu_log_mask(CPU_LOG_INT, "Taking exception %d [%s]\n", idx, exc);
}
}
void arm_v7m_cpu_do_interrupt(CPUState *cs)
{
CPUARMState *env = cs->env_ptr;

View File

@ -73,21 +73,6 @@ static const char * const excnames[] = {
"Semihosting call",
};
static inline void arm_log_exception(int idx)
{
if (qemu_loglevel_mask(CPU_LOG_INT)) {
const char *exc = NULL;
if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {
exc = excnames[idx];
}
if (!exc) {
exc = "unknown";
}
qemu_log_mask(CPU_LOG_INT, "Taking exception %d [%s]\n", idx, exc);
}
}
/* Scale factor for generic timers, ie number of ns per tick.
* This gives a 62.5MHz timer.
*/