From nobody Mon May 1 15:40:47 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 4Q96qg6ml5z48gh6; Mon, 1 May 2023 15:40:47 +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 4Q96qg67YVz3rwb; Mon, 1 May 2023 15:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682955647; 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=S3iCNXTG809XJwu+ERned5KistTMvnoT7tCTvGAzYJk=; b=yS5hsvhYD1Qo9CkcQ/b3YG8YY5JisD+5Ti3zJUvrcB7CNt4i1+inLwX5WNJEPQM1GuMmJU VA6SG0Zgz95ZkUYVntN9QhwTdM2iSJUajQnYjuLS0cKwi4GqRQbWOUjiQrJFLk7JhDu7Yd DlqaGgjMm5QG3BHIgaKILN+1XUsLXPGwhpICgfFgToVcvEHE9E4Rnc3fGspMw9dDyw6XRB HDvQysg669JPskztPXlWbWMNm00Ctou4ubY6e/mdpEdqJzg6RQF8j7OrtvTYNNqcr9jttB gJqV3HP4yvX0Olh9OykqWBaZRXYBW7U5beWwM9vlx1tN2AfuwodWWwMx4a18NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682955647; 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=S3iCNXTG809XJwu+ERned5KistTMvnoT7tCTvGAzYJk=; b=Ylp9mOvi74P0O/zU72Tg/J9ltJwM1YG1L3UMMq9vd9DD/xTWlxwSuNRugw+WfYXQhDsoXT 0VWuSKrYhl0VQmvnaA1JKvnMFweYSYP2uaxwqt5dJik39ESiVsZuFAberx70Nu83ePtZwh QoAlDYNUQKWfHOLVBOUn1sOGgL/QCRFadRuzEFlg6x02iRuFnBw/pomEp54XGS8a7Q09hH TaHL9gfUPfEW0ll2ioFHrmqhxLfql/S9aTIklfY7+h/Ccy9RcOn3qwVuIKMuZBef7YQG/f PlFq6MQJAGAexWvhMz2D9sLmzKwEPrfkY1ZgW1/zdOhku1TiaxnDOpDOGpB5UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682955647; a=rsa-sha256; cv=none; b=T85jUDXblCG7tJKphM7py6O0D3dhSgKlSMqx0NYTiM2gc/yqq8JnJoW51dvFgKztwZX3PV keJHKcQidUQmp4f3W9O0smUJmRiCr/DyaK1HNnowrQlIckxsPzpQcOlPzqsk03k+WgDyo8 Db093fQs6mWes22e8dGd3Di/+Ie1ldnejgvKi5vLChF98V4G9Hu8GLbFOs98/QETPUj+Dq y9KRK0p+Kd068YoFEpZgxTuOt/eivOnp3GQC4N9uiRzN9ECPRHvI1CG7X5+kMQDUnK4lq/ nko1+TNZiWjrP2Tjf64lKiuro7olwTeY/rFo6iwOXQS5dkfyTnxSEkEBa9fVUA== 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 4Q96qg4dZLz19s1; Mon, 1 May 2023 15:40:47 +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 341Fel75016489; Mon, 1 May 2023 15:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341Felmr016485; Mon, 1 May 2023 15:40:47 GMT (envelope-from git) Date: Mon, 1 May 2023 15:40:47 GMT Message-Id: <202305011540.341Felmr016485@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: aad1685066fc - main - fbt: get rid of redundant defines 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: aad1685066fc2430d6ee9b3025369ba6bd513333 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aad1685066fc2430d6ee9b3025369ba6bd513333 commit aad1685066fc2430d6ee9b3025369ba6bd513333 Author: Christos Margiolis AuthorDate: 2023-05-01 15:20:34 +0000 Commit: Mark Johnston CommitDate: 2023-05-01 15:40:29 +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 --- 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 481e65bd761b..8c536335791c 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) {