From nobody Mon Jun 13 17:35:58 2022 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 6681B8349ED; Mon, 13 Jun 2022 17:35:59 +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 4LMJdC0dFkz4tXy; Mon, 13 Jun 2022 17:35:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141759; 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=8Bb2NDoyRhCTcr7ZPQ8StSwvQH0/DRoTCIhxVpyODrw=; b=hLxIAFbmYVd55fELhzv6PTzY99oDD5a3KiOlbKVPUXBWJH0Ylnxt46HdrzapuPjATdtJ5Z ntr+kF1zDzCV6B6rEAQ0C/bTyeGygNf25Bauo186B1ezryHA9QsN7ohQn08UnJov/vw99x VCFuhZgyMnGUW7zsdyfMS0GMQvtvPoqzAm+8awX6gSIpqRgImTllIkdF90/HTVZEoKdRJ5 fnXQNec0yBpT/0mJGxLE6gnKooKq+qik8obI8YAhneuMuhEKkfq1v0kWBRwNu6RFKZ1lII 3fIbeSEdEp8IY8zMmoG5PIr80gXi/HXFWxHH4lc6bzFMnYk+JjrVdto5AQ6k5g== 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 C7EFE1A38F; Mon, 13 Jun 2022 17:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25DHZwqF061195; Mon, 13 Jun 2022 17:35:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHZwa8061194; Mon, 13 Jun 2022 17:35:58 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:35:58 GMT Message-Id: <202206131735.25DHZwa8061194@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: 24983043bf79 - main - x86: cleanup in machine/cpufunc.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 24983043bf7948e274b2b00d634ae509a292b976 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141759; 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=8Bb2NDoyRhCTcr7ZPQ8StSwvQH0/DRoTCIhxVpyODrw=; b=hukU1QSkScaH+PAtR8QjD3O5rDZRpB3Eb4mBdOVV7Dle45RO+oj+Ky/kMzOw6Am+kXemXq 9TRRtR4Wzkwx9N+sRZ3Fmvos26O6Kw3C7wBcPQFB1JU+6h1ov8F9VX++GOY1gXY1lWxJel SSaYzVbN7gIxziPUdvWfZ3VqL7RdFzEgjKiaJqqXsbOQfNr6FCBIcbGrysRWS/DHhHObQ3 6fZ7Dy658WAedTvBRcD7grnMRl1g3pqtGL/njJ7u/eM3+CDRs571dJeqv+nF/wx1JdJryi NPb/+ei0LF/QPSWb919Qgzn0K6uDUd2T8WydAZdLoSefkOpfudEYZ7KBPp4C7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141759; a=rsa-sha256; cv=none; b=JhSf8ClC8pyTrscMv5a87ogbd4cPP6OhLdBVkR+kWY9VvZp/hmxv/os5h0oT5q6FFMm/Jy Q3Q+8UPluav//stxzohvlM3ul0c1kPMoi/pg9X9Ncd+INizNQx8P05WewPhhvfZ/TpfMSg Vz89aRAR2ZU1s9R9lfkc+vKRB9k7s+FUvvDRifNIpqqoKNtiurah9WoMXm6RVMY1VEL0ZJ jeft/HtDx2hQmBPvwil7/neWPhNkUgzhwhEwqQ1Pg+spxzR/bUHV9I53Z956xsv757oDJ5 R3R11f9PILOrFM8PHHzmkMuRVZ8nE2vZ4tb4YfMrl2f3e0vmEQXaa8icBqLAdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=24983043bf7948e274b2b00d634ae509a292b976 commit 24983043bf7948e274b2b00d634ae509a292b976 Author: Brooks Davis AuthorDate: 2022-06-13 17:35:38 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:38 +0000 x86: cleanup in machine/cpufunc.h Reduce diffs between amd64 and i386 and improve whitespace Reviewed by: jhb, imp --- sys/amd64/include/cpufunc.h | 8 ++++---- sys/i386/include/cpufunc.h | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 99d8c82aa111..941c951a941a 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -105,16 +105,16 @@ static __inline void do_cpuid(u_int ax, u_int *p) { __asm __volatile("cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); + : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax)); } static __inline void cpuid_count(u_int ax, u_int cx, u_int *p) { __asm __volatile("cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax), "c" (cx)); + : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax), "c" (cx)); } static __inline void diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index cd7ba31bdb22..2b517b12fba0 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -98,7 +98,6 @@ clts(void) static __inline void disable_intr(void) { - __asm __volatile("cli" : : : "memory"); } @@ -147,14 +146,12 @@ cpuid_count(u_int ax, u_int cx, u_int *p) static __inline void enable_intr(void) { - __asm __volatile("sti"); } static __inline void cpu_monitor(const void *addr, u_long extensions, u_int hints) { - __asm __volatile("monitor" : : "a" (addr), "c" (extensions), "d" (hints)); } @@ -162,28 +159,24 @@ cpu_monitor(const void *addr, u_long extensions, u_int hints) static __inline void cpu_mwait(u_long extensions, u_int hints) { - __asm __volatile("mwait" : : "a" (hints), "c" (extensions)); } static __inline void lfence(void) { - __asm __volatile("lfence" : : : "memory"); } static __inline void mfence(void) { - __asm __volatile("mfence" : : : "memory"); } static __inline void sfence(void) { - __asm __volatile("sfence" : : : "memory"); }