[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/26] target/mips: Move sysemu specific files under sysemu/ subf
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH 12/26] target/mips: Move sysemu specific files under sysemu/ subfolder |
|
Date: |
Sun, 18 Apr 2021 18:31:20 +0200 |
Move sysemu-specific files under the new sysemu/ subfolder
and adapt the Meson machinery.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/{ => sysemu}/addr.c | 0
target/mips/{ => sysemu}/cp0_timer.c | 0
target/mips/{ => sysemu}/machine.c | 0
target/mips/meson.build | 12 ++++++------
target/mips/sysemu/meson.build | 5 +++++
5 files changed, 11 insertions(+), 6 deletions(-)
rename target/mips/{ => sysemu}/addr.c (100%)
rename target/mips/{ => sysemu}/cp0_timer.c (100%)
rename target/mips/{ => sysemu}/machine.c (100%)
create mode 100644 target/mips/sysemu/meson.build
diff --git a/target/mips/addr.c b/target/mips/sysemu/addr.c
similarity index 100%
rename from target/mips/addr.c
rename to target/mips/sysemu/addr.c
diff --git a/target/mips/cp0_timer.c b/target/mips/sysemu/cp0_timer.c
similarity index 100%
rename from target/mips/cp0_timer.c
rename to target/mips/sysemu/cp0_timer.c
diff --git a/target/mips/machine.c b/target/mips/sysemu/machine.c
similarity index 100%
rename from target/mips/machine.c
rename to target/mips/sysemu/machine.c
diff --git a/target/mips/meson.build b/target/mips/meson.build
index ca3cc62cf7a..9a507937ece 100644
--- a/target/mips/meson.build
+++ b/target/mips/meson.build
@@ -7,6 +7,7 @@
]
mips_user_ss = ss.source_set()
+mips_softmmu_ss = ss.source_set()
mips_ss = ss.source_set()
mips_ss.add(files(
'cpu.c',
@@ -14,6 +15,11 @@
'gdbstub.c',
'msa.c',
))
+
+if have_system
+ subdir('sysemu')
+endif
+
mips_tcg_ss = ss.source_set()
mips_tcg_ss.add(gen)
mips_tcg_ss.add(files(
@@ -41,12 +47,6 @@
mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
-mips_softmmu_ss = ss.source_set()
-mips_softmmu_ss.add(files(
- 'addr.c',
- 'cp0_timer.c',
- 'machine.c',
-))
mips_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
'cp0_helper.c',
'mips-semi.c',
diff --git a/target/mips/sysemu/meson.build b/target/mips/sysemu/meson.build
new file mode 100644
index 00000000000..f2a1ff46081
--- /dev/null
+++ b/target/mips/sysemu/meson.build
@@ -0,0 +1,5 @@
+mips_softmmu_ss.add(files(
+ 'addr.c',
+ 'cp0_timer.c',
+ 'machine.c',
+))
--
2.26.3
- [PATCH 07/26] meson: Introduce meson_user_arch source set for arch-specific user-mode, (continued)
- [PATCH 07/26] meson: Introduce meson_user_arch source set for arch-specific user-mode, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 08/26] target/mips: Introduce tcg-internal.h for TCG specific declarations, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 09/26] target/mips: Add simple user-mode mips_cpu_do_interrupt(), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 10/26] target/mips: Add simple user-mode mips_cpu_tlb_fill(), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 11/26] target/mips: Move cpu_signal_handler definition around, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 12/26] target/mips: Move sysemu specific files under sysemu/ subfolder,
Philippe Mathieu-Daudé <=
- [PATCH 13/26] target/mips: Move code related to physical addressing to sysemu/phys.c, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 14/26] target/mips: Move sysemu TCG-specific code to tcg/sysemu/ subfolder, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 15/26] target/mips: Restrict mmu_init() to TCG, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 16/26] target/mips: Move tlb_helper.c to tcg/sysemu/, Philippe Mathieu-Daudé, 2021/04/18