SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Remove the unused sh4eb target"

Browse Source 
This reverts commit 73ceb12960e686b763415f0880cc5171ccce01cf.

The "r2d" machine can work in big endian mode, see:

 https://lore.kernel.org/qemu-devel/d6755445-1060-48a8-82b6-2f392c21f9b9@landley.net/

So the reasoning for removing sh4eb was wrong.

Message-ID: <20241024082735.42324-2-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Rob Landley <rob@landley.net>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-10-24 10:27:34 +02:00
parent 786bc22552
commit 51cdb6806f
11 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.d/buildtest.yml
View File

@ -72,7 +72,7 @@ build-system-debian:
variables: variables:
IMAGE: debian IMAGE: debian
CONFIGURE_ARGS: --with-coroutine=sigaltstack CONFIGURE_ARGS: --with-coroutine=sigaltstack
TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4-softmmu TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4eb-softmmu
sparc-softmmu xtensa-softmmu sparc-softmmu xtensa-softmmu
MAKE_CHECK_ARGS: check-build MAKE_CHECK_ARGS: check-build

2
.gitlab-ci.d/cirrus.yml
View File

@ -57,7 +57,7 @@ x64-freebsd-14-build:
CIRRUS_VM_RAM: 8G CIRRUS_VM_RAM: 8G
UPDATE_COMMAND: pkg update; pkg upgrade -y UPDATE_COMMAND: pkg update; pkg upgrade -y
INSTALL_COMMAND: pkg install -y INSTALL_COMMAND: pkg install -y
CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,xtensa-softmmu CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu
TEST_TARGETS: check TEST_TARGETS: check
aarch64-macos-build: aarch64-macos-build:

2
.gitlab-ci.d/crossbuilds.yml
View File

@ -176,7 +176,7 @@ cross-win64-system:
EXTRA_CONFIGURE_OPTS: --enable-fdt=internal --disable-plugins EXTRA_CONFIGURE_OPTS: --enable-fdt=internal --disable-plugins
CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu
m68k-softmmu microblazeel-softmmu m68k-softmmu microblazeel-softmmu
or1k-softmmu rx-softmmu sh4-softmmu sparc64-softmmu or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu
tricore-softmmu xtensaeb-softmmu tricore-softmmu xtensaeb-softmmu
artifacts: artifacts:
when: on_success when: on_success

2
.travis.yml
View File

@ -223,7 +223,7 @@ jobs:
- genisoimage - genisoimage
env: env:
- CONFIG="--disable-containers --audio-drv-list=sdl --disable-user - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
--target-list=arm-softmmu,avr-softmmu,microblaze-softmmu,sh4-softmmu,sparc64-softmmu,xtensaeb-softmmu" --target-list=arm-softmmu,avr-softmmu,microblaze-softmmu,sh4eb-softmmu,sparc64-softmmu,xtensaeb-softmmu"
- name: "[s390x] GCC (user)" - name: "[s390x] GCC (user)"
arch: s390x arch: s390x

3
configs/devices/sh4eb-softmmu/default.mak Normal file
View File

@ -0,0 +1,3 @@
# Default configuration for sh4eb-softmmu
include ../sh4-softmmu/default.mak

2
configs/targets/sh4eb-softmmu.mak Normal file
View File

@ -0,0 +1,2 @@
TARGET_ARCH=sh4
TARGET_BIG_ENDIAN=y

2
qapi/machine.json
View File

@ -37,7 +37,7 @@
'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', 'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
'mips64el', 'mipsel', 'or1k', 'ppc', 'mips64el', 'mipsel', 'or1k', 'ppc',
'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4',
'sparc', 'sparc64', 'tricore', 'sh4eb', 'sparc', 'sparc64', 'tricore',
'x86_64', 'xtensa', 'xtensaeb' ] } 'x86_64', 'xtensa', 'xtensaeb' ] }
## ##

1
tests/qemu-iotests/testenv.py
View File

@ -245,6 +245,7 @@ class TestEnv(ContextManager['TestEnv']):
('riscv64', 'virt'), ('riscv64', 'virt'),
('rx', 'gdbsim-r5f562n8'), ('rx', 'gdbsim-r5f562n8'),
('sh4', 'r2d'), ('sh4', 'r2d'),
('sh4eb', 'r2d'),
('tricore', 'tricore_testboard') ('tricore', 'tricore_testboard')
) )
for suffix, machine in machine_map: for suffix, machine in machine_map:

1
tests/qtest/endianness-test.c
View File

@ -41,6 +41,7 @@ static const TestCase test_cases[] = {
{ "ppc64", "pseries-2.7", 0x10080000000ULL, { "ppc64", "pseries-2.7", 0x10080000000ULL,
.bswap = true, .superio = "i82378" }, .bswap = true, .superio = "i82378" },
{ "sh4", "r2d", 0xfe240000, .superio = "i82378" }, { "sh4", "r2d", 0xfe240000, .superio = "i82378" },
{ "sh4eb", "r2d", 0xfe240000, .bswap = true, .superio = "i82378" },
{ "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true }, { "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true },
{ "x86_64", "pc", -1 }, { "x86_64", "pc", -1 },
{} {}

1
tests/qtest/machine-none-test.c
View File

@ -42,6 +42,7 @@ static struct arch2cpu cpus_map[] = {
{ "ppc64", "power8e_v2.1" }, { "ppc64", "power8e_v2.1" },
{ "s390x", "qemu" }, { "s390x", "qemu" },
{ "sh4", "sh7750r" }, { "sh4", "sh7750r" },
{ "sh4eb", "sh7751r" },
{ "sparc", "LEON2" }, { "sparc", "LEON2" },
{ "sparc64", "Fujitsu Sparc64" }, { "sparc64", "Fujitsu Sparc64" },
{ "tricore", "tc1796" }, { "tricore", "tc1796" },

1
tests/qtest/meson.build
View File

@ -186,6 +186,7 @@ qtests_ppc64 = \
qtests_pci + ['migration-test', 'cpu-plug-test', 'drive_del-test'] qtests_pci + ['migration-test', 'cpu-plug-test', 'drive_del-test']
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + \ qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + \
qtests_filter qtests_filter