From nobody Tue Oct 15 17:25:18 2024 X-Original-To: dev-commits-src-all@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 4XSgwH2Kkcz5YkJf; Tue, 15 Oct 2024 17:25:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSgwG6Q1zz4TxF; Tue, 15 Oct 2024 17:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729013118; 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=3WKWDYHviyGDldkxABpDeISFoZMeKCe0CJhfzWvRd0E=; b=hpiPAt35Nkvzrb/nZS9DG39DncgY5Q77SO3y/KMR/tsNJJRN01dL+wRcaTAhiMKO1T5nwc BBCYVJJp0jaJvzsallcmHEr57BPwfGCdAGJ80aJpQYvTy9WDvSkjnOWbb3JeNmTGLYl8Wb M2/h/EXsuRV9GKBkVmieZ0DTTFfGSDAi2eNKUiKHDfCJwU9eEPdHkE88xQshI5oLpqH8zp UxKUmHPd0UD1hO9Q6uo6lIi5c+X11upOFvdMF2Hj5nrDkIAHB0HHoSUWSroGWSxvJF8EqZ 2E5+zq9iOLhii/l8LhTwg1hE0a2UajXo068HtlaXomRAafUqtnwEKOHYAuFDRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729013118; 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=3WKWDYHviyGDldkxABpDeISFoZMeKCe0CJhfzWvRd0E=; b=UgAjQUYH/bCjkB3id0+Hn4S4zsIuVDu0kik73L6kEQtA/pKmbzCN73w7igkjTUGoBxWY/n t7NCWCUorYecI63rGa/zugDVZkZIup4A98SxXoLJIF4pU75pEr2KNASVORhlxGJWYyTlrO SSAjwIuIMK2rbHhV0QYF4tqfHuVNBDqk1b33bhK1XnRSFtbZ7IHnx2cqBg2QjY0sNPyZTU VdDPWBNpexj7DNAFzSRExzYYxx1xeCLDM+q52n6D1UJbe9DYxdernV1v7VXuBPEtfYyV53 wxZrVO3DRigqfx+HelG1+4A+4y/kK9TnjlYHdfy1WfAPmmdakndiONQDsecQxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729013118; a=rsa-sha256; cv=none; b=Tkj5Ih5sManKQ5LgfUxfELzSqG8yV2hS3jllRumSejiiNFNhRny47+0xfF9B4oZSlaAel7 F2Ep/Pr5P/J4fwbVydqbqYhwpy4oovfj03V0WBByVuG6i+rOc3g+BH4xJnOzxi8KlTiHxl Fzud8cm7J3msadIqWNFUN0Z1Sw+gZS/InJq8+Mg3px7ND3Ar67PEaF6pAfrXKXi/7pEzl0 FuHXtGKBbE4WE17Vd+13c0UnUrOIuosM8KH0MCrswt+HR5SWBW7ME87TZ3GS/wxwDZox/o /0QKb2bLdWYyA0+mvCR9Lm5ceBiQtBac+lenLas8V4w2oa/Jr+3NNQYIb+G2pg== 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 4XSgwG5zryzWLQ; Tue, 15 Oct 2024 17:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49FHPInL028199; Tue, 15 Oct 2024 17:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FHPIZh028196; Tue, 15 Oct 2024 17:25:18 GMT (envelope-from git) Date: Tue, 15 Oct 2024 17:25:18 GMT Message-Id: <202410151725.49FHPIZh028196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a7c5c88cb29f - main - arm64: Stop trashing x28 in savectx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7c5c88cb29ff512467a6599f1b4d8e2b8817480 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a7c5c88cb29ff512467a6599f1b4d8e2b8817480 commit a7c5c88cb29ff512467a6599f1b4d8e2b8817480 Author: Andrew Turner AuthorDate: 2024-10-15 08:30:17 +0000 Commit: Andrew Turner CommitDate: 2024-10-15 17:24:42 +0000 arm64: Stop trashing x28 in savectx While here make it return void, we don't set any useful return value and nothing checks for it. Sponsored by: Arm Ltd --- sys/arm64/arm64/swtch.S | 10 ++++------ sys/arm64/include/pcb.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 6af70ca839a0..c683a7e25314 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -267,14 +267,12 @@ ENTRY(savectx) mrs x6, tpidr_el0 stp x5, x6, [x0, #PCB_SP] - /* Store the VFP registers */ #ifdef VFP - mov x28, lr - bl vfp_save_state_savectx - mov lr, x28 -#endif - + /* Store the VFP registers */ + b vfp_save_state_savectx +#else ret +#endif END(savectx) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index 273b53cdc6cf..c0feb1149cf5 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -85,7 +85,7 @@ struct pcb { #ifdef _KERNEL void makectx(struct trapframe *tf, struct pcb *pcb); -int savectx(struct pcb *pcb) __returns_twice; +void savectx(struct pcb *pcb) __returns_twice; #endif #endif /* !LOCORE */