From nobody Sat Jun 3 17:05:17 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 4QYR7x6ySWz4Z8j6; Sat, 3 Jun 2023 17:05:17 +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 4QYR7x6WGXz3HG1; Sat, 3 Jun 2023 17:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685811917; 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=SA5gXICwR7W6TnJutnvL6ieiHat82iRJU6x9p7q1cjo=; b=EZczFUKrzxSDt0ec0C89n3M2r44V8AskrhAsPLGB+DiCtSL1PyfneGyL0viejXMUiyrSmH KPf7kMCVrg5sUt/JxWw5kGIlIoQyhNR31rRpL5knYiJSqkwkvJByXzcRUdUlYAtCdTuRLl xMKxFRUpSm7XDW2wwQKxrX9NS8hd0mjssIEYIeXzikF1xmpidW5ucpJCzHhq6F5jH05m3x 7vKIU3Hm7c1VzmS04CKOe5erHEXoKUvaqxmTQmVsanc66/XvIM8yobdhzZuER554CViINb phHjMyyMHfuvpJPumOG10KVKtMqj5UvzeIL+xYRemU3EPfhLkspy1561CHVg6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685811917; 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=SA5gXICwR7W6TnJutnvL6ieiHat82iRJU6x9p7q1cjo=; b=MMuBv9PYyiZQXAy1gWEFnSaKlP5JYU1y/5qS3LNQnaTm/AVyWz48S6jJpZTaeJ7JeZO2ma /t6B7o6+Izw28T7/SwZjQTjtijwrRkHhWuPLjHxy6eiVY1gr5FnKEZUoplh+cF68oiJsA7 NyHGz7ljKqKYm3VFh3T1viq1gf1QdnezrWVmT2F29E5O4BzHFwyC304RugxoxdfBW9gJEZ jZ7SmTky/JxgN47SD0aL2bIkMmlCRW/kKJ79UsfbyQVLxcpRCRxW+AzzybUbrPOUfGONoZ Rx2QdNglQBDhYYK+2+a6xlxLym4QBnF5r8vyifo607RinTWtAEcQTiOx2F/GIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685811917; a=rsa-sha256; cv=none; b=wchluOBI9YEvjDnhf2vF1N2ftLDwitdpvK5DfiEvUkCjd+glIEAjdIlqwMtwhMN7m2Jo8U Kooah2cQnUTga1RXIcnt771RWSTVwy8mHcrreOaxDpLHS6jtqHupFay6nq/dOg4rIdZFPr hydl8PCwcuPoPM6H+PdU0g3rRgzKkfQuLEg7C1Oo/aDsFWccYCi4zYFKfDUakQhQRtSCw7 ILIMlpXmUPxk2CG4xoQjmbgewCS7tyJVQsVvzoNBvM0AnnOYuihOmIusC2zrWxY6+nZVKp 4xQxyiSCzl3FS2HghSvcMKyFzMC+FsR3XVgg0TZ6rs0JSq6bISg4YVS4A3KC2A== 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 4QYR7x5T2qzY6T; Sat, 3 Jun 2023 17:05:17 +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 353H5Hpu019417; Sat, 3 Jun 2023 17:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 353H5HVn019416; Sat, 3 Jun 2023 17:05:17 GMT (envelope-from git) Date: Sat, 3 Jun 2023 17:05:17 GMT Message-Id: <202306031705.353H5HVn019416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: bab7781e78fc - main - dtrace: deduplicate arm64 breakpoint definition 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bab7781e78fccecb7c969a63e2d5668ee1c09246 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bab7781e78fccecb7c969a63e2d5668ee1c09246 commit bab7781e78fccecb7c969a63e2d5668ee1c09246 Author: Christos Margiolis AuthorDate: 2023-06-03 17:04:10 +0000 Commit: Christos Margiolis CommitDate: 2023-06-03 17:04:10 +0000 dtrace: deduplicate arm64 breakpoint definition Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40363 --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 6 ++++++ sys/cddl/dev/fbt/aarch64/fbt_isa.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index b38bc71a6845..98ae9eba120a 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2479,6 +2479,10 @@ extern int dtrace_instr_c_ret(uint32_t **instr); #define INSN_SIZE 4 +#define BRK_INSTR 0xd4200000 +#define BRK_IMM16_SHIFT 5 +#define BRK_IMM16_VAL (0x40d << BRK_IMM16_SHIFT) + #define B_MASK 0xff000000 #define B_DATA_MASK 0x00ffffff #define B_INSTR 0x14000000 @@ -2515,6 +2519,8 @@ extern int dtrace_instr_c_ret(uint32_t **instr); #define OFFSET_SIZE 7 #define OFFSET_MASK ((1 << OFFSET_SIZE) - 1) +#define DTRACE_PATCHVAL (BRK_INSTR | BRK_IMM16_VAL) + #define DTRACE_INVOP_STP 1 #define DTRACE_INVOP_RET 2 #define DTRACE_INVOP_B 3 diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index 26d750bf540c..cc4ea42715c8 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -38,10 +38,7 @@ #include "fbt.h" -#define AARCH64_BRK 0xd4200000 -#define AARCH64_BRK_IMM16_SHIFT 5 -#define AARCH64_BRK_IMM16_VAL (0x40d << AARCH64_BRK_IMM16_SHIFT) -#define FBT_PATCHVAL (AARCH64_BRK | AARCH64_BRK_IMM16_VAL) +#define FBT_PATCHVAL DTRACE_PATCHVAL #define FBT_AFRAMES 4 int