From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 07/10] arm64/debug: Simplify BRK insn opcode declarations
Date: Mon, 13 Jul 2015 15:38:35 +0100 [thread overview]
Message-ID: <20150713143835.GH19083@leverpostej> (raw)
In-Reply-To: <1436793967-7138-8-git-send-email-Dave.Martin@arm.com>
On Mon, Jul 13, 2015 at 02:25:54PM +0100, Dave P Martin wrote:
> The way the KGDB_DYN_BRK_INS_BYTEx macros are declared is more
> complex than it needs to be. Also, the macros are only used in one
> place, which is arch-specific anyway.
>
> This patch refactors the macros to simplify them, and exposes an
> argument so that we can have a single macro instead of 4.
>
> As a side effect, this patch also fixes some anomalous spellings of
> "KGDB".
>
> Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> arch/arm64/include/asm/debug-monitors.h | 23 ++++-------------------
> arch/arm64/kernel/kgdb.c | 8 ++++----
> 2 files changed, 8 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
> index e28b1dd..6a17fb8 100644
> --- a/arch/arm64/include/asm/debug-monitors.h
> +++ b/arch/arm64/include/asm/debug-monitors.h
> @@ -66,25 +66,10 @@
> */
> #define AARCH64_BREAK_FAULT (AARCH64_BREAK_MON | (FAULT_BRK_IMM << 5))
>
> -/*
> - * Extract byte from BRK instruction
> - */
> -#define KGDB_DYN_DBG_BRK_INS_BYTE(x) \
> - ((((AARCH64_BREAK_MON) & 0xffe0001f) >> (x * 8)) & 0xff)
> -
> -/*
> - * Extract byte from BRK #imm16
> - */
> -#define KGBD_DYN_DBG_BRK_IMM_BYTE(x) \
> - (((((KGDB_DYN_DBG_BRK_IMM) & 0xffff) << 5) >> (x * 8)) & 0xff)
> -
> -#define KGDB_DYN_DBG_BRK_BYTE(x) \
> - (KGDB_DYN_DBG_BRK_INS_BYTE(x) | KGBD_DYN_DBG_BRK_IMM_BYTE(x))
> -
> -#define KGDB_DYN_BRK_INS_BYTE0 KGDB_DYN_DBG_BRK_BYTE(0)
> -#define KGDB_DYN_BRK_INS_BYTE1 KGDB_DYN_DBG_BRK_BYTE(1)
> -#define KGDB_DYN_BRK_INS_BYTE2 KGDB_DYN_DBG_BRK_BYTE(2)
> -#define KGDB_DYN_BRK_INS_BYTE3 KGDB_DYN_DBG_BRK_BYTE(3)
> +#define AARCH64_BREAK_KGDB_DYN_DBG \
> + (AARCH64_BREAK_MON | (KGDB_DYN_DBG_BRK_IMM << 5))
> +#define KGDB_DYN_BRK_INS_BYTE(x) \
> + ((AARCH64_BREAK_KGDB_DYN_DBG >> (8 * (x))) & 0xff)
>
> #define CACHE_FLUSH_IS_SAFE 1
>
> diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c
> index a5a838e..4f78b8a 100644
> --- a/arch/arm64/kernel/kgdb.c
> +++ b/arch/arm64/kernel/kgdb.c
> @@ -328,9 +328,9 @@ void kgdb_arch_exit(void)
> */
> struct kgdb_arch arch_kgdb_ops = {
> .gdb_bpt_instr = {
> - KGDB_DYN_BRK_INS_BYTE0,
> - KGDB_DYN_BRK_INS_BYTE1,
> - KGDB_DYN_BRK_INS_BYTE2,
> - KGDB_DYN_BRK_INS_BYTE3,
> + KGDB_DYN_BRK_INS_BYTE(0),
> + KGDB_DYN_BRK_INS_BYTE(1),
> + KGDB_DYN_BRK_INS_BYTE(2),
> + KGDB_DYN_BRK_INS_BYTE(3),
> }
> };
> --
> 1.7.10.4
>
next prev parent reply other threads:[~2015-07-13 14:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 13:25 [PATCH v2 00/10] arm64: Use BRK instruction for generic BUG traps Dave Martin
2015-07-13 13:25 ` [PATCH v2 01/10] arm64/debug: Eliminate magic number for size of BRK instruction Dave Martin
2015-07-13 14:47 ` Mark Rutland
2015-07-13 13:25 ` [PATCH v2 02/10] arm64/debug: Mask off all reserved bits from generated ESR values Dave Martin
2015-07-13 14:14 ` Mark Rutland
2015-07-13 14:22 ` Dave Martin
2015-07-13 13:25 ` [PATCH v2 03/10] arm64: esr.h type fixes and cleanup Dave Martin
2015-07-14 15:54 ` Mark Rutland
2015-07-14 16:53 ` Dave Martin
2015-07-13 13:25 ` [PATCH v2 04/10] arm64/debug: Eliminate magic number from ESR template definition Dave Martin
2015-07-13 14:16 ` Mark Rutland
2015-07-13 13:25 ` [PATCH v2 05/10] arm64/debug: More consistent naming for the BRK ESR template macro Dave Martin
2015-07-13 14:19 ` Mark Rutland
2015-07-13 13:25 ` [PATCH v2 06/10] arm64/debug: Move BRK ESR template macro into <asm/esr.h> Dave Martin
2015-07-13 14:18 ` Mark Rutland
2015-07-13 13:25 ` [PATCH v2 07/10] arm64/debug: Simplify BRK insn opcode declarations Dave Martin
2015-07-13 14:38 ` Mark Rutland [this message]
2015-07-13 13:25 ` [PATCH v2 08/10] arm64/debug: Add missing #include Dave Martin
2015-07-13 14:34 ` Mark Rutland
2015-07-13 14:44 ` Dave Martin
2015-07-13 14:45 ` Mark Rutland
2015-07-13 13:25 ` [PATCH v2 09/10] arm64/BUG: Use BRK instruction for generic BUG traps Dave Martin
2015-07-13 16:43 ` Mark Rutland
2015-07-13 16:51 ` Dave Martin
2015-07-13 16:56 ` Mark Rutland
2015-07-13 17:05 ` Dave P Martin
2015-07-14 10:20 ` Dave Martin
2015-07-14 11:09 ` Mark Rutland
2015-07-14 11:34 ` Dave Martin
2015-07-14 15:51 ` Mark Rutland
2015-07-14 16:53 ` Dave Martin
2015-07-14 16:11 ` Catalin Marinas
2015-07-14 16:55 ` Dave Martin
2015-07-13 13:25 ` [PATCH v2 10/10] arm64/BUG: Show explicit backtrace for WARNs Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150713143835.GH19083@leverpostej \
--to=mark.rutland@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.