mirror of https://github.com/xemu-project/xemu.git
pull-loongarch-20240106
Fixs patch conflict -----BEGIN PGP SIGNATURE----- iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZZi5pAAKCRBAov/yOSY+ 35iIA/4uXw92i0HJ3KK9NxzZlP9gwld6dATvincKNUpUgplK3NtBpRlVKm9NzLH8 Jdg84k7D5pNXfWAfomT+R3UMnL8R/zZZqeCCd60JE0Kbn4gCyCou2QuLKuWxPvNM Jklf4mifq+gplg7lDF0GTLo8MUzhAmV8AuG7lUZb6IQJ68ui8A== =NnLa -----END PGP SIGNATURE----- Merge tag 'pull-loongarch-20240106' of https://gitlab.com/gaosong/qemu into staging pull-loongarch-20240106 Fixs patch conflict # -----BEGIN PGP SIGNATURE----- # # iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZZi5pAAKCRBAov/yOSY+ # 35iIA/4uXw92i0HJ3KK9NxzZlP9gwld6dATvincKNUpUgplK3NtBpRlVKm9NzLH8 # Jdg84k7D5pNXfWAfomT+R3UMnL8R/zZZqeCCd60JE0Kbn4gCyCou2QuLKuWxPvNM # Jklf4mifq+gplg7lDF0GTLo8MUzhAmV8AuG7lUZb6IQJ68ui8A== # =NnLa # -----END PGP SIGNATURE----- # gpg: Signature made Sat 06 Jan 2024 02:23:32 GMT # gpg: using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF # gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B8FF 1DA0 D2FD CB2D A09C 6C2C 40A2 FFF2 3926 3EDF * tag 'pull-loongarch-20240106' of https://gitlab.com/gaosong/qemu: target/loongarch: move translate modules to tcg/ target/loongarch/meson: move gdbstub.c to loongarch.ss Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
8188c3cda5
|
@ -3,31 +3,18 @@ gen = decodetree.process('insns.decode')
|
|||
loongarch_ss = ss.source_set()
|
||||
loongarch_ss.add(files(
|
||||
'cpu.c',
|
||||
))
|
||||
loongarch_tcg_ss = ss.source_set()
|
||||
loongarch_tcg_ss.add(gen)
|
||||
loongarch_tcg_ss.add(files(
|
||||
'fpu_helper.c',
|
||||
'op_helper.c',
|
||||
'translate.c',
|
||||
'gdbstub.c',
|
||||
'vec_helper.c',
|
||||
))
|
||||
loongarch_tcg_ss.add(zlib)
|
||||
|
||||
loongarch_system_ss = ss.source_set()
|
||||
loongarch_system_ss.add(files(
|
||||
'loongarch-qmp-cmds.c',
|
||||
'machine.c',
|
||||
'tlb_helper.c',
|
||||
'constant_timer.c',
|
||||
'csr_helper.c',
|
||||
'iocsr_helper.c',
|
||||
))
|
||||
|
||||
common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen])
|
||||
|
||||
loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss])
|
||||
subdir('tcg')
|
||||
|
||||
target_arch += {'loongarch': loongarch_ss}
|
||||
target_system_arch += {'loongarch': loongarch_system_ss}
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
if 'CONFIG_TCG' not in config_all_accel
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
loongarch_ss.add([zlib, gen])
|
||||
|
||||
loongarch_ss.add(files(
|
||||
'fpu_helper.c',
|
||||
'op_helper.c',
|
||||
'translate.c',
|
||||
'vec_helper.c',
|
||||
))
|
||||
|
||||
loongarch_system_ss.add(files(
|
||||
'constant_timer.c',
|
||||
'csr_helper.c',
|
||||
'iocsr_helper.c',
|
||||
'tlb_helper.c',
|
||||
))
|
Loading…
Reference in New Issue