From nobody Mon Feb 05 20:38:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TTJBJ5fSCz58y7Z; Mon, 5 Feb 2024 20:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TTJBH6y6vz4qLY; Mon, 5 Feb 2024 20:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2Bz+s2Xx6T+mqmfaXCIGGdPlnryJ83z3waVxtaOcLM=; b=VjhiQ3luEUHsK+MvuCiia82hIlSEBPm9L970x4T760WOR2f6XzxSb42DEHNUGhtuxqaOGY XD8SuVcSo8xjINM7nPnBQuOixQKuFp7En7l2q4/vRJVM0vdATADzUfxFXaFDBII1FhN3vU boJ43iUCIUacsuIkIbZIwwvDfeQbVXGA9jZpX9L2dOvtx5JqEewlNFdhnvB4EYzuGRluFG ZWZmB7mT8wOMrV/9eJYxLHUF/KDgCKaDd6jX7816cr6rChgY6cnd1b5YmHbLtfWu32649K pY5h0cmc/aTi1obnDmbbenFu5mzOmIT5bVXx8tKCNz3F226Ar0llmVTihCmV/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2Bz+s2Xx6T+mqmfaXCIGGdPlnryJ83z3waVxtaOcLM=; b=mjoO8P8sDXuwHOZtF8pAwB28qMJEVTEjnMldENpzCyGbjuF8f6TYBx7hqqvaKu94LJZO9P f9FP9lE7ynCQRG6nAokRD5t2OD2Ro5EK2WNSI3tPJkRYO8hur5TcfRVvUAOeQb+Q/PULTJ Za+dxOGDgZlXc5TszBOr0/PkSgrwqtt84nr/HTDuJF8+J8598cM3BukOxuJsOz9iDPItIZ teD0QOvdPW835CTvar+yCofjfmGc3MrepAU7rm0y/D6S6hpaYm9TDfe682EbTmm6ZuYbXY oB38MjZn8F8a4M1SZoV2WaquSpm+lrFryJDlJuPVzOsCzsbngLWvTFpRVysX3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707165528; a=rsa-sha256; cv=none; b=SCN/Dd37tx/gnw/+qOIhFgizEpk4dioI86CSJvK6t3UlHNar3tVTRSmZkfw4IRkjfBFrSh rAJtuyrSn9q7MKqkVC+Q9NcRvWx7NbD1CHk5TZHsnbESMiew59F506YD6J2pEvPKkUv1nQ 1XkzRE/YULe8RFjnkm5iwsMhbAcDjqcEQpAaWDBzAAKg0JmZDxi5vh6kB/v7Vr7SkWvkwZ OZLg9LzNXURWN3Now+np96Y+D4aOW1qeWxKQYZFZDlAw8SuSnpNcZF3eCEjSbi32xoSltP na7B8UPJeDnmtIjK0Nl5ouiJ/lurjOQ/jl7w4YMQW0xSpjb3UWvtoxX3YQ2UWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TTJBH5sq3zvP5; Mon, 5 Feb 2024 20:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 415KclxR069758; Mon, 5 Feb 2024 20:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415Kclfw069755; Mon, 5 Feb 2024 20:38:47 GMT (envelope-from git) Date: Mon, 5 Feb 2024 20:38:47 GMT Message-Id: <202402052038.415Kclfw069755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: f21777224411 - main - SYS.h: make _SYSCALL_BODY overridable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f21777224411fee14b8aea6d8465bd6c2b318429 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f21777224411fee14b8aea6d8465bd6c2b318429 commit f21777224411fee14b8aea6d8465bd6c2b318429 Author: Brooks Davis AuthorDate: 2024-01-05 18:33:37 +0000 Commit: Brooks Davis CommitDate: 2024-02-05 20:34:56 +0000 SYS.h: make _SYSCALL_BODY overridable Reviewed by: kib, emaste, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/908 --- lib/libsys/aarch64/SYS.h | 2 ++ lib/libsys/amd64/SYS.h | 2 ++ lib/libsys/arm/SYS.h | 2 ++ lib/libsys/i386/SYS.h | 2 ++ lib/libsys/powerpc/SYS.h | 2 ++ lib/libsys/powerpc64/SYS.h | 2 ++ lib/libsys/riscv/SYS.h | 2 ++ 7 files changed, 14 insertions(+) diff --git a/lib/libsys/aarch64/SYS.h b/lib/libsys/aarch64/SYS.h index 07d14ab1bb44..a2ff7af18b18 100644 --- a/lib/libsys/aarch64/SYS.h +++ b/lib/libsys/aarch64/SYS.h @@ -34,6 +34,7 @@ mov x8, SYS_ ## name; \ svc 0 +#ifndef _SYSCALL_BODY /* * Conditional jumps can only go up to one megabyte in either * direction, and cerror can be located anywhere, so we have @@ -45,6 +46,7 @@ b.cs 1f; \ ret; \ 1: b cerror +#endif #define PSEUDO(name) \ ENTRY(__sys_##name); \ diff --git a/lib/libsys/amd64/SYS.h b/lib/libsys/amd64/SYS.h index 2dfca1896fcd..e27bb2cf9a93 100644 --- a/lib/libsys/amd64/SYS.h +++ b/lib/libsys/amd64/SYS.h @@ -40,10 +40,12 @@ movq %rcx, %r10; \ syscall +#ifndef _SYSCALL_BODY #define _SYSCALL_BODY(name) \ _SYSCALL(name); \ jb HIDENAME(cerror); \ ret +#endif #define RSYSCALL(name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ diff --git a/lib/libsys/arm/SYS.h b/lib/libsys/arm/SYS.h index c3bc78704a16..187851c67543 100644 --- a/lib/libsys/arm/SYS.h +++ b/lib/libsys/arm/SYS.h @@ -45,11 +45,13 @@ #define CERROR _C_LABEL(cerror) +#ifndef _SYSCALL_BODY #define _SYSCALL_BODY(x) \ _SYSCALL(x); \ it cs; \ bcs PIC_SYM(CERROR, PLT); \ RET +#endif #define PSEUDO(x) \ ENTRY(__CONCAT(__sys_, x)); \ diff --git a/lib/libsys/i386/SYS.h b/lib/libsys/i386/SYS.h index 292b705f80f2..f5e0565452da 100644 --- a/lib/libsys/i386/SYS.h +++ b/lib/libsys/i386/SYS.h @@ -39,10 +39,12 @@ mov $SYS_##name, %eax; \ int $0x80 +#ifndef _SYSCALL_BODY #define _SYSCALL_BODY(name) \ _SYSCALL(name); \ jb HIDENAME(cerror); \ ret +#endif #define RSYSCALL(name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ diff --git a/lib/libsys/powerpc/SYS.h b/lib/libsys/powerpc/SYS.h index b990793c7e3e..04672ed51528 100644 --- a/lib/libsys/powerpc/SYS.h +++ b/lib/libsys/powerpc/SYS.h @@ -40,10 +40,12 @@ li 0,(SYS_##name); \ sc +#ifndef _SYSCALL_BODY #define _SYSCALL_BODY(name) \ _SYSCALL(name); \ bnslr; \ b CNAME(HIDENAME(cerror)) +#endif #define PSEUDO(name) \ .text; \ diff --git a/lib/libsys/powerpc64/SYS.h b/lib/libsys/powerpc64/SYS.h index bf8bc6cc0e27..ceb85bb4e361 100644 --- a/lib/libsys/powerpc64/SYS.h +++ b/lib/libsys/powerpc64/SYS.h @@ -40,6 +40,7 @@ li 0,(SYS_##name); \ sc +#ifndef _SYSCALL_BODY #define _SYSCALL_BODY(name) \ _SYSCALL(name); \ bnslr; \ @@ -52,6 +53,7 @@ ld %r0,16(%r1); \ mtlr %r0; \ blr +#endif #define PSEUDO(name) \ .text; \ diff --git a/lib/libsys/riscv/SYS.h b/lib/libsys/riscv/SYS.h index 47c79e38f916..c2d93c567e2b 100644 --- a/lib/libsys/riscv/SYS.h +++ b/lib/libsys/riscv/SYS.h @@ -40,12 +40,14 @@ li t0, SYS_ ## name; \ ecall +#ifndef _SYSCALL_BODY #define _SYSCALL_BODY(name) \ _SYSCALL(name); \ bnez t0, 1f; \ ret; \ 1: la t1, cerror; \ jr t1 +#endif #define PSEUDO(name) \ ENTRY(__sys_##name); \