From nobody Wed Feb 1 17:32:02 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 4P6TW63fxCz3bJBb; Wed, 1 Feb 2023 17:32:02 +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 4P6TW62bRmz3Php; Wed, 1 Feb 2023 17:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272722; 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=qiPiqQ+WZXmv1xUJgT/nsQKFkbjI7zGe7HCWeS1kOPU=; b=fx69HZZ987t9d0zQ7Mx7+jtli4VMmQVgMqpnmXJNmcuh7XtGzMp37VJvH80pfNUUMfhrZo Ep/K4RowvykEoN9EuQVRLfNbeK52UNfO20LTLxA2GJgVFA9YX4mCaXEdifn5KiswkONiT6 5rJIqp960fXcLWucDyg71DP6om/j46c46nn3OaKzRZjFgT2JZZwNp1jOhNevq0Kw4iYaQF M8v+0JYy2JdytRK9q/JdItg8GadVFldRbWOS3j03wauCtn25jQHTfVOkqockr2uZswP6D0 UhjFHv8KyiuMj+QxkP8SvMGXHcEyzRaLk9RgLR2344z7NVJdBmgNq1bKGvSqqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272722; 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=qiPiqQ+WZXmv1xUJgT/nsQKFkbjI7zGe7HCWeS1kOPU=; b=P3XJYJV2K3yYgPoPAkCAnpThLT9Oqth2sPZhZFOgreRJEAV0VFOkp8piDu/ravtabConJb S7GroOSC8ktixyxAPgqRgxsrBGEqe83Jo2m+6NrIoC3yuxrliO6FYIyTsmEhPm/RBYW2KX gx82WrnYmwaUCgZDaHtsTturImgTQmnd6hq4rhJCgBe/derQXJLtbfpqduc8u6UDk/bOyL jsViEAMMxzX2F9rzTgqxm8H+KZk96/QbVPA4vV81bGKmUiuroAUuSkCJD3OciVuGWOi2Is pdTaQd7/RUjywuPRuu/OUeZDDsV8kDq0DJyGHif9UWHQSNadthfxkKjBga7k8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272722; a=rsa-sha256; cv=none; b=OOUoSJEh3u5fgRaH+lrLpjhJzSIzD4T8DSrSjbfJL/QzKHfdSmaA9Uycnt5eGwijZ0AIGk pCnpbskQqaFpXJo/Te6o9oouWTyMB+48aUKFvZJpPfwvc945m0/uhKnXjs8DcbTTO1mVZf uIpp/GX6pL+FlydHFTqvpmr2IzfXIGdIGkohQt6ZyN1DW0P7aoTli08cNpwAKZIRlggr/P GCWz4yXiY0eIUQRBZSEY947i9ihpf5S34pObidTArDsAUdyHe2209sKWelqw15frf02pOL tqltQc7cNgUGKjL2NEH2Sl2L8Ae74hhAn5vY1UZn63VQCLU6gY/Dv0J0iOoqYA== 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 4P6TW61jDSzMvD; Wed, 1 Feb 2023 17:32:02 +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 311HW2Rj058127; Wed, 1 Feb 2023 17:32:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HW2uF058126; Wed, 1 Feb 2023 17:32:02 GMT (envelope-from git) Date: Wed, 1 Feb 2023 17:32:02 GMT Message-Id: <202302011732.311HW2uF058126@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: b5c8243d6a98 - stable/13 - dtrace: Improve a verifier error message 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5c8243d6a985214aafb951bda7606fc64e7a3a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c8243d6a985214aafb951bda7606fc64e7a3a9 commit b5c8243d6a985214aafb951bda7606fc64e7a3a9 Author: Domagoj Stolfa AuthorDate: 2023-01-24 14:09:27 +0000 Commit: Mark Johnston CommitDate: 2023-02-01 17:22:31 +0000 dtrace: Improve a verifier error message Using '%r0' in efunc causes it to parse %r as a 'r' specifier. This diff just adds a '%' in front of '%r0' in order to create the correct output. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38176 (cherry picked from commit 7c5bc69a1a33b3a544175ad89c0bba1429491218) --- .../contrib/opensolaris/uts/common/dtrace/dtrace.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 292326fb8efd..585fa13e4912 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -9811,7 +9811,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_NOT: case DIF_OP_MOV: @@ -9823,7 +9823,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_LDSB: case DIF_OP_LDSH: @@ -9839,7 +9839,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); if (kcheckload) dp->dtdo_buf[pc] = DIF_INSTR_LOAD(op + DIF_OP_RLDSB - DIF_OP_LDSB, r1, rd); @@ -9858,7 +9858,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_ULDSB: case DIF_OP_ULDSH: @@ -9874,7 +9874,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_STB: case DIF_OP_STH: @@ -9944,7 +9944,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_SETS: if (DIF_INSTR_STRING(instr) >= dp->dtdo_strlen) { @@ -9954,7 +9954,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_LDGA: case DIF_OP_LDTA: @@ -9965,7 +9965,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_LDGS: case DIF_OP_LDTS: @@ -9977,7 +9977,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); break; case DIF_OP_STGS: case DIF_OP_STTS: @@ -9995,7 +9995,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs, if (rd >= nregs) err += efunc(pc, "invalid register %u\n", rd); if (rd == 0) - err += efunc(pc, "cannot write to %r0\n"); + err += efunc(pc, "cannot write to %%r0\n"); if (subr == DIF_SUBR_COPYOUT || subr == DIF_SUBR_COPYOUTSTR) {