From nobody Mon Apr 10 16:14:33 2023 X-Original-To: dev-commits-src-main@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 4PwDZK60swz44Qxs; Mon, 10 Apr 2023 16:14:33 +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 4PwDZK3tF0z4Fjc; Mon, 10 Apr 2023 16:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143273; 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=c2C7h1xWBFj1K3Lts4o/KhQgS3b+jwRhCUNFE8XUWhg=; b=iUQ82/fxv1ZFBDKMyA+QPWVpAiR56Ix+FaGW+cEbB9Vkw0ptsRcITo/k7hgQxzZzY+Edrb 1yzmUtzlMLlPUM1QzvC7q+1AvNCxgQfsin5tVZge4oes62UjfXVfai5sp1S2D1nWlpqbVh 5S+UkOQHqSmhC/nGYAnUrn8dr0U4xttdsI5/5gwD5TC7L6bwZq5WsnJ0whRYULWod/cnx0 Y8dZ9mZYsYSL8d/pD+iPLNFQ+KI/cNxc6mbjWc4nvdG8KNLzCjvOL+B1vtFQg+t/viTiPS 3lIFGeC7N/u4k6+YJBNbvkLWUdxaN8oA0v8rosSlUNMaLJzua32ksc+IrR7Rzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143273; 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=c2C7h1xWBFj1K3Lts4o/KhQgS3b+jwRhCUNFE8XUWhg=; b=LzyusPLAknxaMJZ19mutdkFfGCwN1GfEE/u8qNjKT9KvdeN0WS6CqYuznDtRoo1/TotX+Q b5NsFE9FYfYtvc97+sg12lAb2bEmwVLv7LSM6fV16vJ6N3FYVGAcIsBwQLKn/jWyVLwYVU e6x9itQzYGfR0eTXeSzzo2XezqdXKtoKRmK1FlKy4W358cwQ/+gf+k3ntB19hA/ZaNaPWQ 5SOpa8Zh4wLH6w3B+wwq1BJ7LtrrR4kKH2ugRy4zE1XAxUJ2fowhWgh/VXedkWkmIHU8ci nbKQnqwWz82oKrHjma3UaSYQej5O45mhXcHIzdcR6AoaE8QcAEj3s0m6H6JIJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681143273; a=rsa-sha256; cv=none; b=KTJxKULe5QQkaHPVVTyTFMfxJhXlk7S2RdaXy9FuCx25cLwv0XaBYuWw0vpGhILLIaTMiq A+9FLwNKExIjauXtIzZQKYibETUShSvO+AowKug/Ipze5afXyFs8fpMVoz/mVsQn9I+Ayn ptVA99wblvGe4GZKlB9W3toWaBF+U/sV9/YlGYuhZRSfxvwVbyvQiMTkwu/tA2reErdklv lAq2gN/zRoUNkSQ1DeVY21GphRiGww4Sq8aikLw7NeQf68BVaWJH5i8kGLfcCpnBhyHM3o nzYtKXiBaAtUaJKfvvkOJUju3aws9dUZWvFbpsMnCxdnaXAnVh7Uv8YqQ+5Y2w== 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 4PwDZK1r9QzxM7; Mon, 10 Apr 2023 16:14:33 +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 33AGEXqa026004; Mon, 10 Apr 2023 16:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AGEXUZ026003; Mon, 10 Apr 2023 16:14:33 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:14:33 GMT Message-Id: <202304101614.33AGEXUZ026003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0388a0887a8d - main - dtrace: handle NOP instructions in the riscv invop handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0388a0887a8d0e6f21b130bf7d9f6b455958c7eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0388a0887a8d0e6f21b130bf7d9f6b455958c7eb commit 0388a0887a8d0e6f21b130bf7d9f6b455958c7eb Author: Christos Margiolis AuthorDate: 2023-04-10 15:30:48 +0000 Commit: Mark Johnston CommitDate: 2023-04-10 16:14:11 +0000 dtrace: handle NOP instructions in the riscv invop handler This will be used by a forthcoming port of the kinst provider. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39481 --- sys/cddl/dev/dtrace/riscv/dtrace_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c index f32bb3a2343e..1717b118be7e 100644 --- a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c @@ -308,6 +308,9 @@ dtrace_invop_start(struct trapframe *frame) return (0); } + if (match_opcode(invop, MATCH_C_NOP, MASK_C_NOP)) + return (0); + #ifdef INVARIANTS panic("Instruction %x doesn't match any opcode.", invop); #endif