target/nios2: Build helper.c for system only
Remove the #ifdef !defined(CONFIG_USER_ONLY) that surrounds the whole file, and move helper.c to nios2_softmmu_ss. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20220421151735.31996-12-richard.henderson@linaro.org>
This commit is contained in:
parent
fb4de9d235
commit
d2a11b40a4
|
@ -28,7 +28,7 @@
|
||||||
#include "exec/helper-proto.h"
|
#include "exec/helper-proto.h"
|
||||||
#include "semihosting/semihost.h"
|
#include "semihosting/semihost.h"
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
|
||||||
void nios2_cpu_do_interrupt(CPUState *cs)
|
void nios2_cpu_do_interrupt(CPUState *cs)
|
||||||
{
|
{
|
||||||
Nios2CPU *cpu = NIOS2_CPU(cs);
|
Nios2CPU *cpu = NIOS2_CPU(cs);
|
||||||
|
@ -292,4 +292,3 @@ bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
|
||||||
env->regs[CR_BADADDR] = address;
|
env->regs[CR_BADADDR] = address;
|
||||||
cpu_loop_exit_restore(cs, retaddr);
|
cpu_loop_exit_restore(cs, retaddr);
|
||||||
}
|
}
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
|
||||||
|
|
|
@ -1,14 +1,17 @@
|
||||||
nios2_ss = ss.source_set()
|
nios2_ss = ss.source_set()
|
||||||
nios2_ss.add(files(
|
nios2_ss.add(files(
|
||||||
'cpu.c',
|
'cpu.c',
|
||||||
'helper.c',
|
|
||||||
'nios2-semi.c',
|
'nios2-semi.c',
|
||||||
'op_helper.c',
|
'op_helper.c',
|
||||||
'translate.c',
|
'translate.c',
|
||||||
))
|
))
|
||||||
|
|
||||||
nios2_softmmu_ss = ss.source_set()
|
nios2_softmmu_ss = ss.source_set()
|
||||||
nios2_softmmu_ss.add(files('monitor.c', 'mmu.c'))
|
nios2_softmmu_ss.add(files(
|
||||||
|
'helper.c',
|
||||||
|
'monitor.c',
|
||||||
|
'mmu.c'
|
||||||
|
))
|
||||||
|
|
||||||
target_arch += {'nios2': nios2_ss}
|
target_arch += {'nios2': nios2_ss}
|
||||||
target_softmmu_arch += {'nios2': nios2_softmmu_ss}
|
target_softmmu_arch += {'nios2': nios2_softmmu_ss}
|
||||||
|
|
Loading…
Reference in New Issue