From nobody Sun May 07 17:59:52 2023 X-Original-To: dev-commits-src-branches@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 4QDsdN5tsqz49JC4; Sun, 7 May 2023 17:59:52 +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 4QDsdN5LG7z47yh; Sun, 7 May 2023 17:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683482392; 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=AU3wLN1AIGlCFehkj40L+hfXgPOOqq8c7jnIieoyUEU=; b=vRrzt4y2xRHZoltKGHDNUFLQvNNMRdeoByIhQTbzQVxbE3u8yptSHJ9Z1oqpsmgHh8qPjX VU5TOObMBG64N40VjeXReVslO5qDG6gM64BfAQ6ArvVdUrNQ/EiByGjMNEKA74EL9kJvHI /E7Z/Uc0BY0E1fSDqfkHRPNXdtDbxqvlYtcLAnKWw1a4iwLQYHkDGAVGzzBgmgiuMPfQQ3 w3qlvUWrVYPJUhTxumLMgptq/m/QCopu0Yx2yCshfp5NuRnAptDPSr8R95B+0BOunC6y/8 LzrjNdq6+V89XVIJ5oeqLV5GZcT66HrydVQOE8072DnkMD154QIGGsBd+0MLIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683482392; 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=AU3wLN1AIGlCFehkj40L+hfXgPOOqq8c7jnIieoyUEU=; b=GUUc10CQyS9bB1lxmP9SSM2Z8CMGs8TnqkN+sKNJd7AuFxAxoXH+HnUa3H6JVXOR0XNn9k kvVF7UJ3Ma4+8I2cwnX4poRWDaLsdHx6bI7j/0uYVuaT41Ct5WUGAvgZoZCReOR9jrGCiV kBZ7ve4J0Avz5Y006c8blvY8AkbIiW5FJhXBDa0etU/vobx+rCYIXcf6GPYw3XTeWlRoJA UQpSLmKuXVddWzo4sCgU572M6zNrIQMKtr5Sr6DQpjTj/86BwfbcpMuPyUmyuhwo7WzNbh tXYwVo7Pgpq7+dfahPy8Ewl+Hm/5Gg0cHA0kWcQyMPtOysG0vtwyqJOnnVsU0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482392; a=rsa-sha256; cv=none; b=rVxYdOpEQQDWooW2Yt9YdJe2/g91JY9RbHfkvgusupblqWK3o3Yo8C9cWwDMmOW8GW81Ui wdlFcUpVDkWi0mJ2YQWjKa86E9NU5A8mfoTrXcZvJV8cz4BIxlSDTBMB5U9XQbwIHe9JzF AMgPHyEeADkHc6Cu7O7tt5wLvgFmA5meHYvCoz4k1pWmWBRDyy9x5LN59sDDHQJXaNiAoY QlLv+SHgioKTR58XzEJbEealpYSZ7clfSbDDOGKHn7h3tMi0lGwAdE5Gi5zHgEkM5UicOX QEeRx5sWA6hFwXnIDPTVQidN3Q/NgASNog9BIqH2mCnEMrDHFxyfhws7hXUqxw== 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 4QDsdN4LjPzSMX; Sun, 7 May 2023 17:59:52 +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 347HxqkG007745; Sun, 7 May 2023 17:59:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Hxq5l007744; Sun, 7 May 2023 17:59:52 GMT (envelope-from git) Date: Sun, 7 May 2023 17:59:52 GMT Message-Id: <202305071759.347Hxq5l007744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a2f6734d9d5d - stable/13 - dtrace: get rid of uchar_t types List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2f6734d9d5da7d5407d8b61b926967920fec4d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2f6734d9d5da7d5407d8b61b926967920fec4d4 commit a2f6734d9d5da7d5407d8b61b926967920fec4d4 Author: Christos Margiolis AuthorDate: 2023-04-20 16:19:42 +0000 Commit: Mark Johnston CommitDate: 2023-05-07 17:54:08 +0000 dtrace: get rid of uchar_t types Callers are specifying uint8_t anyway and this slightly reduces dependencies on compatibility typedefs. No functional change intended. Reviewed by: markj, mhorne MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39490 (cherry picked from commit 1a149d65baed31b90a0b8abe2d6c5a568122a5ec) --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 4 ++-- sys/cddl/dev/dtrace/amd64/dtrace_subr.c | 4 ++-- sys/cddl/dev/dtrace/i386/dtrace_subr.c | 4 ++-- sys/cddl/dev/dtrace/x86/instr_size.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index 5cad5a3b18c9..d3d8fbca6164 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2399,8 +2399,8 @@ extern void dtrace_safe_synchronous_signal(void); extern int dtrace_mach_aframes(void); #if defined(__i386) || defined(__amd64) -extern int dtrace_instr_size(uchar_t *instr); -extern int dtrace_instr_size_isa(uchar_t *, model_t, int *); +extern int dtrace_instr_size(uint8_t *instr); +extern int dtrace_instr_size_isa(uint8_t *, model_t, int *); extern void dtrace_invop_callsite(void); #endif extern void dtrace_invop_add(int (*)(uintptr_t, struct trapframe *, uintptr_t)); diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c index 2521afc7b443..c4a36e851c3f 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c @@ -449,7 +449,7 @@ dtrace_trap(struct trapframe *frame, u_int type) * Offset the instruction pointer to the instruction * following the one causing the fault. */ - frame->tf_rip += dtrace_instr_size((u_char *) frame->tf_rip); + frame->tf_rip += dtrace_instr_size((uint8_t *) frame->tf_rip); return (1); /* Page fault. */ case T_PAGEFLT: @@ -461,7 +461,7 @@ dtrace_trap(struct trapframe *frame, u_int type) * Offset the instruction pointer to the instruction * following the one causing the fault. */ - frame->tf_rip += dtrace_instr_size((u_char *) frame->tf_rip); + frame->tf_rip += dtrace_instr_size((uint8_t *) frame->tf_rip); return (1); default: /* Handle all other traps in the usual way. */ diff --git a/sys/cddl/dev/dtrace/i386/dtrace_subr.c b/sys/cddl/dev/dtrace/i386/dtrace_subr.c index 69a07e8ee968..dedc1ffe84c8 100644 --- a/sys/cddl/dev/dtrace/i386/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/i386/dtrace_subr.c @@ -449,7 +449,7 @@ dtrace_trap(struct trapframe *frame, u_int type) * Offset the instruction pointer to the instruction * following the one causing the fault. */ - frame->tf_eip += dtrace_instr_size((u_char *) frame->tf_eip); + frame->tf_eip += dtrace_instr_size((uint8_t *) frame->tf_eip); return (1); /* Page fault. */ case T_PAGEFLT: @@ -461,7 +461,7 @@ dtrace_trap(struct trapframe *frame, u_int type) * Offset the instruction pointer to the instruction * following the one causing the fault. */ - frame->tf_eip += dtrace_instr_size((u_char *) frame->tf_eip); + frame->tf_eip += dtrace_instr_size((uint8_t *) frame->tf_eip); return (1); default: /* Handle all other traps in the usual way. */ diff --git a/sys/cddl/dev/dtrace/x86/instr_size.c b/sys/cddl/dev/dtrace/x86/instr_size.c index 6eea987244b1..a2a9b9342566 100644 --- a/sys/cddl/dev/dtrace/x86/instr_size.c +++ b/sys/cddl/dev/dtrace/x86/instr_size.c @@ -49,8 +49,8 @@ typedef u_int model_t; #define DATAMODEL_NATIVE 0 -int dtrace_instr_size(uchar_t *); -int dtrace_instr_size_isa(uchar_t *, model_t, int *); +int dtrace_instr_size(uint8_t *); +int dtrace_instr_size_isa(uint8_t *, model_t, int *); #endif #include @@ -83,7 +83,7 @@ static int dtrace_dis_get_byte(void *p) { int ret; - uchar_t **instr = p; + uint8_t **instr = p; ret = **instr; *instr += 1; @@ -101,7 +101,7 @@ dtrace_dis_get_byte(void *p) */ /* ARGSUSED2 */ static int -dtrace_dis_isize(uchar_t *instr, dis_isize_t which, model_t model, int *rmindex) +dtrace_dis_isize(uint8_t *instr, dis_isize_t which, model_t model, int *rmindex) { int sz; dis86_t x; @@ -127,13 +127,13 @@ dtrace_dis_isize(uchar_t *instr, dis_isize_t which, model_t model, int *rmindex) } int -dtrace_instr_size_isa(uchar_t *instr, model_t model, int *rmindex) +dtrace_instr_size_isa(uint8_t *instr, model_t model, int *rmindex) { return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, model, rmindex)); } int -dtrace_instr_size(uchar_t *instr) +dtrace_instr_size(uint8_t *instr) { return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, DATAMODEL_NATIVE, NULL));