[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 11/64] target/nios2: Build helper.c for system only
From: |
Richard Henderson |
Subject: |
[PATCH v7 11/64] target/nios2: Build helper.c for system only |
Date: |
Thu, 21 Apr 2022 08:16:42 -0700 |
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>
---
target/nios2/helper.c | 3 +--
target/nios2/meson.build | 7 +++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index 55b8fb0bcb..04a8831443 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -28,7 +28,7 @@
#include "exec/helper-proto.h"
#include "semihosting/semihost.h"
-#if !defined(CONFIG_USER_ONLY)
+
void nios2_cpu_do_interrupt(CPUState *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;
cpu_loop_exit_restore(cs, retaddr);
}
-#endif /* !CONFIG_USER_ONLY */
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index 62b384702d..2bd60ba306 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -1,14 +1,17 @@
nios2_ss = ss.source_set()
nios2_ss.add(files(
'cpu.c',
- 'helper.c',
'nios2-semi.c',
'op_helper.c',
'translate.c',
))
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_softmmu_arch += {'nios2': nios2_softmmu_ss}
--
2.34.1
- [PATCH v7 04/64] linux-user/nios2: Adjust error return, (continued)
- [PATCH v7 04/64] linux-user/nios2: Adjust error return, Richard Henderson, 2022/04/21
- [PATCH v7 01/64] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP, Richard Henderson, 2022/04/21
- [PATCH v7 05/64] linux-user/nios2: Handle special qemu syscall return values, Richard Henderson, 2022/04/21
- [PATCH v7 06/64] linux-user/nios2: Remove do_sigreturn, Richard Henderson, 2022/04/21
- [PATCH v7 07/64] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn, Richard Henderson, 2022/04/21
- [PATCH v7 09/64] target/nios2: Remove user-only nios2_cpu_do_interrupt, Richard Henderson, 2022/04/21
- [PATCH v7 08/64] tests/tcg/nios2: Re-enable linux-user tests, Richard Henderson, 2022/04/21
- [PATCH v7 10/64] target/nios2: Remove nios2_cpu_record_sigsegv, Richard Henderson, 2022/04/21
- [PATCH v7 11/64] target/nios2: Build helper.c for system only,
Richard Henderson <=
- [PATCH v7 12/64] linux-user/nios2: Use force_sig_fault for EXCP_DEBUG, Richard Henderson, 2022/04/21
- [PATCH v7 13/64] target/nios2: Check supervisor on eret, Richard Henderson, 2022/04/21
- [PATCH v7 14/64] target/nios2: Stop generating code if gen_check_supervisor fails, Richard Henderson, 2022/04/21
- [PATCH v7 15/64] target/nios2: Add NUM_GP_REGS and NUM_CP_REGS, Richard Henderson, 2022/04/21
- [PATCH v7 16/64] target/nios2: Split PC out of env->regs[], Richard Henderson, 2022/04/21
- [PATCH v7 17/64] target/nios2: Split out helper for eret instruction, Richard Henderson, 2022/04/21
- [PATCH v7 18/64] target/nios2: Fix BRET instruction, Richard Henderson, 2022/04/21
- [PATCH v7 19/64] target/nios2: Do not create TCGv for control registers, Richard Henderson, 2022/04/21