From nobody Tue Nov 01 04:18:59 2022 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 4N1cGX2t5Nz4g8Mt; Tue, 1 Nov 2022 04:19:00 +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 4N1cGX21qxz3qHp; Tue, 1 Nov 2022 04:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667276340; 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=5KMOI/ov3DJ9JrqLWLEIcNvGchILJDBC2tEBEh1f40Y=; b=QpV1j0KQOYRueYLXd9zMPjCNMji6GTceCQ3D5v37jn0J6EHrvuH7IaQxWMqZvDYTzq6IDN Z3a34VwZc0/Gp4c4foXXUVkDqCM1Eb312151KFsDAcBWeAnHEwrFendNtdYRJJX053WKTx WW3jIllSZPQmD/q2dPwXGG/AvcyLL1JG+ssaNANxO2BmZnTb0UqM6qgt0/Mwj5mT5TPxEN /4WE5hAzuEUxYChVcLk0UDeofwm5w4hvEHh697NvhT6VtH4OcWeSJf4k4v2WEUs7I0qA2n dFeo+4NzDSzrK4PW+A2q1MQtl5nbIuSwehS1u87GM5dWYsAY8h1BoY38b+yuSg== 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 4N1cGX0qzDz12Jj; Tue, 1 Nov 2022 04:19:00 +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 2A14IxFk039212; Tue, 1 Nov 2022 04:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A14IxCg039211; Tue, 1 Nov 2022 04:18:59 GMT (envelope-from git) Date: Tue, 1 Nov 2022 04:18:59 GMT Message-Id: <202211010418.2A14IxCg039211@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: 60013d9c5024 - main - dtrace: Fix the i386 FBT build 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: 60013d9c5024c86f4c7027ed2b18856517e8a05c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667276340; 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=5KMOI/ov3DJ9JrqLWLEIcNvGchILJDBC2tEBEh1f40Y=; b=weUXgKrKjCEbHanbgrSkTbv1pHWYDLmM+QxWtw+iF+njS27O1KXXyU+6ns6OyfGD3iWYyz 4EOyBarCL4xa8+/6baKbyKbWadw/UmZU+CEDUGKHAG0PDsnGZC50lyBzokKmyLqnRJ1KDA NSk9+KNaM0AL/YRXCOCHXJNGmBI9MyPE798T6UKwGnmUVNBqHX1fc3+pt/cRQrRBmFKmzs Hw4VWM0gqfG6phvHi/9rJjZi1BzTOPFna0iNWSeUldT6Wg3deAJimu9SEufvbcQKVOLp53 cbsXxKuiq6AlXGfn2c5ub8r0B9rnDf2dhqU4g1a838oNu/e+h/CxbghUECn/Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667276340; a=rsa-sha256; cv=none; b=O1fXdCpPQmh9IIP97rXz3Nm7u8hESlkzfHl8nSHAx9gKi2MwvEr2yknIqoHyX9fLcpa6gE AADrhP/KkZtZoYZeBpDVrjA6cJ6UNW9LCYNiu+YOdd2FGIxO3YQlNSpcrzKXx60zrFCZ6m CCZuTHGdZuqzcl8uQIaKtSSoYpeTPazRoG6PnxqT52Nd31vykbMY4ohTos1RuMrXAfeO9V VHAwSceQSB/ciZwSFEIRsHgt2Yr1MwfAU5tiQfi/cvHH0Fng7ZFsVR5/YdXlibrQQ9G9TT tAfyv+6gbMkPRZZRKTAdG8fsDH90gHq8J//0BN63Dl3qabhzqbyXz6qNbwzVRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=60013d9c5024c86f4c7027ed2b18856517e8a05c commit 60013d9c5024c86f4c7027ed2b18856517e8a05c Author: Mark Johnston AuthorDate: 2022-11-01 04:14:30 +0000 Commit: Mark Johnston CommitDate: 2022-11-01 04:17:48 +0000 dtrace: Fix the i386 FBT build Reported by: Jenkins Fixes: 0e69c959150c ("dtrace: Fix up %rip for invop probes on x86") --- sys/cddl/dev/fbt/x86/fbt_isa.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c index b05ae4cb2c44..481e65bd761b 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -89,7 +89,11 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) * Report the address of the breakpoint for the benefit * of consumers fetching register values with regs[]. */ +#ifdef __i386__ + frame->tf_eip--; +#else frame->tf_rip--; +#endif for (; fbt != NULL; fbt = fbt->fbtp_tracenext) { ASSERT(fbt->fbtp_rval == fbtrval); if (fbt->fbtp_roffset == 0) { @@ -150,7 +154,11 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) } } /* Advance to the instruction following the breakpoint. */ +#ifdef __i386__ + frame->tf_eip++; +#else frame->tf_rip++; +#endif return (fbtrval); }