Skip to content

Commit

Permalink
target/mips: Do not include CP0 helpers in user-mode emulation
Browse files Browse the repository at this point in the history
CP0 helpers are restricted to system-mode emulation.
Do not intent do build cp0_helper.c in user-mode (this
allows to simplify some #ifdef'ry).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Huacai Chen <chenhc@lemote.com>
Message-Id: <20201109090422.2445166-3-f4bug@amsat.org>
  • Loading branch information
philmd committed Dec 13, 2020
1 parent 547b9b1 commit 55671f8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions target/mips/cp0_helper.c
Expand Up @@ -32,7 +32,6 @@
#include "sysemu/kvm.h"


#ifndef CONFIG_USER_ONLY
/* SMP helpers. */
static bool mips_vpe_is_wfi(MIPSCPU *c)
{
Expand Down Expand Up @@ -1667,10 +1666,8 @@ target_ulong helper_evpe(CPUMIPSState *env)
}
return prev;
}
#endif /* !CONFIG_USER_ONLY */

/* R6 Multi-threading */
#ifndef CONFIG_USER_ONLY
target_ulong helper_dvp(CPUMIPSState *env)
{
CPUState *other_cs = first_cpu;
Expand Down Expand Up @@ -1709,4 +1706,3 @@ target_ulong helper_evp(CPUMIPSState *env)
}
return prev;
}
#endif /* !CONFIG_USER_ONLY */
2 changes: 1 addition & 1 deletion target/mips/meson.build
@@ -1,6 +1,5 @@
mips_ss = ss.source_set()
mips_ss.add(files(
'cp0_helper.c',
'cpu.c',
'dsp_helper.c',
'fpu_helper.c',
Expand All @@ -15,6 +14,7 @@ mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))

mips_softmmu_ss = ss.source_set()
mips_softmmu_ss.add(files(
'cp0_helper.c',
'cp0_timer.c',
'machine.c',
'mips-semi.c',
Expand Down

0 comments on commit 55671f8

Please sign in to comment.