In order do build translate.c as a common unit we need to
replace:
"accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h"
and:
#include "tcg/tcg-op.h" -> #include "tcg/tcg-op-common.h"
-> #include "tcg/tcg-op-mem.h"
taking care to define TCG_ADDRESS_BITS, which is fixed
for these 32-bit targets.
Remove the now empty microblaze_ss[] source set.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Reviewed-by: Pierrick Bouvier <[email protected]>
Message-Id: <[email protected]>
---
target/microblaze/translate.c | 6 ++++--
target/microblaze/meson.build | 7 +------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index bf8f864c324..74b5420ed24 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -20,9 +20,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/cpu-ldst-common.h"
#include "accel/tcg/cpu-mmu-index.h"
-#include "tcg/tcg-op.h"
+#define TCG_ADDRESS_BITS 32
+#include "tcg/tcg-op-common.h"
+#include "tcg/tcg-op-mem.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#include "exec/translator.h"
diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build
index 2ce50f35397..9c1ecd1cf1c 100644
--- a/target/microblaze/meson.build
+++ b/target/microblaze/meson.build
@@ -1,16 +1,12 @@
gen = decodetree.process('insns.decode')
microblaze_common_ss = ss.source_set()
+microblaze_common_ss.add(gen)
microblaze_common_ss.add(files(
'cpu.c',
'gdbstub.c',
'helper.c',
'op_helper.c',
-))
-
-microblaze_ss = ss.source_set()
-microblaze_ss.add(gen)
-microblaze_ss.add(files(
'translate.c',
))
@@ -26,7 +22,6 @@ microblaze_system_ss.add(files(
'machine.c',
))
-target_arch += {'microblaze': microblaze_ss}
target_user_arch += {'microblaze': microblaze_user_ss}
target_system_arch += {'microblaze': microblaze_system_ss}
target_common_system_arch += {'microblaze': microblaze_common_system_ss}
--
2.53.0
