From nobody Thu Jun 15 16:39:40 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 4Qhp0r47nmz4fRvs; Thu, 15 Jun 2023 16:39:40 +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 4Qhp0r27djz4G3h; Thu, 15 Jun 2023 16:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686847180; 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=BQ3WTv30EcMVuWPv6do/HdbScVSnd0AiB62mTUNm9ks=; b=bk8Hzt8kDZuVJpCtSVhZkmjJoZybQGGehQG9CmltnrdXL+ssewwEBCXUbMhL6dgXOTCAoM 4lcGzbpNS+N7dFhUx8Uvo8C9sMOwC//+k2l3930AbEixxsLjotwySBVvaBilMpEcCTCWdg 6CQFL8rDHqqBgstWxl5tFucFZo9M/vaITW6b8w5Sdyx8g8hLTS2MaO0oKyMNkuYMShke/H 9NHeaDvgUpQSOsQiK3xRrDaSBaFLzvnwOo7HWSG1lru4d580mkaYy1ecTlQkRbVMlGYTRr yMlSp6KEnIgP4GkKaXMGtt216cnWDEuxVauYc2ECRgDYDfo5vGnEMdm2IfVf5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686847180; 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=BQ3WTv30EcMVuWPv6do/HdbScVSnd0AiB62mTUNm9ks=; b=J2TLkT7BVpPjFW14zM5+fEj5xXqh0LoXYAXOXGTvdIvPlss1bnLrlaVVpo7xvZote1HJjX Gb6CfGy+iK4ON53Q1Iag27Pd7r95sPDlBolL9waGAbq88NRa576MjuToE6Syye37TkLT+d wy++TF1+VQIhHAPjcNt4Nbr//5xahb39Bq5iEcUlbxyRxTVONmdke0qoaYqm0Go2OLKUIV KFuGTfZlJ3RvULjFAwPebiFsBd78HDW7wEALR4AY+wIGLSH2GuhYXaoVBkTuP+D1HdmCYb w1E3XJRF86MtHSx/6P02FN6GBK4KXEyLRG6jd5CRFKhmZT3Yjj6OTcwsMQ1VuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686847180; a=rsa-sha256; cv=none; b=vAk22xcyXe48Dxt/e5bP9nJy0vFMJ8FWxLeR5/TYAWIdDgtBOLbKm2oWwvRx5enGNRwyW6 SN7B8aYqi3jVKUL8RPHU2g5DcnGSMcT1yxVFKpi5cU7WgJjRQMAVIhdNHVGAr1Ma349ZXj NAluTA2huHraZiYk1Hn/48mHF03F55ifH2Oxid/Fje/0iWUu3CThFeQKjX8oAdrm5t0gND ZdmuJwXwQown7XWAXM1jARxaTC4CptNi17HnRkXk+cZDR9T58pYiYM25oZb2NCEv0pFIfp OapMYctXcBTs5Vr9PcouwAHLNaR9SNxN2Rdc8xm5KSJOLJuvUJ8GWNDf4mp9ow== 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 4Qhp0r14L5ztP5; Thu, 15 Jun 2023 16:39:40 +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 35FGdeIt085891; Thu, 15 Jun 2023 16:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35FGdeZX085890; Thu, 15 Jun 2023 16:39:40 GMT (envelope-from git) Date: Thu, 15 Jun 2023 16:39:40 GMT Message-Id: <202306151639.35FGdeZX085890@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: d3251842321e - main - arm64: Remove struct arm64_frame 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/main X-Git-Reftype: branch X-Git-Commit: d3251842321e7a5ac8bbb2aec128328cd10f3a84 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d3251842321e7a5ac8bbb2aec128328cd10f3a84 commit d3251842321e7a5ac8bbb2aec128328cd10f3a84 Author: Mark Johnston AuthorDate: 2023-06-15 16:10:44 +0000 Commit: Mark Johnston CommitDate: 2023-06-15 16:38:45 +0000 arm64: Remove struct arm64_frame It was used in one place and was added specifically to support dtrace stack unwinding code. Write an equivalent expression using struct unwind_state instead. No functional change intended. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40538 --- sys/arm64/include/frame.h | 5 ----- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/arm64/include/frame.h b/sys/arm64/include/frame.h index fc10f8574161..c838193bee9e 100644 --- a/sys/arm64/include/frame.h +++ b/sys/arm64/include/frame.h @@ -51,11 +51,6 @@ struct trapframe { uint64_t tf_x[30]; }; -struct arm64_frame { - struct arm64_frame *f_frame; - u_long f_retaddr; -}; - /* * Signal frame, pushed onto the user stack. */ diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index 1641ad246419..d8ef65cfb6d9 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -133,7 +133,7 @@ dtrace_getustack_common(uint64_t *pcstack, int pcstack_limit, uintptr_t pc, break; pc = dtrace_fuword64((void *)(fp + - offsetof(struct arm64_frame, f_retaddr))); + offsetof(struct unwind_state, pc))); fp = dtrace_fuword64((void *)fp); if (fp == oldfp) {