[7/7] btrace: Add support for UINTR and UIRET events.

diff --git a/gdb/btrace.c b/gdb/btrace.c
index 9d2a9aaa1e9..2fc9d62a894 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -1552,6 +1552,35 @@  handle_pt_insn_events (struct btrace_thread_info *btinfo,
 	    handle_pt_aux_insn (btinfo, aux_string, pc);
 	    break;
 	  }
+
+	case ptev_uintr:
+	  {
+	    std::string aux_string = std::string (_("uintr: vector = "))
+				     + hex_string (event.variant.uintr.vector);
+
+	    if (event.ip_suppressed == 0)
+	      {
+		pc = event.variant.uintr.ip;
+		aux_string += std::string (", ip = ") + hex_string (pc);
+	      }
+
+	    handle_pt_aux_insn (btinfo, aux_string, pc);
+	    break;
+	  }
+
+	case ptev_uiret:
+	  {
+	    std::string aux_string = std::string (_("uiret"));
+
+	    if (event.ip_suppressed == 0)
+	      {
+		pc = event.variant.uiret.ip;
+		aux_string += std::string (": ip = ") + hex_string (pc);
+	      }
+
+	    handle_pt_aux_insn (btinfo, aux_string, pc);
+	    break;
+	  }
 #endif /* defined (LIBIPT_VERSION >= 0x201) */
 	}
     }
diff --git a/gdb/testsuite/gdb.btrace/uli.c b/gdb/testsuite/gdb.btrace/uli.c
new file mode 100644
index 00000000000..fd4d601f2ab
--- /dev/null
+++ b/gdb/testsuite/gdb.btrace/uli.c
@@ -0,0 +1,132 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2021-2024 Free Software Foundation, Inc.
+
+ 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/>.  */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syscall.h>
+#include <unistd.h>
+#include <x86gprintrin.h>
+
+#define UINTR_HANDLER_REG_SYSCALL 471
+#define UINTR_HANDLER_UNREG_SYSCALL 472
+#define UINTR_CREATE_FD_SYSCALL 473
+#define UINTR_SEND_REG_SYSCALL 474
+#define UINTR_SEND_UNREG_SYSCALL 475
+
+unsigned long uintr_received;
+unsigned int uintr_fd;
+
+int
+uintr_register_handler (void *ui_handler, unsigned int flags)
+{
+  return syscall (UINTR_HANDLER_REG_SYSCALL, ui_handler, flags);
+}
+
+int
+uintr_unregister_handler (unsigned int flags)
+{
+  return syscall (UINTR_HANDLER_UNREG_SYSCALL, flags);
+}
+
+int
+uintr_create_fd (int vector, unsigned int flags)
+{
+  return syscall (UINTR_CREATE_FD_SYSCALL, vector, flags);
+}
+
+int
+uintr_register_sender (int uintr_fd, unsigned int flags)
+{
+  return syscall (UINTR_SEND_REG_SYSCALL, uintr_fd, flags);
+}
+
+int
+uintr_unregister_sender (int uintr_fd, unsigned int flags)
+{
+  return syscall (UINTR_SEND_UNREG_SYSCALL, uintr_fd, flags);
+}
+
+void __attribute__ ((interrupt))
+ui_handler (struct __uintr_frame *ui_frame, unsigned long long vector)
+{
+  static const char print[] = "\t-- User Interrupt handler --\n";
+
+  write (STDOUT_FILENO, print, sizeof (print) - 1); /* bp4 */
+  uintr_received = 1;
+}
+
+void *
+sender_thread (void *arg)
+{
+  int uipi_index;
+
+  uipi_index = uintr_register_sender (uintr_fd, 0);
+  if (uipi_index < 0)
+    {
+      printf ("Sender register error\n");
+      exit (EXIT_FAILURE);
+    }
+
+  printf ("Sending IPI from sender thread\n");
+  _senduipi (uipi_index); /* bp2 */
+
+  uintr_unregister_sender (uintr_fd, 0);
+
+  return NULL;
+}
+
+int
+main ()
+{
+  pthread_t pt;
+  int ret;
+
+  if (uintr_register_handler (ui_handler, 0))
+    {
+      printf ("Interrupt handler register error\n");
+      exit (EXIT_FAILURE);
+    }
+
+  ret = uintr_create_fd (0, 0);
+  if (ret < 0)
+    {
+      printf ("Interrupt vector allocation error\n");
+      exit (EXIT_FAILURE);
+    }
+
+  uintr_fd = ret;
+
+  _stui ();
+  printf ("Receiver enabled interrupts\n");
+
+  if (pthread_create (&pt, NULL, &sender_thread, NULL))
+    {
+      printf ("Error creating sender thread\n");
+      exit (EXIT_FAILURE);
+    }
+
+  /* Do some other work */
+  while (!uintr_received); /* bp3 */
+
+  pthread_join (pt, NULL); /* bp1 */
+  close (uintr_fd);
+  uintr_unregister_handler (0);
+
+  printf ("Success\n");
+  exit (EXIT_SUCCESS);
+}
diff --git a/gdb/testsuite/gdb.btrace/uli_events.exp b/gdb/testsuite/gdb.btrace/uli_events.exp
new file mode 100644
index 00000000000..b8e86844c82
--- /dev/null
+++ b/gdb/testsuite/gdb.btrace/uli_events.exp
@@ -0,0 +1,51 @@ 
+# This testcase is part of GDB, the GNU debugger.
+#
+# Copyright 2024 Free Software Foundation, Inc.
+#
+# 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/>.
+
+# Test UIRET and UINTR events.
+
+require allow_btrace_tests allow_btrace_event_trace_tests
+
+set opts [list debug "additional_flags=-muintr -mgeneral-regs-only -minline-all-stringops"]
+
+standard_testfile uli.c
+if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable $opts] != ""} {
+    return -1
+}
+clean_restart $testfile
+
+if ![runto_main] {
+    untested "failed to run to main"
+    return -1
+}
+
+set bp_1 [gdb_get_line_number "bp1"]
+
+gdb_breakpoint $bp_1
+
+gdb_test_no_output "set record function-call-history-size unlimited"
+gdb_test_no_output "set record btrace pt event-tracing on"
+gdb_test_no_output "record btrace pt"
+gdb_continue_to_breakpoint "break at bp_1" ".*$srcfile:$bp_1.*"
+
+# Test function call history.
+# ui_handler can be preceded by any function depending on the scheduling.
+gdb_test_sequence "record function-call-history" "function-call-history" {
+    "\\\[uintr: vector = 0x\[0-9a-fA-F\]+( \\\(#\[a-z\]+\\\))?, ip = 0x\[0-9a-fA-F\]+\\\]"
+    "\[0-9\]+\tui_handler"
+    "\\\[uiret(: ip = 0x\[0-9a-fA-F\]+)?\\\]"
+    "\[0-9\]+\tmain"
+}