From nobody Tue May 09 14:02:59 2023 X-Original-To: dev-commits-src-branches@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 4QG0H75R7Gz4BDf7; Tue, 9 May 2023 14:02:59 +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 4QG0H72tBKz3N1G; Tue, 9 May 2023 14:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683640979; 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=THbkv2z03684ddnsqq4yZMfmlCMDMMOjqKRp+jb9QNg=; b=CHwExxUh9lPaCFrOmeJ0n2eLOGASvpxOKL4TD5yfAzlrQUZNUl1Swe8t9xSZzVzrjw8oVz kwRL61YzkJe6GS+RsGwBc620nMQNHUcPiBvJPGzr7AnL5PnRIbQ7bWTPyrIETwI19alViF Skh9AZKMIgL8LjiuCp9VGM3zQ4erye06wp5c88I2bHaps25P2q5aVvV0Vxs1DWWq5cfoBP xTzhrXeC/jE/XEm66h2LX0PaZ7jVQHEeNFdF/I8hw+ONTlTjm8OcmlOyIIZGE7dVUJHvTG luf2mlcsWYTxdSZ3H+8gl7qXnk5f8Meiwjy4E0PtRji84cPZtb6gaj4nSX5Aaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683640979; 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=THbkv2z03684ddnsqq4yZMfmlCMDMMOjqKRp+jb9QNg=; b=t2MKzK6Y/77nhABqX1HtCh1+rG6hBHzvXIebE5EW1E80r52rpa/DdA1coDmAMZvVw43Jo3 iEvVScnKgQ6DTS2IpKG+PH9ubyC6KJdAN5Cw2xinlO6UKCbKiSlQUU/PWkFfvJYGvrkIaB ZbegUDD1e3eRPHyEl5hv1TWAb1nUSfkVAhGnOwO+dzhaEbiMjKULlrDZunz/YplzpxEBrZ ew/GibB8Q9DAfp3jF5T8ftHenTk6Yjzudy8yotrM+e823Y7sAnE7Qp1NNLJuPxBq3cLP5X 4f5mmvj4bPeh4iZrV9OqlHdmgzp/Vyc2cfITQT0BMZZV/A1PuO3/3Xxr4VETRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640979; a=rsa-sha256; cv=none; b=OuuKWuL31zuIounCzEHZCAuxRv4csRmjWe9qn+D414TXkzZHCvgaMs8Z9tJhlMtGrTDR8x UvzK1Zfj6xEb7PBOwgHkUpevF5tbUTOldVWgppM6E2okMmOWG0I/dM4uLsK0FL6rvWYGWZ 9iQrYBrVd4uaqcy8XaHJvyrBcTnENCPsTF5AZZDqzgDYexRtCb+y8eOwiM5hq62biNrAzM I+o329kI90WgsUDXmOLld2lO9zpIHG3Mhzc4qDvCRTTdRvXj2RY6CUGHW1VO+CZRDYxT6S hHaZhIRphZvufDQOoa5CARDjbtQQ/A8rd3hKux6N9ikwmdstTa/fJ4h4KWfgzw== 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 4QG0H71yJLzWRq; Tue, 9 May 2023 14:02:59 +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 349E2xUu082848; Tue, 9 May 2023 14:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E2x14082847; Tue, 9 May 2023 14:02:59 GMT (envelope-from git) Date: Tue, 9 May 2023 14:02:59 GMT Message-Id: <202305091402.349E2x14082847@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: 16f43ccd0c69 - stable/13 - fbt: get rid of redundant defines List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 16f43ccd0c69195d1a753da73913ba63e9cad950 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16f43ccd0c69195d1a753da73913ba63e9cad950 commit 16f43ccd0c69195d1a753da73913ba63e9cad950 Author: Christos Margiolis AuthorDate: 2023-05-01 15:20:34 +0000 Commit: Mark Johnston CommitDate: 2023-05-09 14:01:03 +0000 fbt: get rid of redundant defines No functional change intended. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39882 (cherry picked from commit aad1685066fc2430d6ee9b3025369ba6bd513333) --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 -- sys/cddl/dev/fbt/arm/fbt_isa.c | 3 --- sys/cddl/dev/fbt/fbt.h | 3 +++ sys/cddl/dev/fbt/powerpc/fbt_isa.c | 2 -- sys/cddl/dev/fbt/riscv/fbt_isa.c | 2 -- sys/cddl/dev/fbt/x86/fbt_isa.c | 3 --- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index 07f02e2edb72..26d750bf540c 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -42,8 +42,6 @@ #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_ENTRY "entry" -#define FBT_RETURN "return" #define FBT_AFRAMES 4 int diff --git a/sys/cddl/dev/fbt/arm/fbt_isa.c b/sys/cddl/dev/fbt/arm/fbt_isa.c index 0be28b56aa6a..d52809c9f227 100644 --- a/sys/cddl/dev/fbt/arm/fbt_isa.c +++ b/sys/cddl/dev/fbt/arm/fbt_isa.c @@ -45,9 +45,6 @@ #define FBT_JUMP 0xea000000 #define FBT_SUBSP 0xe24dd000 -#define FBT_ENTRY "entry" -#define FBT_RETURN "return" - int fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval) { diff --git a/sys/cddl/dev/fbt/fbt.h b/sys/cddl/dev/fbt/fbt.h index aa9bce564fa0..2816eec992ff 100644 --- a/sys/cddl/dev/fbt/fbt.h +++ b/sys/cddl/dev/fbt/fbt.h @@ -34,6 +34,9 @@ #include "fbt_isa.h" +#define FBT_ENTRY "entry" +#define FBT_RETURN "return" + /* * fbt_probe is a bit of a misnomer. One of these structures is created for * each trace point of an FBT probe. A probe might have multiple trace points diff --git a/sys/cddl/dev/fbt/powerpc/fbt_isa.c b/sys/cddl/dev/fbt/powerpc/fbt_isa.c index eb7feceb269d..7f52308e1f76 100644 --- a/sys/cddl/dev/fbt/powerpc/fbt_isa.c +++ b/sys/cddl/dev/fbt/powerpc/fbt_isa.c @@ -46,8 +46,6 @@ #define FBT_BR_MASK 0x03fffffc #define FBT_IS_JUMP(instr) ((instr & ~FBT_BR_MASK) == FBT_BRANCH) -#define FBT_ENTRY "entry" -#define FBT_RETURN "return" #define FBT_AFRAMES 5 int diff --git a/sys/cddl/dev/fbt/riscv/fbt_isa.c b/sys/cddl/dev/fbt/riscv/fbt_isa.c index baf268028988..5c8340d9f001 100644 --- a/sys/cddl/dev/fbt/riscv/fbt_isa.c +++ b/sys/cddl/dev/fbt/riscv/fbt_isa.c @@ -43,8 +43,6 @@ #define FBT_C_PATCHVAL MATCH_C_EBREAK #define FBT_PATCHVAL MATCH_EBREAK -#define FBT_ENTRY "entry" -#define FBT_RETURN "return" #define FBT_AFRAMES 5 int diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c index 05ec87ab437f..da3eaf26f788 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -57,9 +57,6 @@ #define FBT_PATCHVAL 0xf0 #endif -#define FBT_ENTRY "entry" -#define FBT_RETURN "return" - int fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) {