summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-11-09 09:41:24 +0100
committerPhilippe Mathieu-Daudé2020-12-13 19:58:54 +0100
commit55671f80cbb011343cf5786186daed600fcfab4f (patch)
treeed7c99da373f79802fad301fb5db724a9451bbdd /target
parenttarget/mips: Replace magic values by CP0PM_MASK or TARGET_PAGE_BITS_MIN (diff)
downloadqemu-55671f80cbb011343cf5786186daed600fcfab4f.tar.gz
qemu-55671f80cbb011343cf5786186daed600fcfab4f.tar.xz
qemu-55671f80cbb011343cf5786186daed600fcfab4f.zip
target/mips: Do not include CP0 helpers in user-mode emulation
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>
Diffstat (limited to 'target')
-rw-r--r--target/mips/cp0_helper.c4
-rw-r--r--target/mips/meson.build2
2 files changed, 1 insertions, 5 deletions
diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c
index e8b9343ec9..caaaefcc8a 100644
--- a/target/mips/cp0_helper.c
+++ b/target/mips/cp0_helper.c
@@ -32,7 +32,6 @@
#include "sysemu/kvm.h"
-#ifndef CONFIG_USER_ONLY
/* SMP helpers. */
static bool mips_vpe_is_wfi(MIPSCPU *c)
{
@@ -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;
@@ -1709,4 +1706,3 @@ target_ulong helper_evp(CPUMIPSState *env)
}
return prev;
}
-#endif /* !CONFIG_USER_ONLY */
diff --git a/target/mips/meson.build b/target/mips/meson.build
index fa1f024e78..681a5524c0 100644
--- a/target/mips/meson.build
+++ b/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',
@@ -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',