From nobody Mon May 22 20:22:15 2023 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 4QQ84l3lP9z4CQ67; Mon, 22 May 2023 20:22:15 +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 4QQ84l3KPbz49Sn; Mon, 22 May 2023 20:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684786935; 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=3KN5HPJu3lCXHJ3BLHMWmnZ5MOjS0mY3pVPA+z+Ppjw=; b=rlVQhSmPXdWZR4Mt/+ELCWni/K7ilou3sJ/gwh9Gn2QOPVFO1KY8mrIEhUdsE5xrAwXsAr Jautw3VuoU2Ox9wveejA6s9W5ucIaSl9W6/057B0ERrP3yLAes4VzJiLeAUBVjnfINJZYo 0HBauJXlzmoIw4VSd8w7mW1pyZMVrCi+5Ruph8NkK1eVX9dP1gLOy7ilMlkWaUQpFA0OAp c2/3OVu/uwwFaInOuAMyDcFKb+RFe1C4tehocn7fdpnZc3xokM4xnzK9X58zMwDvD3JG6k KQEfWxdmrQRc7wLWrLKEL65BiYjgL5QZUogD9zKUYEIaKgLRs9gRmQ07nsyS0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684786935; 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=3KN5HPJu3lCXHJ3BLHMWmnZ5MOjS0mY3pVPA+z+Ppjw=; b=b4jZBiuJeUWsaJqdy3eSoHtXETjAxnfwDYC3idSVG1AF9U0oxpaBmLWXLWZUr6OcsWt4h1 o5jeSXBOWp2u2jNm2iY7y0SVN9DwpW/wBrw5IhI7F/Wq0VQO68n1/8HoO9ukb339xJxky/ r/ZZNluUthJKzIWFlOg4lSn9gffwyPgUNCbZ75XBUQFEuIeK0Fj02G0gKRfyqnKeqFHY6Y 6DjTb6pPTP8miBWEkSB0yvQM5n/ZZEBUIsME4/PuBG0FCPtTgRgLKNZZipAs7/GasPeNjs oOzv03u/DnvpkPCLVoPOxBWcbbjvYoU7avbZffbALSUd6+6oaJRi/zjI37efCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684786935; a=rsa-sha256; cv=none; b=mOhaUEY8nJ37Ff/Q+Okc9wqaRQXVxQ0GvjvvdRLbBRLpjryqejFfQ5V+qO4K6OE6XXncfj SYvwo5mR0wd6wQZmAPBY5hOR/RpRIGxryI0rSKv1YWlzJPqwrZ3FR0mMgcw4VodRrLP5jh 88TpS+AIx3TAWGooSHauUvT27pS8h05+8mnlDoZltjS1daEbouF4mE4WQg0niE7r55zWwJ pAIpFOaUvMgBNgsxEoDOm5awcjOgftWVOffOCHRYDGi18QjI4FLs9BW6ckkb66PcgKO9Df AlYZSvTwsNacpCJIje57P+hSzalyHYOgda+Ukv/RepyMb2R6dFEToqHSzUsYbg== 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 4QQ84l2GbczX8K; Mon, 22 May 2023 20:22:15 +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 34MKMFSd036418; Mon, 22 May 2023 20:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MKMFPO036417; Mon, 22 May 2023 20:22:15 GMT (envelope-from git) Date: Mon, 22 May 2023 20:22:15 GMT Message-Id: <202305222022.34MKMFPO036417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: cef256558752 - main - dtrace: export dtrace_dis_get_byte() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cef256558752afa1f25afd7823bb01fde8bd63bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cef256558752afa1f25afd7823bb01fde8bd63bd commit cef256558752afa1f25afd7823bb01fde8bd63bd Author: Christos Margiolis AuthorDate: 2023-05-22 20:21:25 +0000 Commit: Christos Margiolis CommitDate: 2023-05-22 20:21:25 +0000 dtrace: export dtrace_dis_get_byte() kinst uses this function as well, but because it is not exported, it implements its own copy of it. The patch also exposes the function to userland, so programs that need to use dtrace_disx86() can use this function instead of rolling their own copies. Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39871 --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 4 ++++ sys/cddl/dev/dtrace/x86/instr_size.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index 7b8da08e9ae9..6b09a1761af9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2431,6 +2431,10 @@ extern void dtrace_helpers_destroy(proc_t *); extern int dtrace_instr_size(uint8_t *instr); #endif +#if defined(__i386) || defined(__amd64) +extern int dtrace_dis_get_byte(void *p); +#endif + #endif /* _ASM */ #if defined(__i386) || defined(__amd64) diff --git a/sys/cddl/dev/dtrace/x86/instr_size.c b/sys/cddl/dev/dtrace/x86/instr_size.c index a2a9b9342566..878bcf7cf09e 100644 --- a/sys/cddl/dev/dtrace/x86/instr_size.c +++ b/sys/cddl/dev/dtrace/x86/instr_size.c @@ -49,6 +49,7 @@ typedef u_int model_t; #define DATAMODEL_NATIVE 0 +int dtrace_dis_get_byte(void *); int dtrace_instr_size(uint8_t *); int dtrace_instr_size_isa(uint8_t *, model_t, int *); #endif @@ -79,7 +80,7 @@ typedef enum dis_isize { /* * get a byte from instruction stream */ -static int +int dtrace_dis_get_byte(void *p) { int ret;