リビジョン | e95af7cced496810278d5b51ba75533e919804d4 (tree) |
---|---|
日時 | 2019-10-14 20:30:11 |
作者 | Yoshinori Sato <ysato@user...> |
コミッター | Yoshinori Sato |
Add rx-softmmu
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-Id: <20190607091116.49044-17-ysato@users.sourceforge.jp>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
pick ed65c02993 target/rx: Add RX to SysEmuTarget
pick 01372568ae tests: Add rx to machine-none-test.c
[PMD: Squashed patches from Richard Henderson modifying
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
@@ -73,6 +73,8 @@ int graphic_depth = 32; | ||
73 | 73 | #define QEMU_ARCH QEMU_ARCH_PPC |
74 | 74 | #elif defined(TARGET_RISCV) |
75 | 75 | #define QEMU_ARCH QEMU_ARCH_RISCV |
76 | +#elif defined(TARGET_RX) | |
77 | +#define QEMU_ARCH QEMU_ARCH_RX | |
76 | 78 | #elif defined(TARGET_S390X) |
77 | 79 | #define QEMU_ARCH QEMU_ARCH_S390X |
78 | 80 | #elif defined(TARGET_SH4) |
@@ -7521,6 +7521,11 @@ case "$target_name" in | ||
7521 | 7521 | mttcg=yes |
7522 | 7522 | gdb_xml_files="riscv-64bit-cpu.xml riscv-64bit-fpu.xml riscv-64bit-csr.xml" |
7523 | 7523 | ;; |
7524 | + rx) | |
7525 | + TARGET_ARCH=rx | |
7526 | + bflt="yes" | |
7527 | + target_compiler=$cross_cc_rx | |
7528 | + ;; | |
7524 | 7529 | sh4|sh4eb) |
7525 | 7530 | TARGET_ARCH=sh4 |
7526 | 7531 | bflt="yes" |
@@ -7702,6 +7707,9 @@ for i in $ARCH $TARGET_BASE_ARCH ; do | ||
7702 | 7707 | riscv*) |
7703 | 7708 | disas_config "RISCV" |
7704 | 7709 | ;; |
7710 | + rx) | |
7711 | + disas_config "RX" | |
7712 | + ;; | |
7705 | 7713 | s390*) |
7706 | 7714 | disas_config "S390" |
7707 | 7715 | ;; |
@@ -0,0 +1,3 @@ | ||
1 | +# Default configuration for rx-softmmu | |
2 | + | |
3 | +CONFIG_RX_VIRT=y |
@@ -54,6 +54,7 @@ source nios2/Kconfig | ||
54 | 54 | source openrisc/Kconfig |
55 | 55 | source ppc/Kconfig |
56 | 56 | source riscv/Kconfig |
57 | +source rx/Kconfig | |
57 | 58 | source s390x/Kconfig |
58 | 59 | source sh4/Kconfig |
59 | 60 | source sparc/Kconfig |
@@ -26,6 +26,7 @@ | ||
26 | 26 | #pragma GCC poison TARGET_PPC |
27 | 27 | #pragma GCC poison TARGET_PPC64 |
28 | 28 | #pragma GCC poison TARGET_ABI32 |
29 | +#pragma GCC poison TARGET_RX | |
29 | 30 | #pragma GCC poison TARGET_S390X |
30 | 31 | #pragma GCC poison TARGET_SH4 |
31 | 32 | #pragma GCC poison TARGET_SPARC |
@@ -24,6 +24,7 @@ enum { | ||
24 | 24 | QEMU_ARCH_NIOS2 = (1 << 17), |
25 | 25 | QEMU_ARCH_HPPA = (1 << 18), |
26 | 26 | QEMU_ARCH_RISCV = (1 << 19), |
27 | + QEMU_ARCH_RX = (1 << 20), | |
27 | 28 | }; |
28 | 29 | |
29 | 30 | extern const uint32_t arch_type; |
@@ -21,6 +21,7 @@ | ||
21 | 21 | # is true even for "qemu-system-x86_64". |
22 | 22 | # |
23 | 23 | # ppcemb: dropped in 3.1 |
24 | +# rx: added in 4.2 | |
24 | 25 | # |
25 | 26 | # Since: 3.0 |
26 | 27 | ## |
@@ -28,7 +29,7 @@ | ||
28 | 29 | 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32', |
29 | 30 | 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', |
30 | 31 | 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc', |
31 | - 'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4', | |
32 | + 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', | |
32 | 33 | 'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32', |
33 | 34 | 'x86_64', 'xtensa', 'xtensaeb' ] } |
34 | 35 |
@@ -56,6 +56,7 @@ static struct arch2cpu cpus_map[] = { | ||
56 | 56 | { "hppa", "hppa" }, |
57 | 57 | { "riscv64", "rv64gcsu-v1.10.0" }, |
58 | 58 | { "riscv32", "rv32gcsu-v1.9.1" }, |
59 | + { "rx", "rx62n" }, | |
59 | 60 | }; |
60 | 61 | |
61 | 62 | static const char *get_cpu_model_by_arch(const char *arch) |