Revisión | a3cb72d65d5d91a387fc934cd6d25ac5b9ef98e2 (tree) |
---|---|
Tiempo | 2019-08-17 01:18:57 |
Autor | Yoshinori Sato <ysato@user...> |
Commiter | 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) |
@@ -7606,6 +7606,11 @@ case "$target_name" in | ||
7606 | 7606 | gdb_xml_files="riscv-64bit-cpu.xml riscv-64bit-fpu.xml riscv-64bit-csr.xml" |
7607 | 7607 | target_compiler=$cross_cc_riscv64 |
7608 | 7608 | ;; |
7609 | + rx) | |
7610 | + TARGET_ARCH=rx | |
7611 | + bflt="yes" | |
7612 | + target_compiler=$cross_cc_rx | |
7613 | + ;; | |
7609 | 7614 | sh4|sh4eb) |
7610 | 7615 | TARGET_ARCH=sh4 |
7611 | 7616 | bflt="yes" |
@@ -7826,6 +7831,9 @@ for i in $ARCH $TARGET_BASE_ARCH ; do | ||
7826 | 7831 | riscv*) |
7827 | 7832 | disas_config "RISCV" |
7828 | 7833 | ;; |
7834 | + rx) | |
7835 | + disas_config "RX" | |
7836 | + ;; | |
7829 | 7837 | s390*) |
7830 | 7838 | disas_config "S390" |
7831 | 7839 | ;; |
@@ -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; |
@@ -159,6 +159,7 @@ | ||
159 | 159 | # is true even for "qemu-system-x86_64". |
160 | 160 | # |
161 | 161 | # ppcemb: dropped in 3.1 |
162 | +# rx: added in 4.1 | |
162 | 163 | # |
163 | 164 | # Since: 3.0 |
164 | 165 | ## |
@@ -166,6 +167,6 @@ | ||
166 | 167 | 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32', |
167 | 168 | 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', |
168 | 169 | 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc', |
169 | - 'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4', | |
170 | + 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', | |
170 | 171 | 'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32', |
171 | 172 | 'x86_64', 'xtensa', 'xtensaeb' ] } |
@@ -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) |