From: Julien Thierry <jthierry@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: jpoimboe@redhat.com, peterz@infradead.org, raphael.gault@arm.com,
Julien Thierry <jthierry@redhat.com>
Subject: [PATCH 09/10] objtool: Split generic and arch specific CFI definitions
Date: Wed, 25 Mar 2020 08:42:02 +0000 [thread overview]
Message-ID: <20200325084203.17005-10-jthierry@redhat.com> (raw)
In-Reply-To: <20200325084203.17005-1-jthierry@redhat.com>
Some CFI definitions used by generic objtool code have no reason to vary
from one architecture to another. Move those definition to generic code
and keep a separate per arch header to provide architecture specific CFI
definitions.
Signed-off-by: Julien Thierry <jthierry@redhat.com>
---
tools/objtool/Makefile | 3 ++-
tools/objtool/arch/x86/include/cfi_regs.h | 25 +++++++++++++++++++++++
tools/objtool/cfi.h | 21 ++-----------------
3 files changed, 29 insertions(+), 20 deletions(-)
create mode 100644 tools/objtool/arch/x86/include/cfi_regs.h
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 519af6ec4eee..11b7dc5d18fe 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -29,7 +29,8 @@ all: $(OBJTOOL)
INCLUDES := -I$(srctree)/tools/include \
-I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
- -I$(srctree)/tools/arch/$(SRCARCH)/include
+ -I$(srctree)/tools/arch/$(SRCARCH)/include \
+ -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include
WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
diff --git a/tools/objtool/arch/x86/include/cfi_regs.h b/tools/objtool/arch/x86/include/cfi_regs.h
new file mode 100644
index 000000000000..79bc517efba8
--- /dev/null
+++ b/tools/objtool/arch/x86/include/cfi_regs.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _OBJTOOL_CFI_REGS_H
+#define _OBJTOOL_CFI_REGS_H
+
+#define CFI_AX 0
+#define CFI_DX 1
+#define CFI_CX 2
+#define CFI_BX 3
+#define CFI_SI 4
+#define CFI_DI 5
+#define CFI_BP 6
+#define CFI_SP 7
+#define CFI_R8 8
+#define CFI_R9 9
+#define CFI_R10 10
+#define CFI_R11 11
+#define CFI_R12 12
+#define CFI_R13 13
+#define CFI_R14 14
+#define CFI_R15 15
+#define CFI_RA 16
+#define CFI_NUM_REGS 17
+
+#endif /* _OBJTOOL_CFI_REGS_H */
diff --git a/tools/objtool/cfi.h b/tools/objtool/cfi.h
index 4427bf8ed686..1a3e7b807994 100644
--- a/tools/objtool/cfi.h
+++ b/tools/objtool/cfi.h
@@ -6,30 +6,13 @@
#ifndef _OBJTOOL_CFI_H
#define _OBJTOOL_CFI_H
+#include "cfi_regs.h"
+
#define CFI_UNDEFINED -1
#define CFI_CFA -2
#define CFI_SP_INDIRECT -3
#define CFI_BP_INDIRECT -4
-#define CFI_AX 0
-#define CFI_DX 1
-#define CFI_CX 2
-#define CFI_BX 3
-#define CFI_SI 4
-#define CFI_DI 5
-#define CFI_BP 6
-#define CFI_SP 7
-#define CFI_R8 8
-#define CFI_R9 9
-#define CFI_R10 10
-#define CFI_R11 11
-#define CFI_R12 12
-#define CFI_R13 13
-#define CFI_R14 14
-#define CFI_R15 15
-#define CFI_RA 16
-#define CFI_NUM_REGS 17
-
struct cfi_reg {
int base;
int offset;
--
2.21.1
next prev parent reply other threads:[~2020-03-25 8:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 8:41 [PATCH 00/10] Objtool updates for easier portability Julien Thierry
2020-03-25 8:41 ` [PATCH 01/10] objtool: Move header sync-check ealier in build Julien Thierry
2020-03-25 8:41 ` [PATCH 02/10] objtool: check: Remove redundant checks on operand type Julien Thierry
2020-03-25 8:41 ` [PATCH 03/10] objtool: check: Clean instruction state before each function validation Julien Thierry
2020-03-25 8:41 ` [PATCH 04/10] objtool: check: Ignore empty alternative groups Julien Thierry
2020-03-25 8:41 ` [PATCH 05/10] objtool: check: Remove check preventing branches within alternative Julien Thierry
2020-03-25 8:41 ` [PATCH 06/10] objtool: check: Use arch specific values in restore_reg() Julien Thierry
2020-03-25 8:42 ` [PATCH 07/10] objtool: check: Allow save/restore hint in non standard function symbols Julien Thierry
2020-03-25 8:42 ` [PATCH 08/10] objtool: Add abstraction for computation of symbols offsets Julien Thierry
2020-03-25 8:42 ` Julien Thierry [this message]
2020-03-25 8:42 ` [PATCH 10/10] objtool: Support multiple stack_op per instruction Julien Thierry
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=20200325084203.17005-10-jthierry@redhat.com \
--to=jthierry@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=raphael.gault@arm.com \
/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.