From nobody Fri Dec 19 16:06:47 2025 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92BBD24E4C4; Mon, 9 Jun 2025 09:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749461347; cv=none; b=SP8epi7x4k6/q1DnfUBpCanhuThXkO4Tm0iAgQlAuGSs0siQC6h6vn+mFKfkxvpzbUTzh6wDxMYq4C+AH6Chu5MlbfOTPDuOvIztIDCzgcn+aMwUaKiaugMGVSb16Eft/xb+8e/x9zoSV/b0F+BarDWGdJ7eVB5Mf9tJuix/OlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749461347; c=relaxed/simple; bh=PNvb5YsLR8Rd+gcDaLvgMa7n6sL3VTXL6wP9rmL0n98=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WNLDy1brUiEmCTqVY1O2Rna9niSRCFZf3th2lrbFqOFIBnL0SfEmBXloncz14B/FQMNJkTtlOp21YNFStTCFA+ieJXczrLhMHM4XWEtbwq9UPLS7u+62+b3gT2ns/bFYAFfcMPKElDI+xbe6n0HA7gZyE/E+TGXimhb/AOMAc0E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=OqFidhvl; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="OqFidhvl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1749461342; bh=PNvb5YsLR8Rd+gcDaLvgMa7n6sL3VTXL6wP9rmL0n98=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OqFidhvlycqO5p54pXeXWzSrD+gcc9zdAyK08M5/5vgKqZQhRC+RHib0ZwUYX+BWi c0SuXXa6WTpR3qS/nRpErkFin1wMgVMlNpis/VrWYOgCCwSeIeIFORiM6zKVamgdUb FhEfm9ghle/ZYifVIhXW9K7Gx/XeNGSSOpRtHCz4= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Mon, 09 Jun 2025 11:28:57 +0200 Subject: [PATCH 1/3] selftests/nolibc: fix EXTRACONFIG variables ordering Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250609-nolibc-sh-v1-1-9dcdb1b66bb5@weissschuh.net> References: <20250609-nolibc-sh-v1-0-9dcdb1b66bb5@weissschuh.net> In-Reply-To: <20250609-nolibc-sh-v1-0-9dcdb1b66bb5@weissschuh.net> To: Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Willy Tarreau , Shuah Khan Cc: linux-sh@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1749461342; l=1052; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=PNvb5YsLR8Rd+gcDaLvgMa7n6sL3VTXL6wP9rmL0n98=; b=qkk6hUmLRjl2QkTgfazEkaXnTF/ClyCIZzSHcFw7//ohl5KeNc/WNRA39NroLpXVUOXyKMFnp fr/EQxk24HMDeNeOdJJnK0Nf+NFXDdB3fyqBPrGydY5HKKy/WQVKg9S X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= The variable block got disordered at some point. Use the correct ordering. Signed-off-by: Thomas Wei=C3=9Fschuh Acked-by: D. Jeff Dionne Acked-by: Rob Landley --- tools/testing/selftests/nolibc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selfte= sts/nolibc/Makefile index 853f3a846d4c0fb187922d3063ec3d1a9a30ae46..22da78a4bfea0274f66abec319d= 34b3d2a2824ac 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -107,10 +107,10 @@ DEFCONFIG_sparc64 =3D sparc64_defconfig DEFCONFIG_m68k =3D virt_defconfig DEFCONFIG =3D $(DEFCONFIG_$(XARCH)) =20 -EXTRACONFIG_m68k =3D -e CONFIG_BLK_DEV_INITRD -EXTRACONFIG =3D $(EXTRACONFIG_$(XARCH)) EXTRACONFIG_arm =3D -e CONFIG_NAMESPACES EXTRACONFIG_armthumb =3D -e CONFIG_NAMESPACES +EXTRACONFIG_m68k =3D -e CONFIG_BLK_DEV_INITRD +EXTRACONFIG =3D $(EXTRACONFIG_$(XARCH)) =20 # optional tests to run (default =3D all) TEST =3D --=20 2.49.0 From nobody Fri Dec 19 16:06:47 2025 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D35F1FC7E7; Mon, 9 Jun 2025 09:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749461347; cv=none; b=d4xXIt1R8MNmt3ZGOIRn7Z2C4kZSjVekax3+nub95udfbueIhZXQQGmQ4DwNGolcoXfaMuNyLGWVsyMNpWw25rDptc8SoNx2LWfnYAXOzpZfTmD7Trhk+pVywXutoWZvs0T4WnBSji4G5raweIk/ZNktZK/tA9wgLoE3Q1FWVsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749461347; c=relaxed/simple; bh=qdPGpd0OBf2lCfW2sBZZl1KesI547PXMUYolLF8VpwI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qsmeQ45hOPqKS0OL3JA86KfoCkOnamdfXYd3letOpJAecS3/8EEtrWAspU7/I6Gkm+mETVe95Mzx/VEoNXdl5xeRytwqqjL6uhjcXfK7vzhG4fNBj9b2QKtnB4CsQwP+8PUZMLcEA6N22AO0eKIH3+miX8o8lA5nfdhxoA5+sxY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=NggJ67Vd; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="NggJ67Vd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1749461343; bh=qdPGpd0OBf2lCfW2sBZZl1KesI547PXMUYolLF8VpwI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NggJ67Vd3teVZAIa8Sc4kpyxr27x9qFYYDl4ZQ8FDr6eupskos5w162NgXNbiarwc SWJx/byeLfJTk40x2QfXMAX2d/AJVP3cjY+OaEo38haBAc0LeYODJXJPktkR7P4VTm j76+Qu/WJ2tWIP4M4Oahaf/CdfsZOJZjGAu5AaNY= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Mon, 09 Jun 2025 11:28:58 +0200 Subject: [PATCH 2/3] selftests/nolibc: use file driver for QEMU serial Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250609-nolibc-sh-v1-2-9dcdb1b66bb5@weissschuh.net> References: <20250609-nolibc-sh-v1-0-9dcdb1b66bb5@weissschuh.net> In-Reply-To: <20250609-nolibc-sh-v1-0-9dcdb1b66bb5@weissschuh.net> To: Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Willy Tarreau , Shuah Khan Cc: linux-sh@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1749461342; l=1709; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=qdPGpd0OBf2lCfW2sBZZl1KesI547PXMUYolLF8VpwI=; b=7y+2WNcedXjbu5lqzEjTwB3qLJBOz5oIFvGlL0cOzzXxKdifehE9ZdTc3TT7ODkmX582d46Ke 5GRGvwe4OBLDqalJi1AB+JdCKBrjGHEh6MIRzOI5KlMkwpmQHL3TwpC X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= For the test implementation of the SuperH architecture a second serial serial port needs to be used. Unfortunately the currently used 'stdio' driver does not support multiple serial ports at the same time. Switch to the 'file' driver which does support multiple ports and is sufficient for the nolibc-test usecase. Signed-off-by: Thomas Wei=C3=9Fschuh Acked-by: D. Jeff Dionne Acked-by: Rob Landley --- tools/testing/selftests/nolibc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selfte= sts/nolibc/Makefile index 22da78a4bfea0274f66abec319d34b3d2a2824ac..238acaa7bb06dcdbcadd9d3190c= 2de726e1a40b1 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -315,12 +315,12 @@ kernel-standalone: initramfs | defconfig =20 # run the tests after building the kernel run: kernel initramfs.cpio - $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(IMAGE)" = -initrd initramfs.cpio -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" + $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(IMAGE)" = -initrd initramfs.cpio -serial file:/dev/stdout $(QEMU_ARGS) > "$(CURDIR)/r= un.out" $(Q)$(REPORT) $(CURDIR)/run.out =20 # re-run the tests from an existing kernel rerun: - $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(IMAGE)" = -initrd initramfs.cpio -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" + $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(IMAGE)" = -initrd initramfs.cpio -serial file:/dev/stdout $(QEMU_ARGS) > "$(CURDIR)/r= un.out" $(Q)$(REPORT) $(CURDIR)/run.out =20 # report with existing test log --=20 2.49.0 From nobody Fri Dec 19 16:06:47 2025 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 637DE246769; Mon, 9 Jun 2025 09:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749461347; cv=none; b=G8UM3hSn7KnP0ioutmnQeiHVHb/lsNReD05adSLw3SswfkQMlO5yVuhLKn23Fk6S+B66PEi7wlhZm0D9N50CNlIqxI2o3qJsZ3dw1S/wydI+fA1fGv7Al6MT+8E5I0oQDC4rZJ69Phd77Hjuj0ZGQI+D7Do3wg9nh4vZPkJZyGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749461347; c=relaxed/simple; bh=/4ozyjiwSjUwPvvj4G7Xsi30l2tsmbApZPHZ9CqY7N4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dEeHU8byp92EcUQDnNW1W709RV+STLLWEc0cB6kK+GkvCe5WBk1zBDamok6qdJsMeatmQAb3o2k9rKopBdNxjKntIFK5Mjpaw7cOHESTWbEEgVUY2ODwit9FvF7eFLvE4VUSH5NBsa00tmIE8ggSeeVkTQkk30+5bFbgbk3r4AU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=AuhcV0Kz; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="AuhcV0Kz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1749461342; bh=/4ozyjiwSjUwPvvj4G7Xsi30l2tsmbApZPHZ9CqY7N4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AuhcV0KzWFKY+aTLxUnpUgrdDwJjwsmE698gSUlMZJiCLbkgXdv4lWIDnxi3Ow+Zf ij7d3YxyuO5zbWuzD9s8ysG7vMHWmK1dBCui/Yx2CB7UKoKB6/FEcASb5+87HW3QbC Zp8YKGYbMYbfolcx1z+/ADi0f7C3zI+y6J//r3GA= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Mon, 09 Jun 2025 11:28:59 +0200 Subject: [PATCH 3/3] tools/nolibc: add support for SuperH Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250609-nolibc-sh-v1-3-9dcdb1b66bb5@weissschuh.net> References: <20250609-nolibc-sh-v1-0-9dcdb1b66bb5@weissschuh.net> In-Reply-To: <20250609-nolibc-sh-v1-0-9dcdb1b66bb5@weissschuh.net> To: Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Willy Tarreau , Shuah Khan Cc: linux-sh@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1749461342; l=13857; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=/4ozyjiwSjUwPvvj4G7Xsi30l2tsmbApZPHZ9CqY7N4=; b=35gH7qDVrwRQjY7hHBekO8SyJTLEcYpfE3KPaQt1HXy+BN32aQPJzMXThPoxoHmdqz4k66buj rS1WsRmMGZTCCejXbpiICNsDtth9DdK3Asx5VVfa0qH+uovXgjrW1Vq X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Add support for SuperH/"sh" to nolibc. Only sh4 is tested for now. The startup code is special: __nolibc_entrypoint_epilogue() calls __builtin_unreachable() which emits a call to abort(). To make this work a function prologue is generated to set up a GOT pointer which corrupts "sp". __builtin_unreachable() is necessary for __attribute__((noreturn)). Also depending on compiler flags (for example -fPIC) even more prologue is generated. Work around this by defining a nested function in asm. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D70216 Signed-off-by: Thomas Wei=C3=9Fschuh Acked-by: D. Jeff Dionne Acked-by: Rob Landley --- tools/include/nolibc/arch-sh.h | 162 ++++++++++++++++++++++++= ++++ tools/include/nolibc/arch.h | 2 + tools/testing/selftests/nolibc/Makefile | 7 ++ tools/testing/selftests/nolibc/run-tests.sh | 3 +- 4 files changed, 173 insertions(+), 1 deletion(-) diff --git a/tools/include/nolibc/arch-sh.h b/tools/include/nolibc/arch-sh.h new file mode 100644 index 0000000000000000000000000000000000000000..1ad006cba0f627f663eea36b41b= c7399cca4addb --- /dev/null +++ b/tools/include/nolibc/arch-sh.h @@ -0,0 +1,162 @@ +/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ +/* + * SuperH specific definitions for NOLIBC + * Copyright (C) 2025 Thomas Wei=C3=9Fschuh + */ + +#ifndef _NOLIBC_ARCH_SH_H +#define _NOLIBC_ARCH_SH_H + +#include "compiler.h" +#include "crt.h" + +/* + * Syscalls for SuperH: + * - registers are 32bit wide + * - syscall number is passed in r3 + * - arguments are in r4, r5, r6, r7, r0, r1, r2 + * - the system call is performed by calling trapa #31 + * - syscall return value is in r0 + */ + +#define my_syscall0(num) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "+r"(_ret) \ + : "r"(_num) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +#define my_syscall1(num, arg1) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + register long _arg1 __asm__ ("r4") =3D (long)(arg1); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "=3Dr"(_ret) \ + : "r"(_num), "r"(_arg1) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +#define my_syscall2(num, arg1, arg2) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + register long _arg1 __asm__ ("r4") =3D (long)(arg1); \ + register long _arg2 __asm__ ("r5") =3D (long)(arg2); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "=3Dr"(_ret) \ + : "r"(_num), "r"(_arg1), "r"(_arg2) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +#define my_syscall3(num, arg1, arg2, arg3) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + register long _arg1 __asm__ ("r4") =3D (long)(arg1); \ + register long _arg2 __asm__ ("r5") =3D (long)(arg2); \ + register long _arg3 __asm__ ("r6") =3D (long)(arg3); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "=3Dr"(_ret) \ + : "r"(_num), "r"(_arg1), "r"(_arg2), "r"(_arg3) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +#define my_syscall4(num, arg1, arg2, arg3, arg4) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + register long _arg1 __asm__ ("r4") =3D (long)(arg1); \ + register long _arg2 __asm__ ("r5") =3D (long)(arg2); \ + register long _arg3 __asm__ ("r6") =3D (long)(arg3); \ + register long _arg4 __asm__ ("r7") =3D (long)(arg4); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "=3Dr"(_ret) \ + : "r"(_num), "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + register long _arg1 __asm__ ("r4") =3D (long)(arg1); \ + register long _arg2 __asm__ ("r5") =3D (long)(arg2); \ + register long _arg3 __asm__ ("r6") =3D (long)(arg3); \ + register long _arg4 __asm__ ("r7") =3D (long)(arg4); \ + register long _arg5 __asm__ ("r0") =3D (long)(arg5); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "=3Dr"(_ret) \ + : "r"(_num), "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), \ + "r"(_arg5) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +#define my_syscall6(num, arg1, arg2, arg3, arg4, arg5, arg6) = \ +({ = \ + register long _num __asm__ ("r3") =3D (num); \ + register long _ret __asm__ ("r0"); \ + register long _arg1 __asm__ ("r4") =3D (long)(arg1); \ + register long _arg2 __asm__ ("r5") =3D (long)(arg2); \ + register long _arg3 __asm__ ("r6") =3D (long)(arg3); \ + register long _arg4 __asm__ ("r7") =3D (long)(arg4); \ + register long _arg5 __asm__ ("r0") =3D (long)(arg5); \ + register long _arg6 __asm__ ("r1") =3D (long)(arg6); \ + \ + __asm__ volatile ( \ + "trapa #31" \ + : "=3Dr"(_ret) \ + : "r"(_num), "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), \ + "r"(_arg5), "r"(_arg6) \ + : "memory", "cc" \ + ); \ + _ret; \ +}) + +/* startup code */ +void _start_wrapper(void); +void __attribute__((weak,noreturn)) __nolibc_entrypoint __no_stack_protect= or _start_wrapper(void) +{ + __asm__ volatile ( + ".global _start\n" /* The C function will have a prologue, = */ + ".type _start, @function\n" /* corrupting "sp" = */ + ".weak _start\n" + "_start:\n" + + "mov sp, r4\n" /* save argc pointer to r4, as arg1 of _sta= rt_c */ + "bsr _start_c\n" /* transfer to c runtime = */ + "nop\n" /* delay slot = */ + + ".size _start, .-_start\n" + ); + __nolibc_entrypoint_epilogue(); +} + +#endif /* _NOLIBC_ARCH_SH_H */ diff --git a/tools/include/nolibc/arch.h b/tools/include/nolibc/arch.h index d20b2304aac21bf817f02a085653d5a170546072..4cd10ebf2addca9a2a1f5ab5bb6= 91ac7dfd4aa29 100644 --- a/tools/include/nolibc/arch.h +++ b/tools/include/nolibc/arch.h @@ -37,6 +37,8 @@ #include "arch-sparc.h" #elif defined(__m68k__) #include "arch-m68k.h" +#elif defined(__sh__) +#include "arch-sh.h" #else #error Unsupported Architecture #endif diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selfte= sts/nolibc/Makefile index 238acaa7bb06dcdbcadd9d3190c2de726e1a40b1..65a2442c6709241e410dd08af9a= b6b0b0691e7a7 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -58,6 +58,7 @@ ARCH_riscv64 =3D riscv ARCH_s390x =3D s390 ARCH_sparc32 =3D sparc ARCH_sparc64 =3D sparc +ARCH_sh4 =3D sh ARCH :=3D $(or $(ARCH_$(XARCH)),$(XARCH)) =20 # kernel image names by architecture @@ -81,6 +82,7 @@ IMAGE_loongarch =3D arch/loongarch/boot/vmlinuz.efi IMAGE_sparc32 =3D arch/sparc/boot/image IMAGE_sparc64 =3D arch/sparc/boot/image IMAGE_m68k =3D vmlinux +IMAGE_sh4 =3D arch/sh/boot/zImage IMAGE =3D $(objtree)/$(IMAGE_$(XARCH)) IMAGE_NAME =3D $(notdir $(IMAGE)) =20 @@ -105,11 +107,13 @@ DEFCONFIG_loongarch =3D defconfig DEFCONFIG_sparc32 =3D sparc32_defconfig DEFCONFIG_sparc64 =3D sparc64_defconfig DEFCONFIG_m68k =3D virt_defconfig +DEFCONFIG_sh4 =3D rts7751r2dplus_defconfig DEFCONFIG =3D $(DEFCONFIG_$(XARCH)) =20 EXTRACONFIG_arm =3D -e CONFIG_NAMESPACES EXTRACONFIG_armthumb =3D -e CONFIG_NAMESPACES EXTRACONFIG_m68k =3D -e CONFIG_BLK_DEV_INITRD +EXTRACONFIG_sh4 =3D -e CONFIG_BLK_DEV_INITRD -e CONFIG_CMDLINE_FROM_= BOOTLOADER EXTRACONFIG =3D $(EXTRACONFIG_$(XARCH)) =20 # optional tests to run (default =3D all) @@ -136,6 +140,7 @@ QEMU_ARCH_loongarch =3D loongarch64 QEMU_ARCH_sparc32 =3D sparc QEMU_ARCH_sparc64 =3D sparc64 QEMU_ARCH_m68k =3D m68k +QEMU_ARCH_sh4 =3D sh4 QEMU_ARCH =3D $(QEMU_ARCH_$(XARCH)) =20 QEMU_ARCH_USER_ppc64le =3D ppc64le @@ -169,6 +174,7 @@ QEMU_ARGS_loongarch =3D -M virt -append "console=3Dtty= S0,115200 panic=3D-1 $(TEST:%=3DN QEMU_ARGS_sparc32 =3D -M SS-5 -m 256M -append "console=3DttyS0,115200 p= anic=3D-1 $(TEST:%=3DNOLIBC_TEST=3D%)" QEMU_ARGS_sparc64 =3D -M sun4u -append "console=3DttyS0,115200 panic=3D= -1 $(TEST:%=3DNOLIBC_TEST=3D%)" QEMU_ARGS_m68k =3D -M virt -append "console=3DttyGF0,115200 panic=3D= -1 $(TEST:%=3DNOLIBC_TEST=3D%)" +QEMU_ARGS_sh4 =3D -M r2d -serial file:/dev/stdout -append "console= =3DttySC1,115200 panic=3D-1 $(TEST:%=3DNOLIBC_TEST=3D%)" QEMU_ARGS =3D -m 1G $(QEMU_ARGS_$(XARCH)) $(QEMU_ARGS_BIOS) $(Q= EMU_ARGS_EXTRA) =20 # OUTPUT is only set when run from the main makefile, otherwise @@ -192,6 +198,7 @@ CFLAGS_s390 =3D -m31 CFLAGS_mips32le =3D -EL -mabi=3D32 -fPIC CFLAGS_mips32be =3D -EB -mabi=3D32 CFLAGS_sparc32 =3D $(call cc-option,-m32) +CFLAGS_sh4 =3D -ml -m4 ifeq ($(origin XARCH),command line) CFLAGS_XARCH =3D $(CFLAGS_$(XARCH)) endif diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/se= lftests/nolibc/run-tests.sh index 8277599e6441a933d9c1ec5003acf49b06df226f..8f6addb01d22d9532e2ef367692= 168787c23dc1f 100755 --- a/tools/testing/selftests/nolibc/run-tests.sh +++ b/tools/testing/selftests/nolibc/run-tests.sh @@ -27,6 +27,7 @@ all_archs=3D( loongarch sparc32 sparc64 m68k + sh4 ) archs=3D"${all_archs[@]}" =20 @@ -187,7 +188,7 @@ test_arch() { echo "Unsupported configuration" return fi - if [ "$arch" =3D "m68k" ] && [ "$llvm" =3D "1" ]; then + if [ "$arch" =3D "m68k" -o "$arch" =3D "sh4" ] && [ "$llvm" =3D "1" ]; th= en echo "Unsupported configuration" return fi --=20 2.49.0