[binutils-gdb] AArch64: Add MTE CPU feature check support

[Luis Machado]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0424512519142571509c67e83cd9dc2ed51d2dec

commit 0424512519142571509c67e83cd9dc2ed51d2dec
Author: Luis Machado <luis.machado@linaro.org>
Date:   Mon Jun 15 13:39:30 2020 -0300

    AArch64: Add MTE CPU feature check support
    
    This patch is a preparation for the next patches implementing MTE. It just adds
    a HWCAP2 constant for MTE, creates a new generic arch/aarch64-mte-linux.h file
    and includes that file in the source files that will use it.
    
    gdb/ChangeLog:
    
    2021-03-24  Luis Machado  <luis.machado@linaro.org>
    
            * Makefile.in (HFILES_NO_SRCDIR): Add arch/aarch64-mte-linux.h.
            * aarch64-linux-nat.c: Include arch/aarch64-mte-linux.h.
            * aarch64-linux-tdep.c: Likewise
            * arch/aarch64-mte-linux.h: New file.
    
    gdbserver/ChangeLog:
    
    2021-03-24  Luis Machado  <luis.machado@linaro.org>
    
            * linux-aarch64-low.cc: Include arch/aarch64-mte-linux.h.

Diff:
---
 gdb/ChangeLog                  |  7 +++++++
 gdb/Makefile.in                |  1 +
 gdb/aarch64-linux-nat.c        |  2 ++
 gdb/aarch64-linux-tdep.c       |  2 ++
 gdb/arch/aarch64-mte-linux.h   | 28 ++++++++++++++++++++++++++++
 gdbserver/ChangeLog            |  4 ++++
 gdbserver/linux-aarch64-low.cc |  1 +
 7 files changed, 45 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0ea440dd8d5..a7d89022010 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-24  Luis Machado  <luis.machado@linaro.org>
+
+	* Makefile.in (HFILES_NO_SRCDIR): Add arch/aarch64-mte-linux.h.
+	* aarch64-linux-nat.c: Include arch/aarch64-mte-linux.h.
+	* aarch64-linux-tdep.c: Likewise
+	* arch/aarch64-mte-linux.h: New file.
+
 2021-03-24  Luis Machado  <luis.machado@linaro.org>
 
 	* remote: Include gdbsupport/selftest.h.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a6ca5a53655..49202d4653d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1474,6 +1474,7 @@ HFILES_NO_SRCDIR = \
 	arch/aarch32.h \
 	arch/aarch64.h \
 	arch/aarch64-insn.h \
+	arch/aarch64-mte-linux.h \
 	arch/arc.h \
 	arch/arm.h \
 	arch/i386.h \
diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index 0cae91b569c..424e616b042 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -50,6 +50,8 @@
 #include "gdb_proc_service.h"
 #include "arch-utils.h"
 
+#include "arch/aarch64-mte-linux.h"
+
 #ifndef TRAP_HWBKPT
 #define TRAP_HWBKPT 0x0004
 #endif
diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index d8476c907e8..a6044ead49f 100644
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -45,6 +45,8 @@
 #include "record-full.h"
 #include "linux-record.h"
 
+#include "arch/aarch64-mte-linux.h"
+
 /* Signal frame handling.
 
       +------------+  ^
diff --git a/gdb/arch/aarch64-mte-linux.h b/gdb/arch/aarch64-mte-linux.h
new file mode 100644
index 00000000000..629ed9cb275
--- /dev/null
+++ b/gdb/arch/aarch64-mte-linux.h
@@ -0,0 +1,28 @@
+/* Common Linux target-dependent definitions for AArch64 MTE
+
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef ARCH_AARCH64_LINUX_H
+#define ARCH_AARCH64_LINUX_H
+
+/* Feature check for Memory Tagging Extension.  */
+#ifndef HWCAP2_MTE
+#define HWCAP2_MTE  (1 << 18)
+#endif
+
+#endif /* ARCH_AARCH64_LINUX_H */
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index eefd402fbe9..51c059caf08 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-24  Luis Machado  <luis.machado@linaro.org>
+
+	* linux-aarch64-low.cc: Include arch/aarch64-mte-linux.h.
+
 2021-03-24  Luis Machado  <luis.machado@linaro.org>
 
 	* server.cc (test_memory_tagging_functions): New function.
diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
index 86c5f069fa1..7d7da87fdc2 100644
--- a/gdbserver/linux-aarch64-low.cc
+++ b/gdbserver/linux-aarch64-low.cc
@@ -40,6 +40,7 @@
 
 #include "gdb_proc_service.h"
 #include "arch/aarch64.h"
+#include "arch/aarch64-mte-linux.h"
 #include "linux-aarch32-tdesc.h"
 #include "linux-aarch64-tdesc.h"
 #include "nat/aarch64-sve-linux-ptrace.h"