[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] target/nios2: Only build mmu.c for system mode
From: |
Richard Henderson |
Subject: |
[PULL 3/7] target/nios2: Only build mmu.c for system mode |
Date: |
Thu, 3 Mar 2022 10:46:20 -1000 |
We can thus remove an ifdef covering the entire file.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/mmu.c | 3 ---
target/nios2/meson.build | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c
index 306370f675..437fad09b7 100644
--- a/target/nios2/mmu.c
+++ b/target/nios2/mmu.c
@@ -25,7 +25,6 @@
#include "mmu.h"
#include "trace/trace-target_nios2.h"
-#if !defined(CONFIG_USER_ONLY)
/* rw - 0 = read, 1 = write, 2 = fetch. */
unsigned int mmu_translate(CPUNios2State *env,
@@ -217,5 +216,3 @@ void dump_mmu(CPUNios2State *env)
(entry->data & CR_TLBACC_X) ? 'X' : '-');
}
}
-
-#endif /* !CONFIG_USER_ONLY */
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index e643917db1..62b384702d 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -2,14 +2,13 @@ nios2_ss = ss.source_set()
nios2_ss.add(files(
'cpu.c',
'helper.c',
- 'mmu.c',
'nios2-semi.c',
'op_helper.c',
'translate.c',
))
nios2_softmmu_ss = ss.source_set()
-nios2_softmmu_ss.add(files('monitor.c'))
+nios2_softmmu_ss.add(files('monitor.c', 'mmu.c'))
target_arch += {'nios2': nios2_ss}
target_softmmu_arch += {'nios2': nios2_softmmu_ss}
--
2.25.1
- [PULL 0/7] target/nios2: Rewrite interrupt handling, Richard Henderson, 2022/03/03
- [PULL 1/7] target/nios2: Remove mmu_read_debug, Richard Henderson, 2022/03/03
- [PULL 4/7] target/nios2: Hoist R_ZERO check in rdctl, Richard Henderson, 2022/03/03
- [PULL 6/7] target/nios2: Special case ipending in rdctl and wrctl, Richard Henderson, 2022/03/03
- [PULL 5/7] target/nios2: Split mmu_write, Richard Henderson, 2022/03/03
- [PULL 2/7] target/nios2: Replace MMU_LOG with tracepoints, Richard Henderson, 2022/03/03
- [PULL 7/7] target/nios2: Rewrite interrupt handling, Richard Henderson, 2022/03/03
- [PULL 3/7] target/nios2: Only build mmu.c for system mode,
Richard Henderson <=
- Re: [PULL 0/7] target/nios2: Rewrite interrupt handling, Peter Maydell, 2022/03/04