From 41ba021c0500201c2478ef6aef8501fcec5ac2e2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:11:30 +0000 Subject: import gdb-7.6.1-114.el7 --- diff --git a/SOURCES/gdb-dlopen-stap-probe-4of9.patch b/SOURCES/gdb-dlopen-stap-probe-4of9.patch index 859c581..116f2a1 100644 --- a/SOURCES/gdb-dlopen-stap-probe-4of9.patch +++ b/SOURCES/gdb-dlopen-stap-probe-4of9.patch @@ -12,13 +12,13 @@ http://sourceware.org/ml/gdb-cvs/2013-06/msg00015.html * objfiles.h (inhibit_section_map_updates): New function declaration. (resume_section_map_updates): Likewise. -Index: gdb-7.6/gdb/NEWS +Index: gdb-7.6.1/gdb/NEWS =================================================================== ---- gdb-7.6.orig/gdb/NEWS 2013-06-10 14:27:02.071184153 +0200 -+++ gdb-7.6/gdb/NEWS 2013-06-10 14:28:34.391145339 +0200 -@@ -4,6 +4,16 @@ - * Newly installed $prefix/bin/gcore acts as a shell interface for the - GDB command gcore. +--- gdb-7.6.1.orig/gdb/NEWS 2018-05-05 17:14:37.604747215 +0200 ++++ gdb-7.6.1/gdb/NEWS 2018-05-05 17:14:51.315869730 +0200 +@@ -14,6 +14,16 @@ + the tradeoff that there is a possibility of false hits being + reported. +* New remote packets + diff --git a/SOURCES/gdb-rhbz1186918-gdbserver-in-container-4of8.patch b/SOURCES/gdb-rhbz1186918-gdbserver-in-container-4of8.patch index f6f18d5..8e4df2b 100644 --- a/SOURCES/gdb-rhbz1186918-gdbserver-in-container-4of8.patch +++ b/SOURCES/gdb-rhbz1186918-gdbserver-in-container-4of8.patch @@ -57,8 +57,8 @@ gdb/gdbserver/ChangeLog: Index: gdb-7.6.1/gdb/Makefile.in =================================================================== ---- gdb-7.6.1.orig/gdb/Makefile.in 2016-03-19 22:00:30.207587896 +0100 -+++ gdb-7.6.1/gdb/Makefile.in 2016-03-19 22:00:42.945679296 +0100 +--- gdb-7.6.1.orig/gdb/Makefile.in 2018-05-18 10:55:27.630976775 +0200 ++++ gdb-7.6.1/gdb/Makefile.in 2018-05-18 10:55:28.422983192 +0200 @@ -840,7 +840,8 @@ common/common-utils.h common/xml-utils.h common/buffer.h common/ptid.h \ common/format.h common/host-defs.h utils.h common/queue.h common/gdb_string.h \ @@ -82,8 +82,8 @@ Index: gdb-7.6.1/gdb/Makefile.in # Index: gdb-7.6.1/gdb/gdbserver/Makefile.in =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/Makefile.in 2016-03-19 22:00:30.208587903 +0100 -+++ gdb-7.6.1/gdb/gdbserver/Makefile.in 2016-03-19 22:00:42.946679303 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/Makefile.in 2018-05-18 10:55:28.251981806 +0200 ++++ gdb-7.6.1/gdb/gdbserver/Makefile.in 2018-05-18 10:55:28.422983192 +0200 @@ -155,7 +155,8 @@ $(srcdir)/common/vec.c $(srcdir)/common/gdb_vecs.c \ $(srcdir)/common/common-utils.c $(srcdir)/common/xml-utils.c \ @@ -106,9 +106,9 @@ Index: gdb-7.6.1/gdb/gdbserver/Makefile.in Index: gdb-7.6.1/gdb/gdbserver/config.in =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/config.in 2016-03-19 22:00:30.208587903 +0100 -+++ gdb-7.6.1/gdb/gdbserver/config.in 2016-03-19 22:00:42.946679303 +0100 -@@ -146,6 +146,9 @@ +--- gdb-7.6.1.orig/gdb/gdbserver/config.in 2018-05-18 10:55:26.840970375 +0200 ++++ gdb-7.6.1/gdb/gdbserver/config.in 2018-05-18 11:00:34.000000000 +0200 +@@ -146,12 +146,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SELINUX_SELINUX_H @@ -118,36 +118,45 @@ Index: gdb-7.6.1/gdb/gdbserver/config.in /* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H + /* Define to 1 if you have the header file. */ + #undef HAVE_SIGNAL_H + ++/* Define to 1 if you have the `socketpair' function. */ ++#undef HAVE_SOCKETPAIR ++ + /* Define to 1 if the system has the type `socklen_t'. */ + #undef HAVE_SOCKLEN_T + Index: gdb-7.6.1/gdb/gdbserver/configure =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/configure 2016-03-19 22:00:30.211587924 +0100 -+++ gdb-7.6.1/gdb/gdbserver/configure 2016-03-19 22:00:42.948679317 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/configure 2018-05-18 10:55:26.841970383 +0200 ++++ gdb-7.6.1/gdb/gdbserver/configure 2018-05-18 11:00:35.421470381 +0200 @@ -4796,7 +4796,7 @@ done -for ac_func in pread pwrite pread64 readlink -+for ac_func in pread pwrite pread64 readlink setns ++for ac_func in pread pwrite pread64 readlink socketpair setns do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" Index: gdb-7.6.1/gdb/gdbserver/configure.ac =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/configure.ac 2016-03-19 22:00:30.212587931 +0100 -+++ gdb-7.6.1/gdb/gdbserver/configure.ac 2016-03-19 22:00:42.948679317 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/configure.ac 2018-05-18 10:55:26.828970278 +0200 ++++ gdb-7.6.1/gdb/gdbserver/configure.ac 2018-05-18 11:00:13.703294429 +0200 @@ -70,7 +70,7 @@ sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl netinet/tcp.h arpa/inet.h sys/wait.h wait.h sys/un.h dnl linux/perf_event.h) -AC_CHECK_FUNCS(pread pwrite pread64 readlink) -+AC_CHECK_FUNCS(pread pwrite pread64 readlink setns) ++AC_CHECK_FUNCS(pread pwrite pread64 readlink socketpair setns) AC_REPLACE_FUNCS(vasprintf vsnprintf) # Check for UST Index: gdb-7.6.1/gdb/gdbserver/configure.srv =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/configure.srv 2016-03-19 22:00:30.213587939 +0100 -+++ gdb-7.6.1/gdb/gdbserver/configure.srv 2016-03-19 22:01:39.361084095 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/configure.srv 2018-05-18 10:55:28.252981814 +0200 ++++ gdb-7.6.1/gdb/gdbserver/configure.srv 2018-05-18 10:55:28.424983208 +0200 @@ -45,7 +45,7 @@ aarch64*-*-linux*) srv_regobj="aarch64.o aarch64-without-fpu.o" @@ -311,7 +320,7 @@ Index: gdb-7.6.1/gdb/gdbserver/configure.srv Index: gdb-7.6.1/gdb/nat/linux-namespaces.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6.1/gdb/nat/linux-namespaces.c 2016-03-19 22:00:42.949679324 +0100 ++++ gdb-7.6.1/gdb/nat/linux-namespaces.c 2018-05-18 10:55:28.424983208 +0200 @@ -0,0 +1,1093 @@ +/* Linux namespaces(7) support. + @@ -1409,7 +1418,7 @@ Index: gdb-7.6.1/gdb/nat/linux-namespaces.c Index: gdb-7.6.1/gdb/nat/linux-namespaces.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6.1/gdb/nat/linux-namespaces.h 2016-03-19 22:00:42.950679331 +0100 ++++ gdb-7.6.1/gdb/nat/linux-namespaces.h 2018-05-18 10:55:28.424983208 +0200 @@ -0,0 +1,78 @@ +/* Linux namespaces(7) support. + @@ -1489,3 +1498,43 @@ Index: gdb-7.6.1/gdb/nat/linux-namespaces.h + char *buf, size_t bufsiz); + +#endif /* LINUX_NAMESPACES_H */ +Index: gdb-7.6.1/gdb/config.in +=================================================================== +--- gdb-7.6.1.orig/gdb/config.in 2018-05-18 10:55:26.838970359 +0200 ++++ gdb-7.6.1/gdb/config.in 2018-05-18 11:00:28.000000000 +0200 +@@ -369,6 +369,9 @@ + /* Define to 1 if you have the `setlocale' function. */ + #undef HAVE_SETLOCALE + ++/* Define to 1 if you have the `setns' function. */ ++#undef HAVE_SETNS ++ + /* Define to 1 if you have the `setpgid' function. */ + #undef HAVE_SETPGID + +Index: gdb-7.6.1/gdb/configure +=================================================================== +--- gdb-7.6.1.orig/gdb/configure 2018-05-18 10:55:26.840970375 +0200 ++++ gdb-7.6.1/gdb/configure 2018-05-18 11:00:30.074427061 +0200 +@@ -10667,7 +10667,7 @@ + sbrk setpgid setpgrp setsid \ + sigaction sigprocmask sigsetmask socketpair syscall \ + ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ +- setrlimit getrlimit posix_madvise waitpid lstat ++ setrlimit getrlimit posix_madvise waitpid lstat setns + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +Index: gdb-7.6.1/gdb/configure.ac +=================================================================== +--- gdb-7.6.1.orig/gdb/configure.ac 2018-05-18 10:55:26.828970278 +0200 ++++ gdb-7.6.1/gdb/configure.ac 2018-05-18 11:00:02.912207003 +0200 +@@ -1365,7 +1365,7 @@ + sbrk setpgid setpgrp setsid \ + sigaction sigprocmask sigsetmask socketpair syscall \ + ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ +- setrlimit getrlimit posix_madvise waitpid lstat]) ++ setrlimit getrlimit posix_madvise waitpid lstat setns]) + AM_LANGINFO_CODESET + + # Check the return and argument types of ptrace. No canned test for diff --git a/SOURCES/gdb-rhbz1347993-aarch64-hw-watchpoint.patch b/SOURCES/gdb-rhbz1347993-aarch64-hw-watchpoint.patch new file mode 100644 index 0000000..8f3afac --- /dev/null +++ b/SOURCES/gdb-rhbz1347993-aarch64-hw-watchpoint.patch @@ -0,0 +1,1761 @@ +commit a3b60e4588606354b93508a0008a5ca04b68fad8 +Author: Jan Kratochvil +Date: Fri May 4 22:22:04 2018 +0200 + + aarch64: PR 19806: watchpoints: false negatives + PR 20207 contiguous ones + + Some unaligned watchpoints were currently missed. + + On old kernels as specified in + kernel RFE: aarch64: ptrace: BAS: Support any contiguous range (edit) + https://sourceware.org/bugzilla/show_bug.cgi?id=20207 + after this patch some other unaligned watchpoints will get reported as false + positives. + + With new kernels all the watchpoints should work exactly. + + There may be a regresion that it now less merges watchpoints so that with + multiple overlapping watchpoints it may run out of the 4 hardware watchpoint + registers. But as discussed in the original thread GDB needs some generic + watchpoints merging framework to be used by all the target specific code. + Even current FSF GDB code does not merge it perfectly. Also with the more + precise watchpoints one can technically merge them less. And I do not think + it matters too much to improve mergeability only for old kernels. + Still even on new kernels some better merging logic would make sense. + + There remains one issue: + kernel-4.15.14-300.fc27.armv7hl + FAIL: gdb.base/watchpoint-unaligned.exp: continue + FAIL: gdb.base/watchpoint-unaligned.exp: continue + (gdb) continue + Continuing. + Unexpected error setting watchpoint: Invalid argument. + (gdb) FAIL: gdb.base/watchpoint-unaligned.exp: continue + But that looks as a kernel bug to me. + (1) It is not a regression by this patch. + (2) It is unrelated to this patch. + + gdb/ChangeLog + 2018-05-04 Jan Kratochvil + Pedro Alves + + PR breakpoints/19806 and support for PR external/20207. + * NEWS: Mention Aarch64 watchpoint improvements. + * aarch64-linux-nat.c (aarch64_linux_stopped_data_address): Fix missed + watchpoints and PR external/20207 watchpoints. + * nat/aarch64-linux-hw-point.c + (kernel_supports_any_contiguous_range): New. + (aarch64_watchpoint_offset): New. + (aarch64_watchpoint_length): Support PR external/20207 watchpoints. + (aarch64_point_encode_ctrl_reg): New parameter offset, new asserts. + (aarch64_point_is_aligned): Support PR external/20207 watchpoints. + (aarch64_align_watchpoint): New parameters aligned_offset_p and + next_addr_orig_p. Support PR external/20207 watchpoints. + (aarch64_downgrade_regs): New. + (aarch64_dr_state_insert_one_point): New parameters offset and + addr_orig. + (aarch64_dr_state_remove_one_point): Likewise. + (aarch64_handle_breakpoint): Update caller. + (aarch64_handle_aligned_watchpoint): Likewise. + (aarch64_handle_unaligned_watchpoint): Support addr_orig and + aligned_offset. + (aarch64_linux_set_debug_regs): Remove const from state. Call + aarch64_downgrade_regs. + (aarch64_show_debug_reg_state): Print also dr_addr_orig_wp. + * nat/aarch64-linux-hw-point.h (DR_CONTROL_LENGTH): Rename to ... + (DR_CONTROL_MASK): ... this. + (struct aarch64_debug_reg_state): New field dr_addr_orig_wp. + (unsigned int aarch64_watchpoint_offset): New prototype. + (aarch64_linux_set_debug_regs): Remove const from state. + * utils.c (align_up, align_down): Move to ... + * common/common-utils.c (align_up, align_down): ... here. + * utils.h (align_up, align_down): Move to ... + * common/common-utils.h (align_up, align_down): ... here. + + gdb/gdbserver/ChangeLog + 2018-05-04 Jan Kratochvil + Pedro Alves + + * linux-aarch64-low.c (aarch64_stopped_data_address): + Likewise. + + gdb/testsuite/ChangeLog + 2018-05-04 Jan Kratochvil + Pedro Alves + + PR breakpoints/19806 and support for PR external/20207. + * gdb.base/watchpoint-unaligned.c: New file. + * gdb.base/watchpoint-unaligned.exp: New file. + +### a/gdb/ChangeLog +### b/gdb/ChangeLog +## -1,3 +1,39 @@ ++2018-05-04 Jan Kratochvil ++ Pedro Alves ++ ++ PR breakpoints/19806 and support for PR external/20207. ++ * NEWS: Mention Aarch64 watchpoint improvements. ++ * aarch64-linux-nat.c (aarch64_linux_stopped_data_address): Fix missed ++ watchpoints and PR external/20207 watchpoints. ++ * nat/aarch64-linux-hw-point.c ++ (kernel_supports_any_contiguous_range): New. ++ (aarch64_watchpoint_offset): New. ++ (aarch64_watchpoint_length): Support PR external/20207 watchpoints. ++ (aarch64_point_encode_ctrl_reg): New parameter offset, new asserts. ++ (aarch64_point_is_aligned): Support PR external/20207 watchpoints. ++ (aarch64_align_watchpoint): New parameters aligned_offset_p and ++ next_addr_orig_p. Support PR external/20207 watchpoints. ++ (aarch64_downgrade_regs): New. ++ (aarch64_dr_state_insert_one_point): New parameters offset and ++ addr_orig. ++ (aarch64_dr_state_remove_one_point): Likewise. ++ (aarch64_handle_breakpoint): Update caller. ++ (aarch64_handle_aligned_watchpoint): Likewise. ++ (aarch64_handle_unaligned_watchpoint): Support addr_orig and ++ aligned_offset. ++ (aarch64_linux_set_debug_regs): Remove const from state. Call ++ aarch64_downgrade_regs. ++ (aarch64_show_debug_reg_state): Print also dr_addr_orig_wp. ++ * nat/aarch64-linux-hw-point.h (DR_CONTROL_LENGTH): Rename to ... ++ (DR_CONTROL_MASK): ... this. ++ (struct aarch64_debug_reg_state): New field dr_addr_orig_wp. ++ (unsigned int aarch64_watchpoint_offset): New prototype. ++ (aarch64_linux_set_debug_regs): Remove const from state. ++ * utils.c (align_up, align_down): Move to ... ++ * common/common-utils.c (align_up, align_down): ... here. ++ * utils.h (align_up, align_down): Move to ... ++ * common/common-utils.h (align_up, align_down): ... here. ++ + 2018-05-04 Joel Brobecker + + * sparc-tdep.c (sparc_structure_return_p): Re-implement to +Index: gdb-7.6.1/gdb/NEWS +=================================================================== +--- gdb-7.6.1.orig/gdb/NEWS 2018-05-05 17:12:48.170769374 +0200 ++++ gdb-7.6.1/gdb/NEWS 2018-05-05 17:12:49.569781872 +0200 +@@ -4,6 +4,16 @@ + * Newly installed $prefix/bin/gcore acts as a shell interface for the + GDB command gcore. + ++* Aarch64/Linux hardware watchpoints improvements ++ ++ Hardware watchpoints on unaligned addresses are now properly ++ supported when running Linux kernel 4.10 or higher: read and access ++ watchpoints are no longer spuriously missed, and all watchpoints ++ lengths between 1 and 8 bytes are supported. On older kernels, ++ watchpoints set on unaligned addresses are no longer missed, with ++ the tradeoff that there is a possibility of false hits being ++ reported. ++ + *** Changes in GDB 7.6 + + * Target record has been renamed to record-full. +Index: gdb-7.6.1/gdb/aarch64-linux-nat.c +=================================================================== +--- gdb-7.6.1.orig/gdb/aarch64-linux-nat.c 2018-05-05 17:12:47.474763150 +0200 ++++ gdb-7.6.1/gdb/aarch64-linux-nat.c 2018-05-05 17:12:49.570781881 +0200 +@@ -45,6 +45,18 @@ + #define TRAP_HWBKPT 0x0004 + #endif + ++/* ptrace expects control registers to be formatted as follows: ++ ++ 31 13 5 3 1 0 ++ +--------------------------------+----------+------+------+----+ ++ | RESERVED (SBZ) | MASK | TYPE | PRIV | EN | ++ +--------------------------------+----------+------+------+----+ ++ ++ The TYPE field is ignored for breakpoints. */ ++ ++#define DR_CONTROL_ENABLED(ctrl) (((ctrl) & 0x1) == 1) ++#define DR_CONTROL_MASK(ctrl) (((ctrl) >> 5) & 0xff) ++ + /* On GNU/Linux, threads are implemented as pseudo-processes, in which + case we may be tracing more than one process at a time. In that + case, inferior_ptid will contain the main process ID and the +@@ -118,6 +130,29 @@ + static int aarch64_num_bp_regs; + static int aarch64_num_wp_regs; + ++/* True if this kernel does not have the bug described by PR ++ external/20207 (Linux >= 4.10). A fixed kernel supports any ++ contiguous range of bits in 8-bit byte DR_CONTROL_MASK. A buggy ++ kernel supports only 0x01, 0x03, 0x0f and 0xff. We start by ++ assuming the bug is fixed, and then detect the bug at ++ PTRACE_SETREGSET time. */ ++static int kernel_supports_any_contiguous_range = 1; ++ ++/* Return starting byte 0..7 incl. of a watchpoint encoded by CTRL. */ ++ ++static unsigned int ++aarch64_watchpoint_offset (unsigned int ctrl) ++{ ++ uint8_t mask = DR_CONTROL_MASK (ctrl); ++ unsigned retval; ++ ++ /* Shift out bottom zeros. */ ++ for (retval = 0; mask && (mask & 1) == 0; ++retval) ++ mask >>= 1; ++ ++ return retval; ++} ++ + /* Debugging of hardware breakpoint/watchpoint support. */ + + static int debug_hw_points; +@@ -184,7 +219,10 @@ + unsigned int dr_ref_count_bp[AARCH64_HBP_MAX_NUM]; + + /* hardware watchpoint */ ++ /* Address aligned down to AARCH64_HWP_ALIGNMENT. */ + CORE_ADDR dr_addr_wp[AARCH64_HWP_MAX_NUM]; ++ /* Address as entered by user without any forced alignment. */ ++ CORE_ADDR dr_addr_orig_wp[AARCH64_HWP_MAX_NUM]; + unsigned int dr_ctrl_wp[AARCH64_HWP_MAX_NUM]; + unsigned int dr_ref_count_wp[AARCH64_HWP_MAX_NUM]; + }; +@@ -299,11 +337,76 @@ + dr_changed_t dr_changed_wp; + }; + ++/* Reconfigure STATE to be compatible with Linux kernels with the PR ++ external/20207 bug. This is called when ++ KERNEL_SUPPORTS_ANY_CONTIGUOUS_RANGE transitions to false. Note we ++ don't try to support combining watchpoints with matching (and thus ++ shared) masks, as it's too late when we get here. On buggy ++ kernels, GDB will try to first setup the perfect matching ranges, ++ which will run out of registers before this function can merge ++ them. It doesn't look like worth the effort to improve that, given ++ eventually buggy kernels will be phased out. */ ++ ++static void aarch64_notify_debug_reg_change (const struct aarch64_debug_reg_state *state, int is_watchpoint, unsigned int idx); ++ ++static void ++aarch64_downgrade_regs (struct aarch64_debug_reg_state *state) ++{ ++ int i; ++ ++ for (i = 0; i < aarch64_num_wp_regs; ++i) ++ if ((state->dr_ctrl_wp[i] & 1) != 0) ++ { ++ uint8_t mask_orig; ++ static const uint8_t old_valid[] = { 0x01, 0x03, 0x0f, 0xff }; ++ int old_validi; ++ uint8_t mask = 0; ++ int j; ++ ++ gdb_assert (state->dr_ref_count_wp[i] != 0); ++ mask_orig = (state->dr_ctrl_wp[i] >> 5) & 0xff; ++ gdb_assert (mask_orig != 0); ++ for (old_validi = 0; old_validi < sizeof(old_valid) / sizeof (*old_valid); old_validi++) { ++ const uint8_t old_mask = old_valid[old_validi]; ++ if (mask_orig <= old_mask) ++ { ++ mask = old_mask; ++ break; ++ } ++ } ++ gdb_assert (mask != 0); ++ ++ /* No update needed for this watchpoint? */ ++ if (mask == mask_orig) ++ continue; ++ state->dr_ctrl_wp[i] |= mask << 5; ++ state->dr_addr_wp[i] ++ = align_down (state->dr_addr_wp[i], AARCH64_HWP_ALIGNMENT); ++ ++ /* Try to match duplicate entries. */ ++ for (j = 0; j < i; ++j) ++ if ((state->dr_ctrl_wp[j] & 1) != 0 ++ && state->dr_addr_wp[j] == state->dr_addr_wp[i] ++ && state->dr_addr_orig_wp[j] == state->dr_addr_orig_wp[i] ++ && state->dr_ctrl_wp[j] == state->dr_ctrl_wp[i]) ++ { ++ state->dr_ref_count_wp[j] += state->dr_ref_count_wp[i]; ++ state->dr_ref_count_wp[i] = 0; ++ state->dr_addr_wp[i] = 0; ++ state->dr_addr_orig_wp[i] = 0; ++ state->dr_ctrl_wp[i] &= ~1; ++ break; ++ } ++ ++ aarch64_notify_debug_reg_change (state, 1 /* is_watchpoint */, i); ++ } ++} ++ + /* Call ptrace to set the thread TID's hardware breakpoint/watchpoint + registers with data from *STATE. */ + + static void +-aarch64_linux_set_debug_regs (const struct aarch64_debug_reg_state *state, ++aarch64_linux_set_debug_regs (struct aarch64_debug_reg_state *state, + int tid, int watchpoint) + { + int i, count; +@@ -331,7 +434,18 @@ + if (ptrace (PTRACE_SETREGSET, tid, + watchpoint ? NT_ARM_HW_WATCH : NT_ARM_HW_BREAK, + (void *) &iov)) +- error (_("Unexpected error setting hardware debug registers")); ++ { ++ /* Handle Linux kernels with the PR external/20207 bug. */ ++ if (watchpoint && errno == EINVAL ++ && kernel_supports_any_contiguous_range) ++ { ++ kernel_supports_any_contiguous_range = 0; ++ aarch64_downgrade_regs (state); ++ aarch64_linux_set_debug_regs (state, tid, watchpoint); ++ return; ++ } ++ error (_("Unexpected error setting hardware debug registers")); ++ } + } + + struct aarch64_dr_update_callback_param +@@ -452,8 +566,8 @@ + fprintf_unfiltered (gdb_stdlog, "\tWATCHPOINTs:\n"); + for (i = 0; i < aarch64_num_wp_regs; i++) + fprintf_unfiltered (gdb_stdlog, +- "\tWP%d: addr=0x%08lx, ctrl=0x%08x, ref.count=%d\n", +- i, state->dr_addr_wp[i], ++ "\tWP%d: addr=0x%08lx (orig=0x%08lx), ctrl=0x%08x, ref.count=%d\n", ++ i, state->dr_addr_wp[i], state->dr_addr_orig_wp[i], + state->dr_ctrl_wp[i], state->dr_ref_count_wp[i]); + } + +@@ -850,28 +964,30 @@ + } + + /* Given the (potentially unaligned) watchpoint address in ADDR and +- length in LEN, return the aligned address and aligned length in +- *ALIGNED_ADDR_P and *ALIGNED_LEN_P, respectively. The returned +- aligned address and length will be valid values to write to the +- hardware watchpoint value and control registers. ++ length in LEN, return the aligned address, offset from that base ++ address, and aligned length in *ALIGNED_ADDR_P, *ALIGNED_OFFSET_P ++ and *ALIGNED_LEN_P, respectively. The returned values will be ++ valid values to write to the hardware watchpoint value and control ++ registers. + + The given watchpoint may get truncated if more than one hardware + register is needed to cover the watched region. *NEXT_ADDR_P + and *NEXT_LEN_P, if non-NULL, will return the address and length + of the remaining part of the watchpoint (which can be processed +- by calling this routine again to generate another aligned address +- and length pair. ++ by calling this routine again to generate another aligned address, ++ offset and length tuple. + + See the comment above the function of the same name in + gdbserver/linux-aarch64-low.c for more information. */ + + static void + aarch64_align_watchpoint (CORE_ADDR addr, int len, CORE_ADDR *aligned_addr_p, +- int *aligned_len_p, CORE_ADDR *next_addr_p, +- int *next_len_p) ++ int *aligned_offset_p, int *aligned_len_p, ++ CORE_ADDR *next_addr_p, int *next_len_p, ++ CORE_ADDR *next_addr_orig_p) + { + int aligned_len; +- unsigned int offset; ++ unsigned int offset, aligned_offset; + CORE_ADDR aligned_addr; + const unsigned int alignment = AARCH64_HWP_ALIGNMENT; + const unsigned int max_wp_len = AARCH64_HWP_MAX_LEN_PER_REG; +@@ -882,10 +998,12 @@ + if (len <= 0) + return; + +- /* Address to be put into the hardware watchpoint value register +- must be aligned. */ ++ /* The address put into the hardware watchpoint value register must ++ be aligned. */ + offset = addr & (alignment - 1); + aligned_addr = addr - offset; ++ aligned_offset ++ = kernel_supports_any_contiguous_range ? addr & (alignment - 1) : 0; + + gdb_assert (offset >= 0 && offset < alignment); + gdb_assert (aligned_addr >= 0 && aligned_addr <= addr); +@@ -893,9 +1011,10 @@ + + if (offset + len >= max_wp_len) + { +- /* Need more than one watchpoint registers; truncate it at the ++ /* Need more than one watchpoint register; truncate at the + alignment boundary. */ +- aligned_len = max_wp_len; ++ aligned_len ++ = max_wp_len - (kernel_supports_any_contiguous_range ? offset : 0); + len -= (max_wp_len - offset); + addr += (max_wp_len - offset); + gdb_assert ((addr & (alignment - 1)) == 0); +@@ -908,19 +1027,24 @@ + aligned_len_array[AARCH64_HWP_MAX_LEN_PER_REG] = + { 1, 2, 4, 4, 8, 8, 8, 8 }; + +- aligned_len = aligned_len_array[offset + len - 1]; ++ aligned_len = (kernel_supports_any_contiguous_range ++ ? len : aligned_len_array[offset + len - 1]); + addr += len; + len = 0; + } + + if (aligned_addr_p) + *aligned_addr_p = aligned_addr; ++ if (aligned_offset_p) ++ *aligned_offset_p = aligned_offset; + if (aligned_len_p) + *aligned_len_p = aligned_len; + if (next_addr_p) + *next_addr_p = addr; + if (next_len_p) + *next_len_p = len; ++ if (next_addr_orig_p) ++ *next_addr_orig_p = align_down (*next_addr_orig_p + alignment, alignment); + } + + /* Returns the number of hardware watchpoints of type TYPE that we can +@@ -946,41 +1070,29 @@ + return 1; + } + +-/* ptrace expects control registers to be formatted as follows: +- +- 31 13 5 3 1 0 +- +--------------------------------+----------+------+------+----+ +- | RESERVED (SBZ) | LENGTH | TYPE | PRIV | EN | +- +--------------------------------+----------+------+------+----+ +- +- The TYPE field is ignored for breakpoints. */ +- +-#define DR_CONTROL_ENABLED(ctrl) (((ctrl) & 0x1) == 1) +-#define DR_CONTROL_LENGTH(ctrl) (((ctrl) >> 5) & 0xff) +- + /* Utility function that returns the length in bytes of a watchpoint + according to the content of a hardware debug control register CTRL. +- Note that the kernel currently only supports the following Byte +- Address Select (BAS) values: 0x1, 0x3, 0xf and 0xff, which means +- that for a hardware watchpoint, its valid length can only be 1 +- byte, 2 bytes, 4 bytes or 8 bytes. */ ++ Any contiguous range of bytes in CTRL is supported. The returned ++ value can be between 0..8 (inclusive). */ + + static inline unsigned int + aarch64_watchpoint_length (unsigned int ctrl) + { +- switch (DR_CONTROL_LENGTH (ctrl)) +- { +- case 0x01: +- return 1; +- case 0x03: +- return 2; +- case 0x0f: +- return 4; +- case 0xff: +- return 8; +- default: +- return 0; +- } ++ uint8_t mask = DR_CONTROL_MASK (ctrl); ++ unsigned retval; ++ ++ /* Shift out bottom zeros. */ ++ mask >>= aarch64_watchpoint_offset (ctrl); ++ ++ /* Count bottom ones. */ ++ for (retval = 0; (mask & 1) != 0; ++retval) ++ mask >>= 1; ++ ++ if (mask != 0) ++ error (_("Unexpected hardware watchpoint length register value 0x%x"), ++ DR_CONTROL_MASK (ctrl)); ++ ++ return retval; + } + + /* Given the hardware breakpoint or watchpoint type TYPE and its +@@ -988,10 +1100,13 @@ + breakpoint/watchpoint control register. */ + + static unsigned int +-aarch64_point_encode_ctrl_reg (int type, int len) ++aarch64_point_encode_ctrl_reg (int type, int offset, int len) + { + unsigned int ctrl, ttype; + ++ gdb_assert (offset == 0 || kernel_supports_any_contiguous_range); ++ gdb_assert (offset + len <= AARCH64_HWP_MAX_LEN_PER_REG); ++ + /* type */ + switch (type) + { +@@ -1012,8 +1127,8 @@ + } + ctrl = ttype << 3; + +- /* length bitmask */ +- ctrl |= ((1 << len) - 1) << 5; ++ /* offset and length bitmask */ ++ ctrl |= ((1 << len) - 1) << (5 + offset); + /* enabled at el0 */ + ctrl |= (2 << 1) | 1; + +@@ -1042,7 +1157,10 @@ + if (addr & (alignment - 1)) + return 0; + +- if (len != 8 && len != 4 && len != 2 && len != 1) ++ if ((!kernel_supports_any_contiguous_range ++ && len != 8 && len != 4 && len != 2 && len != 1) ++ || (kernel_supports_any_contiguous_range ++ && (len < 1 || len > 8))) + return 0; + + return 1; +@@ -1053,11 +1171,12 @@ + + static int + aarch64_dr_state_insert_one_point (struct aarch64_debug_reg_state *state, +- int type, CORE_ADDR addr, int len) ++ int type, CORE_ADDR addr, int offset, int len, ++ CORE_ADDR addr_orig) + { + int i, idx, num_regs, is_watchpoint; + unsigned int ctrl, *dr_ctrl_p, *dr_ref_count; +- CORE_ADDR *dr_addr_p; ++ CORE_ADDR *dr_addr_p, *dr_addr_orig_p; + + /* Set up state pointers. */ + is_watchpoint = (type != hw_execute); +@@ -1066,6 +1185,7 @@ + { + num_regs = aarch64_num_wp_regs; + dr_addr_p = state->dr_addr_wp; ++ dr_addr_orig_p = state->dr_addr_orig_wp; + dr_ctrl_p = state->dr_ctrl_wp; + dr_ref_count = state->dr_ref_count_wp; + } +@@ -1073,11 +1193,12 @@ + { + num_regs = aarch64_num_bp_regs; + dr_addr_p = state->dr_addr_bp; ++ dr_addr_orig_p = NULL; + dr_ctrl_p = state->dr_ctrl_bp; + dr_ref_count = state->dr_ref_count_bp; + } + +- ctrl = aarch64_point_encode_ctrl_reg (type, len); ++ ctrl = aarch64_point_encode_ctrl_reg (type, offset, len); + + /* Find an existing or free register in our cache. */ + idx = -1; +@@ -1089,7 +1210,9 @@ + idx = i; + /* no break; continue hunting for an existing one. */ + } +- else if (dr_addr_p[i] == addr && dr_ctrl_p[i] == ctrl) ++ else if (dr_addr_p[i] == addr ++ && (dr_addr_orig_p == NULL || dr_addr_orig_p[i] == addr_orig) ++ && dr_ctrl_p[i] == ctrl) + { + gdb_assert (dr_ref_count[i] != 0); + idx = i; +@@ -1106,6 +1229,8 @@ + { + /* new entry */ + dr_addr_p[idx] = addr; ++ if (dr_addr_orig_p != NULL) ++ dr_addr_orig_p[idx] = addr_orig; + dr_ctrl_p[idx] = ctrl; + dr_ref_count[idx] = 1; + /* Notify the change. */ +@@ -1125,11 +1250,12 @@ + + static int + aarch64_dr_state_remove_one_point (struct aarch64_debug_reg_state *state, +- int type, CORE_ADDR addr, int len) ++ int type, CORE_ADDR addr, int offset, int len, ++ CORE_ADDR addr_orig) + { + int i, num_regs, is_watchpoint; + unsigned int ctrl, *dr_ctrl_p, *dr_ref_count; +- CORE_ADDR *dr_addr_p; ++ CORE_ADDR *dr_addr_p, *dr_addr_orig_p; + + /* Set up state pointers. */ + is_watchpoint = (type != hw_execute); +@@ -1138,6 +1264,7 @@ + { + num_regs = aarch64_num_wp_regs; + dr_addr_p = state->dr_addr_wp; ++ dr_addr_orig_p = state->dr_addr_orig_wp; + dr_ctrl_p = state->dr_ctrl_wp; + dr_ref_count = state->dr_ref_count_wp; + } +@@ -1145,15 +1272,18 @@ + { + num_regs = aarch64_num_bp_regs; + dr_addr_p = state->dr_addr_bp; ++ dr_addr_orig_p = NULL; + dr_ctrl_p = state->dr_ctrl_bp; + dr_ref_count = state->dr_ref_count_bp; + } + +- ctrl = aarch64_point_encode_ctrl_reg (type, len); ++ ctrl = aarch64_point_encode_ctrl_reg (type, offset, len); + + /* Find the entry that matches the ADDR and CTRL. */ + for (i = 0; i < num_regs; ++i) +- if (dr_addr_p[i] == addr && dr_ctrl_p[i] == ctrl) ++ if (dr_addr_p[i] == addr ++ && (dr_addr_orig_p == NULL || dr_addr_orig_p[i] == addr_orig) ++ && dr_ctrl_p[i] == ctrl) + { + gdb_assert (dr_ref_count[i] != 0); + break; +@@ -1169,6 +1299,8 @@ + /* Clear the enable bit. */ + ctrl &= ~1; + dr_addr_p[i] = 0; ++ if (dr_addr_orig_p != NULL) ++ dr_addr_orig_p[i] = 0; + dr_ctrl_p[i] = ctrl; + /* Notify the change. */ + aarch64_notify_debug_reg_change (state, is_watchpoint, i); +@@ -1192,9 +1324,9 @@ + state = aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid)); + + if (is_insert) +- return aarch64_dr_state_insert_one_point (state, type, addr, len); ++ return aarch64_dr_state_insert_one_point (state, type, addr, 0, len, -1); + else +- return aarch64_dr_state_remove_one_point (state, type, addr, len); ++ return aarch64_dr_state_remove_one_point (state, type, addr, 0, len, -1); + } + + /* Insert a hardware-assisted breakpoint at BP_TGT->placed_address. +@@ -1271,9 +1403,9 @@ + = aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid)); + + if (is_insert) +- return aarch64_dr_state_insert_one_point (state, type, addr, len); ++ return aarch64_dr_state_insert_one_point (state, type, addr, 0, len, addr); + else +- return aarch64_dr_state_remove_one_point (state, type, addr, len); ++ return aarch64_dr_state_remove_one_point (state, type, addr, 0, len, addr); + } + + /* Insert/remove unaligned watchpoint by calling +@@ -1289,28 +1421,41 @@ + { + struct aarch64_debug_reg_state *state + = aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid)); ++ CORE_ADDR addr_orig = addr; + + while (len > 0) + { + CORE_ADDR aligned_addr; +- int aligned_len, ret; ++ int aligned_offset, aligned_len, ret; ++ CORE_ADDR addr_orig_next = addr_orig; + +- aarch64_align_watchpoint (addr, len, &aligned_addr, &aligned_len, +- &addr, &len); ++ aarch64_align_watchpoint (addr, len, &aligned_addr, &aligned_offset, ++ &aligned_len, &addr, &len, &addr_orig_next); + + if (is_insert) + ret = aarch64_dr_state_insert_one_point (state, type, aligned_addr, +- aligned_len); ++ aligned_offset, ++ aligned_len, addr_orig); + else + ret = aarch64_dr_state_remove_one_point (state, type, aligned_addr, +- aligned_len); ++ aligned_offset, ++ aligned_len, addr_orig); + + if (debug_hw_points) + fprintf_unfiltered (gdb_stdlog, + "handle_unaligned_watchpoint: is_insert: %d\n" + " aligned_addr: 0x%08lx, aligned_len: %d\n" +-" next_addr: 0x%08lx, next_len: %d\n", +- is_insert, aligned_addr, aligned_len, addr, len); ++" addr_orig: %s\n" ++" " ++" next_addr: %s, next_len: %d\n" ++" " ++" addr_orig_next: %s\n", ++ is_insert, aligned_addr, ++ aligned_len, core_addr_to_string_nz (addr_orig), ++ core_addr_to_string_nz (addr), len, ++ core_addr_to_string_nz (addr_orig_next)); ++ ++ addr_orig = addr_orig_next; + + if (ret != 0) + return ret; +@@ -1456,16 +1601,38 @@ + state = aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid)); + for (i = aarch64_num_wp_regs - 1; i >= 0; --i) + { ++ const unsigned int offset ++ = aarch64_watchpoint_offset (state->dr_ctrl_wp[i]); + const unsigned int len = aarch64_watchpoint_length (state->dr_ctrl_wp[i]); + const CORE_ADDR addr_trap = (CORE_ADDR) siginfo.si_addr; +- const CORE_ADDR addr_watch = state->dr_addr_wp[i]; ++ const CORE_ADDR addr_watch = state->dr_addr_wp[i] + offset; ++ const CORE_ADDR addr_watch_aligned = align_down (state->dr_addr_wp[i], 8); ++ const CORE_ADDR addr_orig = state->dr_addr_orig_wp[i]; + + if (state->dr_ref_count_wp[i] + && DR_CONTROL_ENABLED (state->dr_ctrl_wp[i]) +- && addr_trap >= addr_watch ++ && addr_trap >= addr_watch_aligned + && addr_trap < addr_watch + len) + { +- *addr_p = addr_trap; ++ /* ADDR_TRAP reports the first address of the memory range ++ accessed by the CPU, regardless of what was the memory ++ range watched. Thus, a large CPU access that straddles ++ the ADDR_WATCH..ADDR_WATCH+LEN range may result in an ++ ADDR_TRAP that is lower than the ++ ADDR_WATCH..ADDR_WATCH+LEN range. E.g.: ++ ++ addr: | 4 | 5 | 6 | 7 | 8 | ++ |---- range watched ----| ++ |----------- range accessed ------------| ++ ++ In this case, ADDR_TRAP will be 4. ++ ++ To match a watchpoint known to GDB core, we must never ++ report *ADDR_P outside of any ADDR_WATCH..ADDR_WATCH+LEN ++ range. ADDR_WATCH <= ADDR_TRAP < ADDR_ORIG is a false ++ positive on kernels older than 4.10. See PR ++ external/20207. */ ++ *addr_p = addr_orig; + return 1; + } + } +Index: gdb-7.6.1/gdb/common/common-utils.c +=================================================================== +--- gdb-7.6.1.orig/gdb/common/common-utils.c 2013-02-14 18:11:41.000000000 +0100 ++++ gdb-7.6.1/gdb/common/common-utils.c 2018-05-05 17:12:49.570781881 +0200 +@@ -161,3 +161,23 @@ + p[len] = 0; + return p; + } ++ ++/* See common/common-utils.h. */ ++ ++ULONGEST ++align_up (ULONGEST v, int n) ++{ ++ /* Check that N is really a power of two. */ ++ gdb_assert (n && (n & (n-1)) == 0); ++ return (v + n - 1) & -n; ++} ++ ++/* See common/common-utils.h. */ ++ ++ULONGEST ++align_down (ULONGEST v, int n) ++{ ++ /* Check that N is really a power of two. */ ++ gdb_assert (n && (n & (n-1)) == 0); ++ return (v & -n); ++} +Index: gdb-7.6.1/gdb/common/common-utils.h +=================================================================== +--- gdb-7.6.1.orig/gdb/common/common-utils.h 2013-02-14 18:11:41.000000000 +0100 ++++ gdb-7.6.1/gdb/common/common-utils.h 2018-05-05 17:12:49.570781881 +0200 +@@ -53,4 +53,36 @@ + + char *savestring (const char *ptr, size_t len); + ++/* Ensure that V is aligned to an N byte boundary (B's assumed to be a ++ power of 2). Round up/down when necessary. Examples of correct ++ use include: ++ ++ addr = align_up (addr, 8); -- VALUE needs 8 byte alignment ++ write_memory (addr, value, len); ++ addr += len; ++ ++ and: ++ ++ sp = align_down (sp - len, 16); -- Keep SP 16 byte aligned ++ write_memory (sp, value, len); ++ ++ Note that uses such as: ++ ++ write_memory (addr, value, len); ++ addr += align_up (len, 8); ++ ++ and: ++ ++ sp -= align_up (len, 8); ++ write_memory (sp, value, len); ++ ++ are typically not correct as they don't ensure that the address (SP ++ or ADDR) is correctly aligned (relying on previous alignment to ++ keep things right). This is also why the methods are called ++ "align_..." instead of "round_..." as the latter reads better with ++ this incorrect coding style. */ ++ ++extern ULONGEST align_up (ULONGEST v, int n); ++extern ULONGEST align_down (ULONGEST v, int n); ++ + #endif +Index: gdb-7.6.1/gdb/gdbserver/linux-aarch64-low.c +=================================================================== +--- gdb-7.6.1.orig/gdb/gdbserver/linux-aarch64-low.c 2018-05-05 17:12:47.501763392 +0200 ++++ gdb-7.6.1/gdb/gdbserver/linux-aarch64-low.c 2018-05-05 17:12:49.570781881 +0200 +@@ -40,6 +40,18 @@ + #include + #endif + ++/* ptrace expects control registers to be formatted as follows: ++ ++ 31 13 5 3 1 0 ++ +--------------------------------+----------+------+------+----+ ++ | RESERVED (SBZ) | MASK | TYPE | PRIV | EN | ++ +--------------------------------+----------+------+------+----+ ++ ++ The TYPE field is ignored for breakpoints. */ ++ ++#define DR_CONTROL_ENABLED(ctrl) (((ctrl) & 0x1) == 1) ++#define DR_CONTROL_MASK(ctrl) (((ctrl) >> 5) & 0xff) ++ + #define AARCH64_X_REGS_NUM 31 + #define AARCH64_V_REGS_NUM 32 + #define AARCH64_X0_REGNO 0 +@@ -170,7 +182,10 @@ + unsigned int dr_ref_count_bp[AARCH64_HBP_MAX_NUM]; + + /* hardware watchpoint */ ++ /* Address aligned down to AARCH64_HWP_ALIGNMENT. */ + CORE_ADDR dr_addr_wp[AARCH64_HWP_MAX_NUM]; ++ /* Address as entered by user without any forced alignment. */ ++ CORE_ADDR dr_addr_orig_wp[AARCH64_HWP_MAX_NUM]; + unsigned int dr_ctrl_wp[AARCH64_HWP_MAX_NUM]; + unsigned int dr_ref_count_wp[AARCH64_HWP_MAX_NUM]; + }; +@@ -311,6 +326,29 @@ + supply_register (regcache, AARCH64_V0_REGNO + i, ®set->vregs[i]); + } + ++/* True if this kernel does not have the bug described by PR ++ external/20207 (Linux >= 4.10). A fixed kernel supports any ++ contiguous range of bits in 8-bit byte DR_CONTROL_MASK. A buggy ++ kernel supports only 0x01, 0x03, 0x0f and 0xff. We start by ++ assuming the bug is fixed, and then detect the bug at ++ PTRACE_SETREGSET time. */ ++static int kernel_supports_any_contiguous_range = 1; ++ ++/* Return starting byte 0..7 incl. of a watchpoint encoded by CTRL. */ ++ ++static unsigned int ++aarch64_watchpoint_offset (unsigned int ctrl) ++{ ++ uint8_t mask = DR_CONTROL_MASK (ctrl); ++ unsigned retval; ++ ++ /* Shift out bottom zeros. */ ++ for (retval = 0; mask && (mask & 1) == 0; ++retval) ++ mask >>= 1; ++ ++ return retval; ++} ++ + /* Debugging of hardware breakpoint/watchpoint support. */ + extern int debug_hw_points; + +@@ -383,8 +421,8 @@ + + fprintf (stderr, "\tWATCHPOINTs:\n"); + for (i = 0; i < aarch64_num_wp_regs; i++) +- fprintf (stderr, "\tWP%d: addr=0x%s, ctrl=0x%08x, ref.count=%d\n", +- i, paddress (state->dr_addr_wp[i]), ++ fprintf (stderr, "\tWP%d: addr=0x%s (orig=0x%s), ctrl=0x%08x, ref.count=%d\n", ++ i, paddress (state->dr_addr_wp[i]), paddress (state->dr_addr_orig_wp[i]), + state->dr_ctrl_wp[i], state->dr_ref_count_wp[i]); + } + +@@ -422,27 +460,27 @@ + + /* Utility function that returns the length in bytes of a watchpoint + according to the content of a hardware debug control register CTRL. +- Note that the kernel currently only supports the following Byte +- Address Select (BAS) values: 0x1, 0x3, 0xf and 0xff, which means +- that for a hardware watchpoint, its valid length can only be 1 +- byte, 2 bytes, 4 bytes or 8 bytes. */ ++ Any contiguous range of bytes in CTRL is supported. The returned ++ value can be between 0..8 (inclusive). */ + + static inline unsigned int + aarch64_watchpoint_length (unsigned int ctrl) + { +- switch (DR_CONTROL_LENGTH (ctrl)) +- { +- case 0x01: +- return 1; +- case 0x03: +- return 2; +- case 0x0f: +- return 4; +- case 0xff: +- return 8; +- default: +- return 0; +- } ++ uint8_t mask = DR_CONTROL_MASK (ctrl); ++ unsigned retval; ++ ++ /* Shift out bottom zeros. */ ++ mask >>= aarch64_watchpoint_offset (ctrl); ++ ++ /* Count bottom ones. */ ++ for (retval = 0; (mask & 1) != 0; ++retval) ++ mask >>= 1; ++ ++ if (mask != 0) ++ error (_("Unexpected hardware watchpoint length register value 0x%x"), ++ DR_CONTROL_MASK (ctrl)); ++ ++ return retval; + } + + /* Given the hardware breakpoint or watchpoint type TYPE and its +@@ -450,14 +488,17 @@ + breakpoint/watchpoint control register. */ + + static unsigned int +-aarch64_point_encode_ctrl_reg (enum target_point_type type, int len) ++aarch64_point_encode_ctrl_reg (enum target_point_type type, int offset, int len) + { + unsigned int ctrl; + ++ gdb_assert (offset == 0 || kernel_supports_any_contiguous_range); ++ gdb_assert (offset + len <= AARCH64_HWP_MAX_LEN_PER_REG); ++ + /* type */ + ctrl = type << 3; +- /* length bitmask */ +- ctrl |= ((1 << len) - 1) << 5; ++ /* offset and length bitmask */ ++ ctrl |= ((1 << len) - 1) << (5 + offset); + /* enabled at el0 */ + ctrl |= (2 << 1) | 1; + +@@ -486,17 +527,23 @@ + if (addr & (alignment - 1)) + return 0; + +- if (len != 8 && len != 4 && len != 2 && len != 1) ++ if ((!kernel_supports_any_contiguous_range ++ && len != 8 && len != 4 && len != 2 && len != 1) ++ || (kernel_supports_any_contiguous_range ++ && (len < 1 || len > 8))) + return 0; + + return 1; + } + + /* Given the (potentially unaligned) watchpoint address in ADDR and +- length in LEN, return the aligned address and aligned length in +- *ALIGNED_ADDR_P and *ALIGNED_LEN_P, respectively. The returned +- aligned address and length will be valid to be written to the +- hardware watchpoint value and control registers. See the comment ++ length in LEN, return the aligned address, offset from that base ++ address, and aligned length in *ALIGNED_ADDR_P, *ALIGNED_OFFSET_P ++ and *ALIGNED_LEN_P, respectively. The returned values will be ++ valid values to write to the hardware watchpoint value and control ++ registers. ++ ++ See the comment + above aarch64_point_is_aligned for the information about the + alignment requirement. The given watchpoint may get truncated if + more than one hardware register is needed to cover the watched +@@ -533,11 +580,12 @@ + + static void + aarch64_align_watchpoint (CORE_ADDR addr, int len, CORE_ADDR *aligned_addr_p, +- int *aligned_len_p, CORE_ADDR *next_addr_p, +- int *next_len_p) ++ int *aligned_offset_p, int *aligned_len_p, ++ CORE_ADDR *next_addr_p, int *next_len_p, ++ CORE_ADDR *next_addr_orig_p) + { + int aligned_len; +- unsigned int offset; ++ unsigned int offset, aligned_offset; + CORE_ADDR aligned_addr; + const unsigned int alignment = AARCH64_HWP_ALIGNMENT; + const unsigned int max_wp_len = AARCH64_HWP_MAX_LEN_PER_REG; +@@ -548,10 +596,12 @@ + if (len <= 0) + return; + +- /* Address to be put into the hardware watchpoint value register +- must be aligned. */ ++ /* The address put into the hardware watchpoint value register must ++ be aligned. */ + offset = addr & (alignment - 1); + aligned_addr = addr - offset; ++ aligned_offset ++ = kernel_supports_any_contiguous_range ? addr & (alignment - 1) : 0; + + gdb_assert (offset >= 0 && offset < alignment); + gdb_assert (aligned_addr >= 0 && aligned_addr <= addr); +@@ -559,9 +609,10 @@ + + if (offset + len >= max_wp_len) + { +- /* Need more than one watchpoint registers; truncate it at the ++ /* Need more than one watchpoint register; truncate at the + alignment boundary. */ +- aligned_len = max_wp_len; ++ aligned_len ++ = max_wp_len - (kernel_supports_any_contiguous_range ? offset : 0); + len -= (max_wp_len - offset); + addr += (max_wp_len - offset); + gdb_assert ((addr & (alignment - 1)) == 0); +@@ -574,26 +625,96 @@ + aligned_len_array[AARCH64_HWP_MAX_LEN_PER_REG] = + { 1, 2, 4, 4, 8, 8, 8, 8 }; + +- aligned_len = aligned_len_array[offset + len - 1]; ++ aligned_len = (kernel_supports_any_contiguous_range ++ ? len : aligned_len_array[offset + len - 1]); + addr += len; + len = 0; + } + + if (aligned_addr_p != NULL) + *aligned_addr_p = aligned_addr; ++ if (aligned_offset_p) ++ *aligned_offset_p = aligned_offset; + if (aligned_len_p != NULL) + *aligned_len_p = aligned_len; + if (next_addr_p != NULL) + *next_addr_p = addr; + if (next_len_p != NULL) + *next_len_p = len; ++ if (next_addr_orig_p) ++ *next_addr_orig_p = align_down (*next_addr_orig_p + alignment, alignment); ++} ++ ++/* Reconfigure STATE to be compatible with Linux kernels with the PR ++ external/20207 bug. This is called when ++ KERNEL_SUPPORTS_ANY_CONTIGUOUS_RANGE transitions to false. Note we ++ don't try to support combining watchpoints with matching (and thus ++ shared) masks, as it's too late when we get here. On buggy ++ kernels, GDB will try to first setup the perfect matching ranges, ++ which will run out of registers before this function can merge ++ them. It doesn't look like worth the effort to improve that, given ++ eventually buggy kernels will be phased out. */ ++ ++static void aarch64_notify_debug_reg_change (const struct aarch64_debug_reg_state *state, int is_watchpoint, unsigned int idx); ++ ++static void ++aarch64_downgrade_regs (struct aarch64_debug_reg_state *state) ++{ ++ int i; ++ ++ for (i = 0; i < aarch64_num_wp_regs; ++i) ++ if ((state->dr_ctrl_wp[i] & 1) != 0) ++ { ++ uint8_t mask_orig; ++ static const uint8_t old_valid[] = { 0x01, 0x03, 0x0f, 0xff }; ++ int old_validi; ++ uint8_t mask = 0; ++ int j; ++ ++ gdb_assert (state->dr_ref_count_wp[i] != 0); ++ mask_orig = (state->dr_ctrl_wp[i] >> 5) & 0xff; ++ gdb_assert (mask_orig != 0); ++ for (old_validi = 0; old_validi < sizeof(old_valid) / sizeof (*old_valid); old_validi++) { ++ const uint8_t old_mask = old_valid[old_validi]; ++ if (mask_orig <= old_mask) ++ { ++ mask = old_mask; ++ break; ++ } ++ } ++ gdb_assert (mask != 0); ++ ++ /* No update needed for this watchpoint? */ ++ if (mask == mask_orig) ++ continue; ++ state->dr_ctrl_wp[i] |= mask << 5; ++ state->dr_addr_wp[i] ++ = align_down (state->dr_addr_wp[i], AARCH64_HWP_ALIGNMENT); ++ ++ /* Try to match duplicate entries. */ ++ for (j = 0; j < i; ++j) ++ if ((state->dr_ctrl_wp[j] & 1) != 0 ++ && state->dr_addr_wp[j] == state->dr_addr_wp[i] ++ && state->dr_addr_orig_wp[j] == state->dr_addr_orig_wp[i] ++ && state->dr_ctrl_wp[j] == state->dr_ctrl_wp[i]) ++ { ++ state->dr_ref_count_wp[j] += state->dr_ref_count_wp[i]; ++ state->dr_ref_count_wp[i] = 0; ++ state->dr_addr_wp[i] = 0; ++ state->dr_addr_orig_wp[i] = 0; ++ state->dr_ctrl_wp[i] &= ~1; ++ break; ++ } ++ ++ aarch64_notify_debug_reg_change (state, 1 /* is_watchpoint */, i); ++ } + } + + /* Call ptrace to set the thread TID's hardware breakpoint/watchpoint + registers with data from *STATE. */ + + static void +-aarch64_linux_set_debug_regs (const struct aarch64_debug_reg_state *state, ++aarch64_linux_set_debug_regs (struct aarch64_debug_reg_state *state, + int tid, int watchpoint) + { + int i, count; +@@ -621,7 +742,18 @@ + if (ptrace (PTRACE_SETREGSET, tid, + watchpoint ? NT_ARM_HW_WATCH : NT_ARM_HW_BREAK, + (void *) &iov)) +- error (_("Unexpected error setting hardware debug registers")); ++ { ++ /* Handle Linux kernels with the PR external/20207 bug. */ ++ if (watchpoint && errno == EINVAL ++ && kernel_supports_any_contiguous_range) ++ { ++ kernel_supports_any_contiguous_range = 0; ++ aarch64_downgrade_regs (state); ++ aarch64_linux_set_debug_regs (state, tid, watchpoint); ++ return; ++ } ++ error (_("Unexpected error setting hardware debug registers")); ++ } + } + + struct aarch64_dr_update_callback_param +@@ -750,11 +882,12 @@ + static int + aarch64_dr_state_insert_one_point (struct aarch64_debug_reg_state *state, + enum target_point_type type, +- CORE_ADDR addr, int len) ++ CORE_ADDR addr, int offset, int len, ++ CORE_ADDR addr_orig) + { + int i, idx, num_regs, is_watchpoint; + unsigned int ctrl, *dr_ctrl_p, *dr_ref_count; +- CORE_ADDR *dr_addr_p; ++ CORE_ADDR *dr_addr_p, *dr_addr_orig_p; + + /* Set up state pointers. */ + is_watchpoint = (type != hw_execute); +@@ -763,6 +896,7 @@ + { + num_regs = aarch64_num_wp_regs; + dr_addr_p = state->dr_addr_wp; ++ dr_addr_orig_p = state->dr_addr_orig_wp; + dr_ctrl_p = state->dr_ctrl_wp; + dr_ref_count = state->dr_ref_count_wp; + } +@@ -770,11 +904,12 @@ + { + num_regs = aarch64_num_bp_regs; + dr_addr_p = state->dr_addr_bp; ++ dr_addr_orig_p = NULL; + dr_ctrl_p = state->dr_ctrl_bp; + dr_ref_count = state->dr_ref_count_bp; + } + +- ctrl = aarch64_point_encode_ctrl_reg (type, len); ++ ctrl = aarch64_point_encode_ctrl_reg (type, offset, len); + + /* Find an existing or free register in our cache. */ + idx = -1; +@@ -786,7 +921,9 @@ + idx = i; + /* no break; continue hunting for an exising one. */ + } +- else if (dr_addr_p[i] == addr && dr_ctrl_p[i] == ctrl) ++ else if (dr_addr_p[i] == addr ++ && (dr_addr_orig_p == NULL || dr_addr_orig_p[i] == addr_orig) ++ && dr_ctrl_p[i] == ctrl) + { + gdb_assert (dr_ref_count[i] != 0); + idx = i; +@@ -803,6 +940,8 @@ + { + /* new entry */ + dr_addr_p[idx] = addr; ++ if (dr_addr_orig_p != NULL) ++ dr_addr_orig_p[idx] = addr_orig; + dr_ctrl_p[idx] = ctrl; + dr_ref_count[idx] = 1; + /* Notify the change. */ +@@ -823,11 +962,12 @@ + static int + aarch64_dr_state_remove_one_point (struct aarch64_debug_reg_state *state, + enum target_point_type type, +- CORE_ADDR addr, int len) ++ CORE_ADDR addr, int offset, int len, ++ CORE_ADDR addr_orig) + { + int i, num_regs, is_watchpoint; + unsigned int ctrl, *dr_ctrl_p, *dr_ref_count; +- CORE_ADDR *dr_addr_p; ++ CORE_ADDR *dr_addr_p, *dr_addr_orig_p; + + /* Set up state pointers. */ + is_watchpoint = (type != hw_execute); +@@ -836,6 +976,7 @@ + { + num_regs = aarch64_num_wp_regs; + dr_addr_p = state->dr_addr_wp; ++ dr_addr_orig_p = state->dr_addr_orig_wp; + dr_ctrl_p = state->dr_ctrl_wp; + dr_ref_count = state->dr_ref_count_wp; + } +@@ -843,15 +984,18 @@ + { + num_regs = aarch64_num_bp_regs; + dr_addr_p = state->dr_addr_bp; ++ dr_addr_orig_p = NULL; + dr_ctrl_p = state->dr_ctrl_bp; + dr_ref_count = state->dr_ref_count_bp; + } + +- ctrl = aarch64_point_encode_ctrl_reg (type, len); ++ ctrl = aarch64_point_encode_ctrl_reg (type, offset, len); + + /* Find the entry that matches the ADDR and CTRL. */ + for (i = 0; i < num_regs; ++i) +- if (dr_addr_p[i] == addr && dr_ctrl_p[i] == ctrl) ++ if (dr_addr_p[i] == addr ++ && (dr_addr_orig_p == NULL || dr_addr_orig_p[i] == addr_orig) ++ && dr_ctrl_p[i] == ctrl) + { + gdb_assert (dr_ref_count[i] != 0); + break; +@@ -867,6 +1011,8 @@ + /* Clear the enable bit. */ + ctrl &= ~1; + dr_addr_p[i] = 0; ++ if (dr_addr_orig_p != NULL) ++ dr_addr_orig_p[i] = 0; + dr_ctrl_p[i] = ctrl; + /* Notify the change. */ + aarch64_notify_debug_reg_change (state, is_watchpoint, i); +@@ -889,9 +1035,9 @@ + state = aarch64_get_debug_reg_state (); + + if (is_insert) +- return aarch64_dr_state_insert_one_point (state, type, addr, len); ++ return aarch64_dr_state_insert_one_point (state, type, addr, 0, len, -1); + else +- return aarch64_dr_state_remove_one_point (state, type, addr, len); ++ return aarch64_dr_state_remove_one_point (state, type, addr, 0, len, -1); + } + + /* This is essentially the same as aarch64_handle_breakpoint, apart +@@ -906,9 +1052,9 @@ + state = aarch64_get_debug_reg_state (); + + if (is_insert) +- return aarch64_dr_state_insert_one_point (state, type, addr, len); ++ return aarch64_dr_state_insert_one_point (state, type, addr, 0, len, addr); + else +- return aarch64_dr_state_remove_one_point (state, type, addr, len); ++ return aarch64_dr_state_remove_one_point (state, type, addr, 0, len, addr); + } + + /* Insert/remove unaligned watchpoint by calling +@@ -924,29 +1070,41 @@ + { + struct aarch64_debug_reg_state *state + = aarch64_get_debug_reg_state (); ++ CORE_ADDR addr_orig = addr; + + while (len > 0) + { + CORE_ADDR aligned_addr; +- int aligned_len, ret; ++ int aligned_offset, aligned_len, ret; ++ CORE_ADDR addr_orig_next = addr_orig; + +- aarch64_align_watchpoint (addr, len, &aligned_addr, &aligned_len, +- &addr, &len); ++ aarch64_align_watchpoint (addr, len, &aligned_addr, &aligned_offset, ++ &aligned_len, &addr, &len, &addr_orig_next); + + if (is_insert) + ret = aarch64_dr_state_insert_one_point (state, type, aligned_addr, +- aligned_len); ++ aligned_offset, ++ aligned_len, addr_orig); + else + ret = aarch64_dr_state_remove_one_point (state, type, aligned_addr, +- aligned_len); ++ aligned_offset, ++ aligned_len, addr_orig); + + if (debug_hw_points) + fprintf (stderr, + "handle_unaligned_watchpoint: is_insert: %d\n" + " aligned_addr: 0x%s, aligned_len: %d\n" +- " next_addr: 0x%s, next_len: %d\n", +- is_insert, paddress (aligned_addr), aligned_len, +- paddress (addr), len); ++ " addr_orig: %s\n" ++ " " ++ " next_addr: %s, next_len: %d\n" ++ " " ++ " addr_orig_next: %s\n", ++ is_insert, paddress (aligned_addr), ++ aligned_len, paddress (addr_orig), ++ paddress (addr), len, ++ paddress (addr_orig_next)); ++ ++ addr_orig = addr_orig_next; + + if (ret != 0) + return ret; +@@ -1065,14 +1223,39 @@ + state = aarch64_get_debug_reg_state (); + for (i = aarch64_num_wp_regs - 1; i >= 0; --i) + { ++ const unsigned int offset ++ = aarch64_watchpoint_offset (state->dr_ctrl_wp[i]); + const unsigned int len = aarch64_watchpoint_length (state->dr_ctrl_wp[i]); + const CORE_ADDR addr_trap = (CORE_ADDR) siginfo.si_addr; +- const CORE_ADDR addr_watch = state->dr_addr_wp[i]; ++ const CORE_ADDR addr_watch = state->dr_addr_wp[i] + offset; ++ const CORE_ADDR addr_watch_aligned = align_down (state->dr_addr_wp[i], 8); ++ const CORE_ADDR addr_orig = state->dr_addr_orig_wp[i]; ++ + if (state->dr_ref_count_wp[i] + && DR_CONTROL_ENABLED (state->dr_ctrl_wp[i]) +- && addr_trap >= addr_watch ++ && addr_trap >= addr_watch_aligned + && addr_trap < addr_watch + len) +- return addr_trap; ++ { ++ /* ADDR_TRAP reports the first address of the memory range ++ accessed by the CPU, regardless of what was the memory ++ range watched. Thus, a large CPU access that straddles ++ the ADDR_WATCH..ADDR_WATCH+LEN range may result in an ++ ADDR_TRAP that is lower than the ++ ADDR_WATCH..ADDR_WATCH+LEN range. E.g.: ++ ++ addr: | 4 | 5 | 6 | 7 | 8 | ++ |---- range watched ----| ++ |----------- range accessed ------------| ++ ++ In this case, ADDR_TRAP will be 4. ++ ++ To match a watchpoint known to GDB core, we must never ++ report *ADDR_P outside of any ADDR_WATCH..ADDR_WATCH+LEN ++ range. ADDR_WATCH <= ADDR_TRAP < ADDR_ORIG is a false ++ positive on kernels older than 4.10. See PR ++ external/20207. */ ++ return addr_orig; ++ } + } + + return (CORE_ADDR) 0; +Index: gdb-7.6.1/gdb/testsuite/gdb.base/watchpoint-unaligned.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-7.6.1/gdb/testsuite/gdb.base/watchpoint-unaligned.c 2018-05-05 17:12:49.571781890 +0200 +@@ -0,0 +1,96 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2017-2018 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 . */ ++ ++#include ++#include ++ ++static int again; ++ ++static volatile struct ++{ ++ uint64_t alignment; ++ union ++ { ++ uint64_t size8[1]; ++ uint32_t size4[2]; ++ uint16_t size2[4]; ++ uint8_t size1[8]; ++ uint64_t size8twice[2]; ++ } ++ u; ++} data; ++ ++static int size = 0; ++static int offset; ++ ++static void ++write_size8twice (void) ++{ ++ static const uint64_t first = 1; ++ static const uint64_t second = 2; ++ ++#ifdef __aarch64__ ++ asm volatile ("stp %1, %2, [%0]" ++ : /* output */ ++ : "r" (data.u.size8twice), "r" (first), "r" (second) /* input */ ++ : "memory" /* clobber */); ++#else ++ data.u.size8twice[0] = first; ++ data.u.size8twice[1] = second; ++#endif ++} ++ ++int ++main (void) ++{ ++ volatile uint64_t local; ++ ++ assert (sizeof (data) == 8 + 2 * 8); ++ ++ write_size8twice (); ++ ++ while (size) ++ { ++ switch (size) ++ { ++/* __s390x__ also defines __s390__ */ ++#ifdef __s390__ ++# define ACCESS(var) var = ~var ++#else ++# define ACCESS(var) local = var ++#endif ++ case 8: ++ ACCESS (data.u.size8[offset]); ++ break; ++ case 4: ++ ACCESS (data.u.size4[offset]); ++ break; ++ case 2: ++ ACCESS (data.u.size2[offset]); ++ break; ++ case 1: ++ ACCESS (data.u.size1[offset]); ++ break; ++#undef ACCESS ++ default: ++ assert (0); ++ } ++ size = 0; ++ size = size; /* start_again */ ++ } ++ return 0; /* final_return */ ++} +Index: gdb-7.6.1/gdb/testsuite/gdb.base/watchpoint-unaligned.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-7.6.1/gdb/testsuite/gdb.base/watchpoint-unaligned.exp 2018-05-05 17:12:49.571781890 +0200 +@@ -0,0 +1,184 @@ ++# Copyright 2017-2018 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 . ++# ++# This file is part of the gdb testsuite. ++ ++# Test inserting read watchpoints on unaligned addresses. ++ ++standard_testfile ++if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { ++ return -1 ++} ++ ++if ![runto_main] { ++ untested "could not run to main" ++ return -1 ++} ++ ++gdb_breakpoint [gdb_get_line_number "start_again"] "Breakpoint $decimal at $hex" "start_again" ++ ++set sizes {1 2 4 8} ++array set alignedend {1 1 2 2 3 4 4 4 5 8 6 8 7 8 8 8} ++ ++set rwatch "rwatch" ++set rwatch_exp "Hardware read watchpoint" ++if {[istarget "s390*-*-*"]} { ++ # Target does not support this type of hardware watchpoint." ++ set rwatch "watch" ++ set rwatch_exp "Hardware watchpoint" ++} ++ ++foreach wpsize $sizes { ++ for {set wpoffset 0} {$wpoffset < 8 / $wpsize} {incr wpoffset} { ++ set wpstart [expr $wpoffset * $wpsize] ++ set wpend [expr ($wpoffset + 1) * $wpsize] ++ set wpendaligned $alignedend($wpend) ++ foreach rdsize $sizes { ++ for {set rdoffset 0} {$rdoffset < 8 / $rdsize} {incr rdoffset} { ++ set rdstart [expr $rdoffset * $rdsize] ++ set rdend [expr ($rdoffset + 1) * $rdsize] ++ set expect_hit [expr max ($wpstart, $rdstart) < min ($wpend, $rdend)] ++ set test "$rwatch data.u.size$wpsize\[$wpoffset\]" ++ set wpnum "" ++ gdb_test_multiple $test $test { ++ -re "$rwatch_exp (\[0-9\]+): .*\r\n$gdb_prompt $" { ++ set wpnum $expect_out(1,string) ++ } ++ -re "Expression cannot be implemented with read/access watchpoint.\r\n$gdb_prompt $" { ++ if {$wpsize == 8 && [istarget "arm*-*-*"]} { ++ untested $test ++ continue ++ } ++ fail $test ++ } ++ } ++ gdb_test_no_output "set variable size = $rdsize" "" ++ gdb_test_no_output "set variable offset = $rdoffset" "" ++ set test "continue" ++ set got_hit 0 ++ gdb_test_multiple $test $test { ++ -re "$rwatch_exp $wpnum:.*alue = .*\r\n$gdb_prompt $" { ++ set got_hit 1 ++ send_gdb "continue\n" ++ exp_continue ++ } ++ -re " start_again .*\r\n$gdb_prompt $" { ++ } ++ } ++ gdb_test_no_output "delete $wpnum" "" ++ set test "wp(size=$wpsize offset=$wpoffset) rd(size=$rdsize offset=$rdoffset) expect=$expect_hit" ++ if {$expect_hit == $got_hit} { ++ pass $test ++ } else { ++ # We do not know if we run on a fixed Linux kernel ++ # or not. Report XFAIL only in the FAIL case. ++ if {$expect_hit == 0 && $rdstart < $wpendaligned} { ++ setup_xfail external/20207 "aarch64*-*-linux*" ++ } ++ if {!$expect_hit && [expr max ($wpstart / 8, $rdstart / 8) < min (($wpend + 7) / 8, ($rdend + 7) / 8)]} { ++ setup_xfail breakpoints/23131 "powerpc*-*-*" ++ } ++ fail $test ++ } ++ } ++ } ++ } ++} ++ ++foreach wpcount {4 7} { ++ array set wpoffset_to_wpnum {} ++ for {set wpoffset 1} {$wpoffset <= $wpcount} {incr wpoffset} { ++ set test "$rwatch data.u.size1\[$wpoffset\]" ++ set wpnum "" ++ gdb_test_multiple $test $test { ++ -re "$rwatch_exp (\[0-9\]+): .*\r\n$gdb_prompt $" { ++ set wpoffset_to_wpnum($wpoffset) $expect_out(1,string) ++ } ++ -re "There are not enough available hardware resources for this watchpoint.\r\n$gdb_prompt $" { ++ if {$wpoffset > 1} { ++ setup_xfail breakpoints/23131 "powerpc*-*-*" ++ setup_xfail breakpoints/23131 "arm*-*-*" ++ } ++ fail $test ++ set wpoffset_to_wpnum($wpoffset) 0 ++ } ++ } ++ } ++ gdb_test_no_output "set variable size = 1" "" ++ gdb_test_no_output "set variable offset = 1" "" ++ set test "continue" ++ set got_hit 0 ++ gdb_test_multiple $test $test { ++ -re "\r\nCould not insert hardware watchpoint .*\r\n$gdb_prompt $" { ++ } ++ -re "$rwatch_exp $wpoffset_to_wpnum(1):.*alue = .*\r\n$gdb_prompt $" { ++ set got_hit 1 ++ send_gdb "continue\n" ++ exp_continue ++ } ++ -re " start_again .*\r\n$gdb_prompt $" { ++ } ++ } ++ for {set wpoffset 1} {$wpoffset <= $wpcount} {incr wpoffset} { ++ if {$wpoffset_to_wpnum($wpoffset)} { ++ gdb_test_no_output "delete $wpoffset_to_wpnum($wpoffset)" "" ++ } ++ } ++ set test "wpcount($wpcount)" ++ if {!$wpoffset_to_wpnum([expr $wpcount - 1])} { ++ untested $test ++ continue ++ } ++ if {$wpcount > 4} { ++ if {![istarget "s390*-*-*"]} { ++ setup_kfail tdep/22389 *-*-* ++ } ++ } ++ gdb_assert $got_hit $test ++} ++ ++if ![runto_main] { ++ return -1 ++} ++gdb_breakpoint [gdb_get_line_number "final_return"] "Breakpoint $decimal at $hex" "final_return" ++set test {watch data.u.size8twice[1]} ++set wpnum "" ++gdb_test_multiple $test $test { ++ -re "Hardware watchpoint (\[0-9\]+): .*\r\n$gdb_prompt $" { ++ set wpnum $expect_out(1,string) ++ } ++ -re "Watchpoint (\[0-9\]+): .*\r\n$gdb_prompt $" { ++ if {[istarget "arm*-*-*"]} { ++ untested $test ++ set wpnum 0 ++ } ++ } ++} ++if {$wpnum} { ++ set test "continue" ++ set got_hit 0 ++ gdb_test_multiple $test $test { ++ -re "\r\nCould not insert hardware watchpoint .*\r\n$gdb_prompt $" { ++ } ++ -re "Hardware watchpoint $wpnum:.*New value = .*\r\n$gdb_prompt $" { ++ set got_hit 1 ++ send_gdb "continue\n" ++ exp_continue ++ } ++ -re " final_return .*\r\n$gdb_prompt $" { ++ } ++ } ++ gdb_assert $got_hit "size8twice write" ++} +Index: gdb-7.6.1/gdb/utils.c +=================================================================== +--- gdb-7.6.1.orig/gdb/utils.c 2018-05-05 17:12:47.002758937 +0200 ++++ gdb-7.6.1/gdb/utils.c 2018-05-05 17:12:49.571781890 +0200 +@@ -3316,22 +3316,6 @@ + return xstrdup (filename); + } + +-ULONGEST +-align_up (ULONGEST v, int n) +-{ +- /* Check that N is really a power of two. */ +- gdb_assert (n && (n & (n-1)) == 0); +- return (v + n - 1) & -n; +-} +- +-ULONGEST +-align_down (ULONGEST v, int n) +-{ +- /* Check that N is really a power of two. */ +- gdb_assert (n && (n & (n-1)) == 0); +- return (v & -n); +-} +- + /* Allocation function for the libiberty hash table which uses an + obstack. The obstack is passed as DATA. */ + +Index: gdb-7.6.1/gdb/utils.h +=================================================================== +--- gdb-7.6.1.orig/gdb/utils.h 2018-05-05 17:12:47.002758937 +0200 ++++ gdb-7.6.1/gdb/utils.h 2018-05-05 17:12:49.572781899 +0200 +@@ -346,38 +346,6 @@ + + extern int myread (int, char *, int); + +-/* Ensure that V is aligned to an N byte boundary (B's assumed to be a +- power of 2). Round up/down when necessary. Examples of correct +- use include: +- +- addr = align_up (addr, 8); -- VALUE needs 8 byte alignment +- write_memory (addr, value, len); +- addr += len; +- +- and: +- +- sp = align_down (sp - len, 16); -- Keep SP 16 byte aligned +- write_memory (sp, value, len); +- +- Note that uses such as: +- +- write_memory (addr, value, len); +- addr += align_up (len, 8); +- +- and: +- +- sp -= align_up (len, 8); +- write_memory (sp, value, len); +- +- are typically not correct as they don't ensure that the address (SP +- or ADDR) is correctly aligned (relying on previous alignment to +- keep things right). This is also why the methods are called +- "align_..." instead of "round_..." as the latter reads better with +- this incorrect coding style. */ +- +-extern ULONGEST align_up (ULONGEST v, int n); +-extern ULONGEST align_down (ULONGEST v, int n); +- + extern struct cleanup *make_cleanup_restore_selected_frame (void); + + #endif /* UTILS_H */ +Index: gdb-7.6.1/gdb/testsuite/lib/gdb.exp +=================================================================== +--- gdb-7.6.1.orig/gdb/testsuite/lib/gdb.exp 2018-05-05 17:12:47.001758928 +0200 ++++ gdb-7.6.1/gdb/testsuite/lib/gdb.exp 2018-05-05 17:13:20.200055570 +0200 +@@ -1209,6 +1209,26 @@ + } + } + ++# Issue a PASS and return true if evaluating CONDITION in the caller's ++# frame returns true, and issue a FAIL and return false otherwise. ++# MESSAGE is the pass/fail message to be printed. If MESSAGE is ++# omitted or is empty, then the pass/fail messages use the condition ++# string as the message. ++ ++proc gdb_assert { condition {message ""} } { ++ if { $message == ""} { ++ set message $condition ++ } ++ ++ set res [uplevel 1 expr $condition] ++ if {!$res} { ++ fail $message ++ } else { ++ pass $message ++ } ++ return $res ++} ++ + proc gdb_reinitialize_dir { subdir } { + global gdb_prompt + diff --git a/SOURCES/gdb-rhbz1473411-spawn-default-signal-handlers.patch b/SOURCES/gdb-rhbz1473411-spawn-default-signal-handlers.patch index 70a64e7..0dcc371 100644 --- a/SOURCES/gdb-rhbz1473411-spawn-default-signal-handlers.patch +++ b/SOURCES/gdb-rhbz1473411-spawn-default-signal-handlers.patch @@ -97,8 +97,8 @@ Date: Tue Aug 9 20:21:08 2016 +0100 Index: gdb-7.6.1/gdb/Makefile.in =================================================================== ---- gdb-7.6.1.orig/gdb/Makefile.in 2017-11-03 19:22:10.364013263 +0100 -+++ gdb-7.6.1/gdb/Makefile.in 2017-11-03 19:22:11.452021206 +0100 +--- gdb-7.6.1.orig/gdb/Makefile.in 2018-05-18 11:02:44.931519623 +0200 ++++ gdb-7.6.1/gdb/Makefile.in 2018-05-18 11:02:45.967528017 +0200 @@ -763,7 +763,8 @@ regset.c sol-thread.c windows-termcap.c \ common/gdb_vecs.c common/common-utils.c common/xml-utils.c \ @@ -141,7 +141,7 @@ Index: gdb-7.6.1/gdb/Makefile.in Index: gdb-7.6.1/gdb/common/signals-state-save-restore.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6.1/gdb/common/signals-state-save-restore.c 2017-11-03 19:33:46.346074718 +0100 ++++ gdb-7.6.1/gdb/common/signals-state-save-restore.c 2018-05-18 11:02:45.967528017 +0200 @@ -0,0 +1,99 @@ +/* Copyright (C) 2016 Free Software Foundation, Inc. + @@ -245,7 +245,7 @@ Index: gdb-7.6.1/gdb/common/signals-state-save-restore.c Index: gdb-7.6.1/gdb/common/signals-state-save-restore.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6.1/gdb/common/signals-state-save-restore.h 2017-11-03 19:22:11.453021213 +0100 ++++ gdb-7.6.1/gdb/common/signals-state-save-restore.h 2018-05-18 11:02:45.967528017 +0200 @@ -0,0 +1,39 @@ +/* Copyright (C) 2016 Free Software Foundation, Inc. + @@ -286,23 +286,10 @@ Index: gdb-7.6.1/gdb/common/signals-state-save-restore.h +extern void restore_original_signals_state (void); + +#endif /* COMMON_SIGNALS_STATE_SAVE_RESTORE_H */ -Index: gdb-7.6.1/gdb/configure -=================================================================== ---- gdb-7.6.1.orig/gdb/configure 2017-11-03 19:22:08.181997334 +0100 -+++ gdb-7.6.1/gdb/configure 2017-11-03 19:22:11.455021228 +0100 -@@ -10667,7 +10667,7 @@ - sbrk setpgid setpgrp setsid \ - sigaction sigprocmask sigsetmask socketpair syscall \ - ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ -- setrlimit getrlimit posix_madvise waitpid lstat -+ setrlimit getrlimit posix_madvise waitpid lstat sigaction - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" Index: gdb-7.6.1/gdb/fork-child.c =================================================================== ---- gdb-7.6.1.orig/gdb/fork-child.c 2013-01-01 07:32:42.000000000 +0100 -+++ gdb-7.6.1/gdb/fork-child.c 2017-11-03 19:22:11.455021228 +0100 +--- gdb-7.6.1.orig/gdb/fork-child.c 2018-05-18 11:02:44.935519656 +0200 ++++ gdb-7.6.1/gdb/fork-child.c 2018-05-18 11:02:45.988528187 +0200 @@ -32,7 +32,7 @@ #include "command.h" /* for dont_repeat () */ #include "gdbcmd.h" @@ -323,8 +310,8 @@ Index: gdb-7.6.1/gdb/fork-child.c clobbers the parent, but environ is restored a few lines down Index: gdb-7.6.1/gdb/gdbserver/Makefile.in =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/Makefile.in 2017-11-03 19:22:10.364013263 +0100 -+++ gdb-7.6.1/gdb/gdbserver/Makefile.in 2017-11-03 19:22:11.455021228 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/Makefile.in 2018-05-18 11:02:44.935519656 +0200 ++++ gdb-7.6.1/gdb/gdbserver/Makefile.in 2018-05-18 11:02:45.989528195 +0200 @@ -170,6 +170,7 @@ mem-break.o hostio.o event-loop.o tracepoint.o \ xml-utils.o common-utils.o ptid.o buffer.o format.o \ @@ -345,8 +332,8 @@ Index: gdb-7.6.1/gdb/gdbserver/Makefile.in Index: gdb-7.6.1/gdb/gdbserver/config.in =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/config.in 2017-11-03 19:22:10.364013263 +0100 -+++ gdb-7.6.1/gdb/gdbserver/config.in 2017-11-03 19:22:11.455021228 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/config.in 2018-05-18 11:02:44.935519656 +0200 ++++ gdb-7.6.1/gdb/gdbserver/config.in 2018-05-18 11:02:45.989528195 +0200 @@ -152,6 +152,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H @@ -359,21 +346,21 @@ Index: gdb-7.6.1/gdb/gdbserver/config.in Index: gdb-7.6.1/gdb/gdbserver/configure =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/configure 2017-11-03 19:22:10.366013278 +0100 -+++ gdb-7.6.1/gdb/gdbserver/configure 2017-11-03 19:22:11.456021235 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/configure 2018-05-18 11:02:45.990528203 +0200 ++++ gdb-7.6.1/gdb/gdbserver/configure 2018-05-18 11:03:48.036030876 +0200 @@ -4796,7 +4796,7 @@ done --for ac_func in pread pwrite pread64 readlink setns -+for ac_func in pread pwrite pread64 readlink setns sigaction +-for ac_func in pread pwrite pread64 readlink socketpair setns ++for ac_func in pread pwrite pread64 readlink socketpair setns sigaction do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" Index: gdb-7.6.1/gdb/gdbserver/linux-low.c =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/linux-low.c 2017-11-03 19:22:10.380013380 +0100 -+++ gdb-7.6.1/gdb/gdbserver/linux-low.c 2017-11-03 19:22:11.457021243 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/linux-low.c 2018-05-18 11:02:44.937519672 +0200 ++++ gdb-7.6.1/gdb/gdbserver/linux-low.c 2018-05-18 11:02:45.991528212 +0200 @@ -20,7 +20,7 @@ #include "linux-low.h" #include "linux-osdata.h" @@ -394,8 +381,8 @@ Index: gdb-7.6.1/gdb/gdbserver/linux-low.c execvp (program, allargs); Index: gdb-7.6.1/gdb/gdbserver/server.c =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/server.c 2017-11-03 19:22:10.380013380 +0100 -+++ gdb-7.6.1/gdb/gdbserver/server.c 2017-11-03 19:22:11.457021243 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/server.c 2018-05-18 11:02:44.938519680 +0200 ++++ gdb-7.6.1/gdb/gdbserver/server.c 2018-05-18 11:02:45.992528220 +0200 @@ -20,7 +20,7 @@ #include "gdbthread.h" #include "agent.h" @@ -416,8 +403,8 @@ Index: gdb-7.6.1/gdb/gdbserver/server.c stdin,stdout redirected. So do this here before we call Index: gdb-7.6.1/gdb/main.c =================================================================== ---- gdb-7.6.1.orig/gdb/main.c 2017-11-03 19:22:10.319012935 +0100 -+++ gdb-7.6.1/gdb/main.c 2017-11-03 19:22:11.458021250 +0100 +--- gdb-7.6.1.orig/gdb/main.c 2018-05-18 11:02:44.938519680 +0200 ++++ gdb-7.6.1/gdb/main.c 2018-05-18 11:02:45.992528220 +0200 @@ -45,6 +45,7 @@ #include "auto-load.h" @@ -437,7 +424,7 @@ Index: gdb-7.6.1/gdb/main.c Index: gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.c 2017-11-03 19:22:11.458021250 +0100 ++++ gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.c 2018-05-18 11:02:45.992528220 +0200 @@ -0,0 +1,101 @@ +/* Copyright 2016 Free Software Foundation, Inc. + @@ -543,7 +530,7 @@ Index: gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.c Index: gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.exp 2017-11-03 19:22:11.458021250 +0100 ++++ gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.exp 2018-05-18 11:02:45.992528220 +0200 @@ -0,0 +1,82 @@ +# Copyright 2016 Free Software Foundation, Inc. + @@ -629,8 +616,8 @@ Index: gdb-7.6.1/gdb/testsuite/gdb.base/signals-state-child.exp + "signals states are identical" Index: gdb-7.6.1/gdb/testsuite/gdb.gdb/selftest.exp =================================================================== ---- gdb-7.6.1.orig/gdb/testsuite/gdb.gdb/selftest.exp 2017-11-03 19:22:06.904988012 +0100 -+++ gdb-7.6.1/gdb/testsuite/gdb.gdb/selftest.exp 2017-11-03 19:22:11.458021250 +0100 +--- gdb-7.6.1.orig/gdb/testsuite/gdb.gdb/selftest.exp 2018-05-18 11:02:44.939519688 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.gdb/selftest.exp 2018-05-18 11:02:45.992528220 +0200 @@ -158,6 +158,10 @@ set description "next over bfd_init" set command "next" @@ -642,29 +629,16 @@ Index: gdb-7.6.1/gdb/testsuite/gdb.gdb/selftest.exp -re ".*VEC_cleanup .cmdarg_s.*$gdb_prompt $" { set description "next over cmdarg_s VEC_cleanup" set command "next" -Index: gdb-7.6.1/gdb/configure.ac -=================================================================== ---- gdb-7.6.1.orig/gdb/configure.ac 2017-11-03 19:22:08.164997210 +0100 -+++ gdb-7.6.1/gdb/configure.ac 2017-11-03 19:22:11.459021257 +0100 -@@ -1365,7 +1365,7 @@ - sbrk setpgid setpgrp setsid \ - sigaction sigprocmask sigsetmask socketpair syscall \ - ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ -- setrlimit getrlimit posix_madvise waitpid lstat]) -+ setrlimit getrlimit posix_madvise waitpid lstat sigaction]) - AM_LANGINFO_CODESET - - # Check the return and argument types of ptrace. No canned test for Index: gdb-7.6.1/gdb/gdbserver/configure.ac =================================================================== ---- gdb-7.6.1.orig/gdb/gdbserver/configure.ac 2017-11-03 19:22:10.366013278 +0100 -+++ gdb-7.6.1/gdb/gdbserver/configure.ac 2017-11-03 19:22:11.459021257 +0100 +--- gdb-7.6.1.orig/gdb/gdbserver/configure.ac 2018-05-18 11:02:45.993528228 +0200 ++++ gdb-7.6.1/gdb/gdbserver/configure.ac 2018-05-18 11:03:33.469912865 +0200 @@ -70,7 +70,7 @@ sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl netinet/tcp.h arpa/inet.h sys/wait.h wait.h sys/un.h dnl linux/perf_event.h) --AC_CHECK_FUNCS(pread pwrite pread64 readlink setns) -+AC_CHECK_FUNCS(pread pwrite pread64 readlink setns sigaction) +-AC_CHECK_FUNCS(pread pwrite pread64 readlink socketpair setns) ++AC_CHECK_FUNCS(pread pwrite pread64 readlink socketpair setns sigaction) AC_REPLACE_FUNCS(vasprintf vsnprintf) # Check for UST diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-1of6.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-1of6.patch new file mode 100644 index 0000000..bfcfd5d --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-1of6.patch @@ -0,0 +1,81 @@ +commit 3b78cfe1033fafa6ca36c69cf8587c1bd96996ca +Author: Andreas Krebbel +Date: Mon Apr 27 10:29:16 2015 +0200 + + S/390: Fixes for z13 instructions. + + opcodes/ + * s390-opc.c: New instruction type VV0UU2. + * s390-opc.txt: Fix instruction types for VFCE, VLDE, VFSQ, WFK, + and WFC. + + gas/testsuite/ + * gas/s390/zarch-z13.d: Fix tests for VFCE, VLDE, VFSQ, WFK, and + WFC. + * gas/s390/zarch-z13.s: Likewise. + +### a/opcodes/ChangeLog +### b/opcodes/ChangeLog +## -1,3 +1,9 @@ ++2015-04-27 Andreas Krebbel ++ ++ * s390-opc.c: New instruction type VV0UU2. ++ * s390-opc.txt: Fix instruction types for VFCE, VLDE, VFSQ, WFK, ++ and WFC. ++ + 2015-04-23 Jan Beulich + + * i386-dis.c (putop): Extend "XY" handling to AVX512. Handle "XZ". +--- a/opcodes/s390-opc.c ++++ b/opcodes/s390-opc.c +@@ -484,6 +484,7 @@ const struct s390_operand s390_operands[] = + #define INSTR_VRR_VV0U 6, { V_8,V_12,U4_32,0,0,0 } /* e.g. vseg */ + #define INSTR_VRR_VV0U2 6, { V_8,V_12,U4_24,0,0,0 } /* e.g. vistrb*/ + #define INSTR_VRR_VV0UU 6, { V_8,V_12,U4_28,U4_24,0,0 } /* e.g. vcdgb */ ++#define INSTR_VRR_VV0UU2 6, { V_8,V_12,U4_32,U4_28,0,0 } /* e.g. wfc */ + #define INSTR_VRR_VV0UU8 6, { V_8,V_12,U4_OR8_28,U4_24,0,0 } /* e.g. wcdgb */ + #define INSTR_VRR_VV 6, { V_8,V_12,0,0,0,0 } /* e.g. vsegb */ + #define INSTR_VRR_VVVUU0V 6, { V_8,V_12,V_16,V_32,U4_20,U4_24 } /* e.g. vstrc */ +@@ -690,6 +691,7 @@ const struct s390_operand s390_operands[] = + #define MASK_VRR_VV0U { 0xff, 0x00, 0xff, 0xff, 0x00, 0xff } + #define MASK_VRR_VV0U2 { 0xff, 0x00, 0xff, 0x0f, 0xf0, 0xff } + #define MASK_VRR_VV0UU { 0xff, 0x00, 0xff, 0x00, 0xf0, 0xff } ++#define MASK_VRR_VV0UU2 { 0xff, 0x00, 0xff, 0xf0, 0x00, 0xff } + #define MASK_VRR_VV0UU8 { 0xff, 0x00, 0xff, 0x08, 0xf0, 0xff } + #define MASK_VRR_VV { 0xff, 0x00, 0xff, 0xff, 0xf0, 0xff } + #define MASK_VRR_VVVUU0V { 0xff, 0x00, 0x00, 0x0f, 0x00, 0xff } +--- a/opcodes/s390-opc.txt ++++ b/opcodes/s390-opc.txt +@@ -1586,11 +1586,11 @@ e7000230008a vstrczfs VRR_VVVU0VB3 "vector string range compare word" z13 zarch + e700000000e3 vfa VRR_VVV0UU "vector fp add" z13 zarch + e700000030e3 vfadb VRR_VVV "vector fp add" z13 zarch + e700000830e3 wfadb VRR_VVV "vector fp add" z13 zarch +-e700000000cb wfc VRR_VV0UU "vector fp compare scalar" z13 zarch ++e700000000cb wfc VRR_VV0UU2 "vector fp compare scalar" z13 zarch + e700000030cb wfcdb VRR_VV "vector fp compare scalar" z13 zarch +-e700000000ca wfk VRR_VV0UU "vector fp compare and signal scalar" z13 zarch ++e700000000ca wfk VRR_VV0UU2 "vector fp compare and signal scalar" z13 zarch + e700000030ca wfkdb VRR_VV "vector fp compare and signal scalar" z13 zarch +-e700000000e8 vfce VRR_VVV "vector fp compare equal" z13 zarch ++e700000000e8 vfce VRR_VVV0UUU "vector fp compare equal" z13 zarch + e700000030e8 vfcedb VRR_VVV "vector fp compare equal" z13 zarch + e700001030e8 vfcedbs VRR_VVV "vector fp compare equal" z13 zarch + e700000830e8 wfcedb VRR_VVV "vector fp compare equal" z13 zarch +@@ -1623,7 +1623,7 @@ e700000830e5 wfddb VRR_VVV "vector fp divide" z13 zarch + e700000000c7 vfi VRR_VV0UUU "vector load fp integer" z13 zarch + e700000030c7 vfidb VRR_VV0UU "vector load fp integer" z13 zarch + e700000830c7 wfidb VRR_VV0UU8 "vector load fp integer" z13 zarch +-e700000000c4 vlde VRR_VV0UU "vector fp load lengthened" z13 zarch ++e700000000c4 vlde VRR_VV0UU2 "vector fp load lengthened" z13 zarch + e700000020c4 vldeb VRR_VV "vector fp load lengthened" z13 zarch + e700000820c4 wldeb VRR_VV "vector fp load lengthened" z13 zarch + e700000000c5 vled VRR_VV0UUU "vector fp load rounded" z13 zarch +@@ -1647,7 +1647,7 @@ e700001030cc vflndb VRR_VV "vector fp perform sign operation" z13 zarch + e700001830cc wflndb VRR_VV "vector fp perform sign operation" z13 zarch + e700002030cc vflpdb VRR_VV "vector fp perform sign operation" z13 zarch + e700002830cc wflpdb VRR_VV "vector fp perform sign operation" z13 zarch +-e700000000ce vfsq VRR_VV0UU "vector fp square root" z13 zarch ++e700000000ce vfsq VRR_VV0UU2 "vector fp square root" z13 zarch + e700000030ce vfsqdb VRR_VV "vector fp square root" z13 zarch + e700000830ce wfsqdb VRR_VV "vector fp square root" z13 zarch + e700000000e2 vfs VRR_VVV0UU "vector fp subtract" z13 zarch diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-2of6.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-2of6.patch new file mode 100644 index 0000000..ee93278 --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-2of6.patch @@ -0,0 +1,1135 @@ +commit 7ecc513a44095d614f10e89c67d9be5826abacf9 +Author: Dominik Vogt +Date: Tue Sep 29 13:22:07 2015 +0100 + + Add support for extensions in the .machine pseudoop on S/390, e.g. ".machine zEC12+nohtm+vx" + + gas * doc/c-s390.texi: Add documentation. + Add missing code markup. + * config/tc-s390.c (current_flags): New static variable. + (s390_parse_cpu): Parse cpu flags a la "+nohtm" etc. + (s390_setup_opcodes): Use cpu flags to determine the set of opcodes. + Fix indentation. + (md_parse_option): Call s390_parse_cpu with the new signature. + (s390_machine): Likewise. + Keep track of current_flags. + Simplify code a bit. + undefine MAX_HISTORY at end of function. + (s390_machinemode): undefine MAX_HISTORY at end of function. + Update an error message. + + tests * gas/s390/s390.exp: Add new tests. + * gas/s390/machine-parsing-1.s: New test file. + * gas/s390/machine-parsing-1.l: Likewise. + * gas/s390/machine-parsing-2.s: Likewise. + * gas/s390/machine-parsing-2.l: Likewise. + * gas/s390/machine-parsing-3.s: Likewise. + * gas/s390/machine-parsing-3.l: Likewise. + * gas/s390/machine-parsing-4.s: Likewise. + * gas/s390/machine-parsing-4.l: Likewise. + * gas/s390/machine-parsing-5.s: Likewise. + * gas/s390/machine-parsing-5.l: Likewise. + * gas/s390/machine-parsing-6.s: Likewise. + * gas/s390/machine-parsing-6.l: Likewise. + + opcode * s390.h (S390_INSTR_FLAG_HTM): New flag. + (S390_INSTR_FLAG_VX): New flag. + (S390_INSTR_FLAG_FACILITY_MASK): New flag mask. + + opcodes * s390-mkopc.c (main): Parse htm and vx flag. + * s390-opc.txt: Mark instructions from the hardware transactional + memory and vector facilities with the "htm"/"vx" flag. + +### a/include/opcode/ChangeLog +### b/include/opcode/ChangeLog +## -1,3 +1,9 @@ ++2015-09-29 Dominik Vogt ++ ++ * s390.h (S390_INSTR_FLAG_HTM): New flag. ++ (S390_INSTR_FLAG_VX): New flag. ++ (S390_INSTR_FLAG_FACILITY_MASK): New flag mask. ++ + 2015-09-23 Nick Clifton + + * ppc.h (PPC_OPSHIFT_INV): Use an unsigned constant when left +--- a/include/opcode/s390.h ++++ b/include/opcode/s390.h +@@ -47,6 +47,9 @@ enum s390_opcode_cpu_val + + /* Instruction specific flags. */ + #define S390_INSTR_FLAG_OPTPARM 0x1 ++#define S390_INSTR_FLAG_HTM 0x2 ++#define S390_INSTR_FLAG_VX 0x4 ++#define S390_INSTR_FLAG_FACILITY_MASK 0x6 + + /* The opcode table is an array of struct s390_opcode. */ + +### a/opcodes/ChangeLog +### b/opcodes/ChangeLog +## -1,3 +1,9 @@ ++2015-09-29 Dominik Vogt ++ ++ * s390-mkopc.c (main): Parse htm and vx flag. ++ * s390-opc.txt: Mark instructions from the hardware transactional ++ memory and vector facilities with the "htm"/"vx" flag. ++ + 2015-09-28 Nick Clifton + + * po/de.po: Updated German translation. +--- a/opcodes/s390-mkopc.c ++++ b/opcodes/s390-mkopc.c +@@ -401,6 +401,14 @@ main (void) + && (str[7] == 0 || str[7] == ',')) { + flag_bits |= S390_INSTR_FLAG_OPTPARM; + str += 7; ++ } else if (strncmp (str, "htm", 3) == 0 ++ && (str[3] == 0 || str[3] == ',')) { ++ flag_bits |= S390_INSTR_FLAG_HTM; ++ str += 3; ++ } else if (strncmp (str, "vx", 2) == 0 ++ && (str[2] == 0 || str[2] == ',')) { ++ flag_bits |= S390_INSTR_FLAG_VX; ++ str += 2; + } else { + fprintf (stderr, "Couldn't parse flags string %s\n", + flags_string); +--- a/opcodes/s390-opc.txt ++++ b/opcodes/s390-opc.txt +@@ -1118,12 +1118,12 @@ b92c pcc RRE_00 "perform cryptographic computation" z196 zarch + b92d kmctr RRF_R0RR2 "cipher message with counter" z196 zarch + + # The new instructions of the IBM zEnterprise EC12 +-b2ec etnd RRE_R0 "extract transaction nesting depth" zEC12 zarch +-e30000000025 ntstg RXY_RRRD "nontransactional store" zEC12 zarch +-b2fc tabort S_RD "transaction abort" zEC12 zarch +-e560 tbegin SIL_RDU "transaction begin" zEC12 zarch +-e561 tbeginc SIL_RDU "constrained transaction begin" zEC12 zarch +-b2f8 tend S_00 "transaction end" zEC12 zarch ++b2ec etnd RRE_R0 "extract transaction nesting depth" zEC12 zarch htm ++e30000000025 ntstg RXY_RRRD "nontransactional store" zEC12 zarch htm ++b2fc tabort S_RD "transaction abort" zEC12 zarch htm ++e560 tbegin SIL_RDU "transaction begin" zEC12 zarch htm ++e561 tbeginc SIL_RDU "constrained transaction begin" zEC12 zarch htm ++b2f8 tend S_00 "transaction end" zEC12 zarch htm + c7 bpp SMI_U0RDP "branch prediction preload" zEC12 zarch + c5 bprp MII_UPP "branch prediction relative preload" zEC12 zarch + b2e8 ppa RRF_U0RR "perform processor assist" zEC12 zarch +@@ -1146,516 +1146,516 @@ ed00000000a9 czxt RSL_LRDFEU "convert to zoned extended" zEC12 zarch + + # The new instructions of IBM z13 + +-e70000000027 lcbb RXE_RRRDU "load count to block boundary" z13 zarch ++e70000000027 lcbb RXE_RRRDU "load count to block boundary" z13 zarch vx + + # Chapter 21 +-e70000000013 vgef VRV_VVXRDU "vector gather element 4 byte elements" z13 zarch +-e70000000012 vgeg VRV_VVXRDU "vector gather element 8 byte elements" z13 zarch +-e70000000044 vgbm VRI_V0U "vector generate byte mask" z13 zarch +-e70000000044 vzero VRI_V "vector set to zero" z13 zarch +-e700ffff0044 vone VRI_V "vector set to ones" z13 zarch +-e70000000046 vgm VRI_V0UUU "vector generate mask" z13 zarch +-e70000000046 vgmb VRI_V0UU "vector generate mask byte" z13 zarch +-e70000001046 vgmh VRI_V0UU "vector generate mask halfword" z13 zarch +-e70000002046 vgmf VRI_V0UU "vector generate mask word" z13 zarch +-e70000003046 vgmg VRI_V0UU "vector generate mask double word" z13 zarch +-e70000000006 vl VRX_VRRD "vector memory load" z13 zarch +-e70000000056 vlr VRX_VV "vector register load" z13 zarch +-e70000000005 vlrep VRX_VRRDU "vector load and replicate" z13 zarch +-e70000000005 vlrepb VRX_VRRD "vector load and replicate byte elements" z13 zarch +-e70000001005 vlreph VRX_VRRD "vector load and replicate halfword elements" z13 zarch +-e70000002005 vlrepf VRX_VRRD "vector load and replicate word elements" z13 zarch +-e70000003005 vlrepg VRX_VRRD "vector load and replicate double word elements" z13 zarch +-e70000000000 vleb VRX_VRRDU "vector load byte element" z13 zarch +-e70000000001 vleh VRX_VRRDU "vector load halfword element" z13 zarch +-e70000000003 vlef VRX_VRRDU "vector load word element" z13 zarch +-e70000000002 vleg VRX_VRRDU "vector load double word element" z13 zarch +-e70000000040 vleib VRI_V0IU "vector load byte element immediate" z13 zarch +-e70000000041 vleih VRI_V0IU "vector load halfword element immediate" z13 zarch +-e70000000043 vleif VRI_V0IU "vector load word element immediate" z13 zarch +-e70000000042 vleig VRI_V0IU "vector load double word element immediate" z13 zarch +-e70000000021 vlgv VRS_RVRDU "vector load gr from vr element" z13 zarch +-e70000000021 vlgvb VRS_RVRD "vector load gr from vr byte element" z13 zarch +-e70000001021 vlgvh VRS_RVRD "vector load gr from vr halfword element" z13 zarch +-e70000002021 vlgvf VRS_RVRD "vector load gr from vr word element" z13 zarch +-e70000003021 vlgvg VRS_RVRD "vector load gr from vr double word element" z13 zarch +-e70000000004 vllez VRX_VRRDU "vector load logical element and zero" z13 zarch +-e70000000004 vllezb VRX_VRRD "vector load logical byte element and zero" z13 zarch +-e70000001004 vllezh VRX_VRRD "vector load logical halfword element and zero" z13 zarch +-e70000002004 vllezf VRX_VRRD "vector load logical word element and zero" z13 zarch +-e70000003004 vllezg VRX_VRRD "vector load logical double word element and zero" z13 zarch +-e70000000036 vlm VRS_VVRD "vector load multiple" z13 zarch +-e70000000007 vlbb VRX_VRRDU "vector load to block boundary" z13 zarch +-e70000000022 vlvg VRS_VRRDU "vector load VR element from GR" z13 zarch +-e70000000022 vlvgb VRS_VRRD "vector load VR byte element from GR" z13 zarch +-e70000001022 vlvgh VRS_VRRD "vector load VR halfword element from GR" z13 zarch +-e70000002022 vlvgf VRS_VRRD "vector load VR word element from GR" z13 zarch +-e70000003022 vlvgg VRS_VRRD "vector load VR double word element from GR" z13 zarch +-e70000000062 vlvgp VRR_VRR "vector load VR from GRs disjoint" z13 zarch +-e70000000037 vll VRS_VRRD "vector load with length" z13 zarch +-e70000000061 vmrh VRR_VVV0U "vector merge high" z13 zarch +-e70000000061 vmrhb VRR_VVV "vector merge high byte" z13 zarch +-e70000001061 vmrhh VRR_VVV "vector merge high halfword" z13 zarch +-e70000002061 vmrhf VRR_VVV "vector merge high word" z13 zarch +-e70000003061 vmrhg VRR_VVV "vector merge high double word" z13 zarch +-e70000000060 vmrl VRR_VVV0U "vector merge low" z13 zarch +-e70000000060 vmrlb VRR_VVV "vector merge low byte" z13 zarch +-e70000001060 vmrlh VRR_VVV "vector merge low halfword" z13 zarch +-e70000002060 vmrlf VRR_VVV "vector merge low word" z13 zarch +-e70000003060 vmrlg VRR_VVV "vector merge low double word" z13 zarch +-e70000000094 vpk VRR_VVV0U "vector pack" z13 zarch +-e70000001094 vpkh VRR_VVV "vector pack halfword" z13 zarch +-e70000002094 vpkf VRR_VVV "vector pack word" z13 zarch +-e70000003094 vpkg VRR_VVV "vector pack double word" z13 zarch +-e70000000097 vpks VRR_VVV0U0U "vector pack saturate" z13 zarch +-e70000001097 vpksh VRR_VVV "vector pack saturate halfword" z13 zarch +-e70000002097 vpksf VRR_VVV "vector pack saturate word" z13 zarch +-e70000003097 vpksg VRR_VVV "vector pack saturate double word" z13 zarch +-e70000101097 vpkshs VRR_VVV "vector pack saturate halfword" z13 zarch +-e70000102097 vpksfs VRR_VVV "vector pack saturate word" z13 zarch +-e70000103097 vpksgs VRR_VVV "vector pack saturate double word" z13 zarch +-e70000000095 vpkls VRR_VVV0U0U "vector pack logical saturate" z13 zarch +-e70000001095 vpklsh VRR_VVV "vector pack logical saturate halfword" z13 zarch +-e70000002095 vpklsf VRR_VVV "vector pack logical saturate word" z13 zarch +-e70000003095 vpklsg VRR_VVV "vector pack logical saturate double word" z13 zarch +-e70000101095 vpklshs VRR_VVV "vector pack logical saturate halfword" z13 zarch +-e70000102095 vpklsfs VRR_VVV "vector pack logical saturate word" z13 zarch +-e70000103095 vpklsgs VRR_VVV "vector pack logical saturate double word" z13 zarch +-e7000000008c vperm VRR_VVV0V "vector permute" z13 zarch +-e70000000084 vpdi VRR_VVV0U "vector permute double word immediate" z13 zarch +-e7000000004d vrep VRI_VVUU "vector replicate" z13 zarch +-e7000000004d vrepb VRI_VVU "vector replicate byte" z13 zarch +-e7000000104d vreph VRI_VVU "vector replicate halfword" z13 zarch +-e7000000204d vrepf VRI_VVU "vector replicate word" z13 zarch +-e7000000304d vrepg VRI_VVU "vector replicate double word" z13 zarch +-e70000000045 vrepi VRI_V0IU "vector replicate immediate" z13 zarch +-e70000000045 vrepib VRI_V0I "vector replicate immediate byte" z13 zarch +-e70000001045 vrepih VRI_V0I "vector replicate immediate halfword" z13 zarch +-e70000002045 vrepif VRI_V0I "vector replicate immediate word" z13 zarch +-e70000003045 vrepig VRI_V0I "vector replicate immediate double word" z13 zarch +-e7000000001b vscef VRV_VVXRDU "vector scatter element 4 byte" z13 zarch +-e7000000001a vsceg VRV_VVXRDU "vector scatter element 8 byte" z13 zarch +-e7000000008d vsel VRR_VVV0V "vector select" z13 zarch +-e7000000005f vseg VRR_VV0U "vector sign extend to double word" z13 zarch +-e7000000005f vsegb VRR_VV "vector sign extend byte to double word" z13 zarch +-e7000000105f vsegh VRR_VV "vector sign extend halfword to double word" z13 zarch +-e7000000205f vsegf VRR_VV "vector sign extend word to double word" z13 zarch +-e7000000000e vst VRX_VRRD "vector store" z13 zarch +-e70000000008 vsteb VRX_VRRDU "vector store byte element" z13 zarch +-e70000000009 vsteh VRX_VRRDU "vector store halfword element" z13 zarch +-e7000000000b vstef VRX_VRRDU "vector store word element" z13 zarch +-e7000000000a vsteg VRX_VRRDU "vector store double word element" z13 zarch +-e7000000003e vstm VRS_VVRD "vector store multiple" z13 zarch +-e7000000003f vstl VRS_VRRD "vector store with length" z13 zarch +-e700000000d7 vuph VRR_VV0U "vector unpack high" z13 zarch +-e700000000d7 vuphb VRR_VV "vector unpack high byte" z13 zarch +-e700000010d7 vuphh VRR_VV "vector unpack high halfword" z13 zarch +-e700000020d7 vuphf VRR_VV "vector unpack high word" z13 zarch +-e700000000d5 vuplh VRR_VV0U "vector unpack logical high" z13 zarch +-e700000000d5 vuplhb VRR_VV "vector unpack logical high byte" z13 zarch +-e700000010d5 vuplhh VRR_VV "vector unpack logical high halfword" z13 zarch +-e700000020d5 vuplhf VRR_VV "vector unpack logical high word" z13 zarch +-e700000000d6 vupl VRR_VV0U "vector unpack low" z13 zarch +-e700000000d6 vuplb VRR_VV "vector unpack low byte" z13 zarch +-e700000010d6 vuplhw VRR_VV "vector unpack low halfword" z13 zarch +-e700000020d6 vuplf VRR_VV "vector unpack low word" z13 zarch +-e700000000d4 vupll VRR_VV0U "vector unpack logical low" z13 zarch +-e700000000d4 vupllb VRR_VV "vector unpack logical low byte" z13 zarch +-e700000010d4 vupllh VRR_VV "vector unpack logical low halfword" z13 zarch +-e700000020d4 vupllf VRR_VV "vector unpack logical low word" z13 zarch ++e70000000013 vgef VRV_VVXRDU "vector gather element 4 byte elements" z13 zarch vx ++e70000000012 vgeg VRV_VVXRDU "vector gather element 8 byte elements" z13 zarch vx ++e70000000044 vgbm VRI_V0U "vector generate byte mask" z13 zarch vx ++e70000000044 vzero VRI_V "vector set to zero" z13 zarch vx ++e700ffff0044 vone VRI_V "vector set to ones" z13 zarch vx ++e70000000046 vgm VRI_V0UUU "vector generate mask" z13 zarch vx ++e70000000046 vgmb VRI_V0UU "vector generate mask byte" z13 zarch vx ++e70000001046 vgmh VRI_V0UU "vector generate mask halfword" z13 zarch vx ++e70000002046 vgmf VRI_V0UU "vector generate mask word" z13 zarch vx ++e70000003046 vgmg VRI_V0UU "vector generate mask double word" z13 zarch vx ++e70000000006 vl VRX_VRRD "vector memory load" z13 zarch vx ++e70000000056 vlr VRX_VV "vector register load" z13 zarch vx ++e70000000005 vlrep VRX_VRRDU "vector load and replicate" z13 zarch vx ++e70000000005 vlrepb VRX_VRRD "vector load and replicate byte elements" z13 zarch vx ++e70000001005 vlreph VRX_VRRD "vector load and replicate halfword elements" z13 zarch vx ++e70000002005 vlrepf VRX_VRRD "vector load and replicate word elements" z13 zarch vx ++e70000003005 vlrepg VRX_VRRD "vector load and replicate double word elements" z13 zarch vx ++e70000000000 vleb VRX_VRRDU "vector load byte element" z13 zarch vx ++e70000000001 vleh VRX_VRRDU "vector load halfword element" z13 zarch vx ++e70000000003 vlef VRX_VRRDU "vector load word element" z13 zarch vx ++e70000000002 vleg VRX_VRRDU "vector load double word element" z13 zarch vx ++e70000000040 vleib VRI_V0IU "vector load byte element immediate" z13 zarch vx ++e70000000041 vleih VRI_V0IU "vector load halfword element immediate" z13 zarch vx ++e70000000043 vleif VRI_V0IU "vector load word element immediate" z13 zarch vx ++e70000000042 vleig VRI_V0IU "vector load double word element immediate" z13 zarch vx ++e70000000021 vlgv VRS_RVRDU "vector load gr from vr element" z13 zarch vx ++e70000000021 vlgvb VRS_RVRD "vector load gr from vr byte element" z13 zarch vx ++e70000001021 vlgvh VRS_RVRD "vector load gr from vr halfword element" z13 zarch vx ++e70000002021 vlgvf VRS_RVRD "vector load gr from vr word element" z13 zarch vx ++e70000003021 vlgvg VRS_RVRD "vector load gr from vr double word element" z13 zarch vx ++e70000000004 vllez VRX_VRRDU "vector load logical element and zero" z13 zarch vx ++e70000000004 vllezb VRX_VRRD "vector load logical byte element and zero" z13 zarch vx ++e70000001004 vllezh VRX_VRRD "vector load logical halfword element and zero" z13 zarch vx ++e70000002004 vllezf VRX_VRRD "vector load logical word element and zero" z13 zarch vx ++e70000003004 vllezg VRX_VRRD "vector load logical double word element and zero" z13 zarch vx ++e70000000036 vlm VRS_VVRD "vector load multiple" z13 zarch vx ++e70000000007 vlbb VRX_VRRDU "vector load to block boundary" z13 zarch vx ++e70000000022 vlvg VRS_VRRDU "vector load VR element from GR" z13 zarch vx ++e70000000022 vlvgb VRS_VRRD "vector load VR byte element from GR" z13 zarch vx ++e70000001022 vlvgh VRS_VRRD "vector load VR halfword element from GR" z13 zarch vx ++e70000002022 vlvgf VRS_VRRD "vector load VR word element from GR" z13 zarch vx ++e70000003022 vlvgg VRS_VRRD "vector load VR double word element from GR" z13 zarch vx ++e70000000062 vlvgp VRR_VRR "vector load VR from GRs disjoint" z13 zarch vx ++e70000000037 vll VRS_VRRD "vector load with length" z13 zarch vx ++e70000000061 vmrh VRR_VVV0U "vector merge high" z13 zarch vx ++e70000000061 vmrhb VRR_VVV "vector merge high byte" z13 zarch vx ++e70000001061 vmrhh VRR_VVV "vector merge high halfword" z13 zarch vx ++e70000002061 vmrhf VRR_VVV "vector merge high word" z13 zarch vx ++e70000003061 vmrhg VRR_VVV "vector merge high double word" z13 zarch vx ++e70000000060 vmrl VRR_VVV0U "vector merge low" z13 zarch vx ++e70000000060 vmrlb VRR_VVV "vector merge low byte" z13 zarch vx ++e70000001060 vmrlh VRR_VVV "vector merge low halfword" z13 zarch vx ++e70000002060 vmrlf VRR_VVV "vector merge low word" z13 zarch vx ++e70000003060 vmrlg VRR_VVV "vector merge low double word" z13 zarch vx ++e70000000094 vpk VRR_VVV0U "vector pack" z13 zarch vx ++e70000001094 vpkh VRR_VVV "vector pack halfword" z13 zarch vx ++e70000002094 vpkf VRR_VVV "vector pack word" z13 zarch vx ++e70000003094 vpkg VRR_VVV "vector pack double word" z13 zarch vx ++e70000000097 vpks VRR_VVV0U0U "vector pack saturate" z13 zarch vx ++e70000001097 vpksh VRR_VVV "vector pack saturate halfword" z13 zarch vx ++e70000002097 vpksf VRR_VVV "vector pack saturate word" z13 zarch vx ++e70000003097 vpksg VRR_VVV "vector pack saturate double word" z13 zarch vx ++e70000101097 vpkshs VRR_VVV "vector pack saturate halfword" z13 zarch vx ++e70000102097 vpksfs VRR_VVV "vector pack saturate word" z13 zarch vx ++e70000103097 vpksgs VRR_VVV "vector pack saturate double word" z13 zarch vx ++e70000000095 vpkls VRR_VVV0U0U "vector pack logical saturate" z13 zarch vx ++e70000001095 vpklsh VRR_VVV "vector pack logical saturate halfword" z13 zarch vx ++e70000002095 vpklsf VRR_VVV "vector pack logical saturate word" z13 zarch vx ++e70000003095 vpklsg VRR_VVV "vector pack logical saturate double word" z13 zarch vx ++e70000101095 vpklshs VRR_VVV "vector pack logical saturate halfword" z13 zarch vx ++e70000102095 vpklsfs VRR_VVV "vector pack logical saturate word" z13 zarch vx ++e70000103095 vpklsgs VRR_VVV "vector pack logical saturate double word" z13 zarch vx ++e7000000008c vperm VRR_VVV0V "vector permute" z13 zarch vx ++e70000000084 vpdi VRR_VVV0U "vector permute double word immediate" z13 zarch vx ++e7000000004d vrep VRI_VVUU "vector replicate" z13 zarch vx ++e7000000004d vrepb VRI_VVU "vector replicate byte" z13 zarch vx ++e7000000104d vreph VRI_VVU "vector replicate halfword" z13 zarch vx ++e7000000204d vrepf VRI_VVU "vector replicate word" z13 zarch vx ++e7000000304d vrepg VRI_VVU "vector replicate double word" z13 zarch vx ++e70000000045 vrepi VRI_V0IU "vector replicate immediate" z13 zarch vx ++e70000000045 vrepib VRI_V0I "vector replicate immediate byte" z13 zarch vx ++e70000001045 vrepih VRI_V0I "vector replicate immediate halfword" z13 zarch vx ++e70000002045 vrepif VRI_V0I "vector replicate immediate word" z13 zarch vx ++e70000003045 vrepig VRI_V0I "vector replicate immediate double word" z13 zarch vx ++e7000000001b vscef VRV_VVXRDU "vector scatter element 4 byte" z13 zarch vx ++e7000000001a vsceg VRV_VVXRDU "vector scatter element 8 byte" z13 zarch vx ++e7000000008d vsel VRR_VVV0V "vector select" z13 zarch vx ++e7000000005f vseg VRR_VV0U "vector sign extend to double word" z13 zarch vx ++e7000000005f vsegb VRR_VV "vector sign extend byte to double word" z13 zarch vx ++e7000000105f vsegh VRR_VV "vector sign extend halfword to double word" z13 zarch vx ++e7000000205f vsegf VRR_VV "vector sign extend word to double word" z13 zarch vx ++e7000000000e vst VRX_VRRD "vector store" z13 zarch vx ++e70000000008 vsteb VRX_VRRDU "vector store byte element" z13 zarch vx ++e70000000009 vsteh VRX_VRRDU "vector store halfword element" z13 zarch vx ++e7000000000b vstef VRX_VRRDU "vector store word element" z13 zarch vx ++e7000000000a vsteg VRX_VRRDU "vector store double word element" z13 zarch vx ++e7000000003e vstm VRS_VVRD "vector store multiple" z13 zarch vx ++e7000000003f vstl VRS_VRRD "vector store with length" z13 zarch vx ++e700000000d7 vuph VRR_VV0U "vector unpack high" z13 zarch vx ++e700000000d7 vuphb VRR_VV "vector unpack high byte" z13 zarch vx ++e700000010d7 vuphh VRR_VV "vector unpack high halfword" z13 zarch vx ++e700000020d7 vuphf VRR_VV "vector unpack high word" z13 zarch vx ++e700000000d5 vuplh VRR_VV0U "vector unpack logical high" z13 zarch vx ++e700000000d5 vuplhb VRR_VV "vector unpack logical high byte" z13 zarch vx ++e700000010d5 vuplhh VRR_VV "vector unpack logical high halfword" z13 zarch vx ++e700000020d5 vuplhf VRR_VV "vector unpack logical high word" z13 zarch vx ++e700000000d6 vupl VRR_VV0U "vector unpack low" z13 zarch vx ++e700000000d6 vuplb VRR_VV "vector unpack low byte" z13 zarch vx ++e700000010d6 vuplhw VRR_VV "vector unpack low halfword" z13 zarch vx ++e700000020d6 vuplf VRR_VV "vector unpack low word" z13 zarch vx ++e700000000d4 vupll VRR_VV0U "vector unpack logical low" z13 zarch vx ++e700000000d4 vupllb VRR_VV "vector unpack logical low byte" z13 zarch vx ++e700000010d4 vupllh VRR_VV "vector unpack logical low halfword" z13 zarch vx ++e700000020d4 vupllf VRR_VV "vector unpack logical low word" z13 zarch vx + + # Chapter 22 +-e700000000f3 va VRR_VVV0U "vector add" z13 zarch +-e700000000f3 vab VRR_VVV "vector add byte" z13 zarch +-e700000010f3 vah VRR_VVV "vector add halfword" z13 zarch +-e700000020f3 vaf VRR_VVV "vector add word" z13 zarch +-e700000030f3 vag VRR_VVV "vector add double word" z13 zarch +-e700000040f3 vaq VRR_VVV "vector add quad word" z13 zarch +-e700000000f1 vacc VRR_VVV0U "vector add compute carry" z13 zarch +-e700000000f1 vaccb VRR_VVV "vector add compute carry byte" z13 zarch +-e700000010f1 vacch VRR_VVV "vector add compute carry halfword" z13 zarch +-e700000020f1 vaccf VRR_VVV "vector add compute carry word" z13 zarch +-e700000030f1 vaccg VRR_VVV "vector add compute carry doubleword" z13 zarch +-e700000040f1 vaccq VRR_VVV "vector add compute carry quadword" z13 zarch +-e700000000bb vac VRR_VVVU0V "vector add with carry" z13 zarch +-e700040000bb vacq VRR_VVV0V "vector add with carry quadword" z13 zarch +-e700000000b9 vaccc VRR_VVVU0V "vector add with carry compute carry" z13 zarch +-e700040000b9 vacccq VRR_VVV0V "vector add with carry compute carry quadword" z13 zarch +-e70000000068 vn VRR_VVV "vector and" z13 zarch +-e70000000069 vnc VRR_VVV "vector and with complement" z13 zarch +-e700000000f2 vavg VRR_VVV0U "vector average" z13 zarch +-e700000000f2 vavgb VRR_VVV "vector average byte" z13 zarch +-e700000010f2 vavgh VRR_VVV "vector average half word" z13 zarch +-e700000020f2 vavgf VRR_VVV "vector average word" z13 zarch +-e700000030f2 vavgg VRR_VVV "vector average double word" z13 zarch +-e700000000f0 vavgl VRR_VVV0U "vector average logical" z13 zarch +-e700000000f0 vavglb VRR_VVV "vector average logical byte" z13 zarch +-e700000010f0 vavglh VRR_VVV "vector average logical half word" z13 zarch +-e700000020f0 vavglf VRR_VVV "vector average logical word" z13 zarch +-e700000030f0 vavglg VRR_VVV "vector average logical double word" z13 zarch +-e70000000066 vcksm VRR_VVV "vector checksum" z13 zarch +-e700000000db vec VRR_VV0U "vector element compare" z13 zarch +-e700000000db vecb VRR_VV "vector element compare byte" z13 zarch +-e700000010db vech VRR_VV "vector element compare half word" z13 zarch +-e700000020db vecf VRR_VV "vector element compare word" z13 zarch +-e700000030db vecg VRR_VV "vector element compare double word" z13 zarch +-e700000000d9 vecl VRR_VV0U "vector element compare logical" z13 zarch +-e700000000d9 veclb VRR_VV "vector element compare logical byte" z13 zarch +-e700000010d9 veclh VRR_VV "vector element compare logical half word" z13 zarch +-e700000020d9 veclf VRR_VV "vector element compare logical word" z13 zarch +-e700000030d9 veclg VRR_VV "vector element compare logical double word" z13 zarch +-e700000000f8 vceq VRR_VVV0U0U "vector compare equal" z13 zarch +-e700000000f8 vceqb VRR_VVV "vector compare equal byte" z13 zarch +-e700000010f8 vceqh VRR_VVV "vector compare equal half word" z13 zarch +-e700000020f8 vceqf VRR_VVV "vector compare equal word" z13 zarch +-e700000030f8 vceqg VRR_VVV "vector compare equal double word" z13 zarch +-e700001000f8 vceqbs VRR_VVV "vector compare equal byte" z13 zarch +-e700001010f8 vceqhs VRR_VVV "vector compare equal half word" z13 zarch +-e700001020f8 vceqfs VRR_VVV "vector compare equal word" z13 zarch +-e700001030f8 vceqgs VRR_VVV "vector compare equal double word" z13 zarch +-e700000000fb vch VRR_VVV0U0U "vector compare high" z13 zarch +-e700000000fb vchb VRR_VVV "vector compare high byte" z13 zarch +-e700000010fb vchh VRR_VVV "vector compare high half word" z13 zarch +-e700000020fb vchf VRR_VVV "vector compare high word" z13 zarch +-e700000030fb vchg VRR_VVV "vector compare high double word" z13 zarch +-e700001000fb vchbs VRR_VVV "vector compare high byte" z13 zarch +-e700001010fb vchhs VRR_VVV "vector compare high half word" z13 zarch +-e700001020fb vchfs VRR_VVV "vector compare high word" z13 zarch +-e700001030fb vchgs VRR_VVV "vector compare high double word" z13 zarch +-e700000000f9 vchl VRR_VVV0U0U "vector compare high logical" z13 zarch +-e700000000f9 vchlb VRR_VVV "vector compare high logical byte" z13 zarch +-e700000010f9 vchlh VRR_VVV "vector compare high logical half word" z13 zarch +-e700000020f9 vchlf VRR_VVV "vector compare high logical word" z13 zarch +-e700000030f9 vchlg VRR_VVV "vector compare high logical double word" z13 zarch +-e700001000f9 vchlbs VRR_VVV "vector compare high logical byte" z13 zarch +-e700001010f9 vchlhs VRR_VVV "vector compare high logical half word" z13 zarch +-e700001020f9 vchlfs VRR_VVV "vector compare high logical word" z13 zarch +-e700001030f9 vchlgs VRR_VVV "vector compare high logical double word" z13 zarch +-e70000000053 vclz VRR_VV0U "vector count leading zeros" z13 zarch +-e70000000053 vclzb VRR_VV "vector count leading zeros byte" z13 zarch +-e70000001053 vclzh VRR_VV "vector count leading zeros halfword" z13 zarch +-e70000002053 vclzf VRR_VV "vector count leading zeros word" z13 zarch +-e70000003053 vclzg VRR_VV "vector count leading zeros doubleword" z13 zarch +-e70000000052 vctz VRR_VV0U "vector count trailing zeros" z13 zarch +-e70000000052 vctzb VRR_VV "vector count trailing zeros byte" z13 zarch +-e70000001052 vctzh VRR_VV "vector count trailing zeros halfword" z13 zarch +-e70000002052 vctzf VRR_VV "vector count trailing zeros word" z13 zarch +-e70000003052 vctzg VRR_VV "vector count trailing zeros doubleword" z13 zarch +-e7000000006d vx VRR_VVV "vector exclusive or" z13 zarch +-e700000000b4 vgfm VRR_VVV0U "vector galois field multiply sum" z13 zarch +-e700000000b4 vgfmb VRR_VVV "vector galois field multiply sum byte" z13 zarch +-e700000010b4 vgfmh VRR_VVV "vector galois field multiply sum halfword" z13 zarch +-e700000020b4 vgfmf VRR_VVV "vector galois field multiply sum word" z13 zarch +-e700000030b4 vgfmg VRR_VVV "vector galois field multiply sum doubleword" z13 zarch +-e700000000bc vgfma VRR_VVVU0V "vector galois field multiply sum and accumulate" z13 zarch +-e700000000bc vgfmab VRR_VVV0V "vector galois field multiply sum and accumulate byte" z13 zarch +-e700010000bc vgfmah VRR_VVV0V "vector galois field multiply sum and accumulate halfword" z13 zarch +-e700020000bc vgfmaf VRR_VVV0V "vector galois field multiply sum and accumulate word" z13 zarch +-e700030000bc vgfmag VRR_VVV0V "vector galois field multiply sum and accumulate doubleword" z13 zarch +-e700000000de vlc VRR_VV0U "vector load complement" z13 zarch +-e700000000de vlcb VRR_VV "vector load complement byte" z13 zarch +-e700000010de vlch VRR_VV "vector load complement halfword" z13 zarch +-e700000020de vlcf VRR_VV "vector load complement word" z13 zarch +-e700000030de vlcg VRR_VV "vector load complement doubleword" z13 zarch +-e700000000df vlp VRR_VV0U "vector load positive" z13 zarch +-e700000000df vlpb VRR_VV "vector load positive byte" z13 zarch +-e700000010df vlph VRR_VV "vector load positive halfword" z13 zarch +-e700000020df vlpf VRR_VV "vector load positive word" z13 zarch +-e700000030df vlpg VRR_VV "vector load positive doubleword" z13 zarch +-e700000000ff vmx VRR_VVV0U "vector maximum" z13 zarch +-e700000000ff vmxb VRR_VVV "vector maximum byte" z13 zarch +-e700000010ff vmxh VRR_VVV "vector maximum halfword" z13 zarch +-e700000020ff vmxf VRR_VVV "vector maximum word" z13 zarch +-e700000030ff vmxg VRR_VVV "vector maximum doubleword" z13 zarch +-e700000000fd vmxl VRR_VVV0U "vector maximum logical" z13 zarch +-e700000000fd vmxlb VRR_VVV "vector maximum logical byte" z13 zarch +-e700000010fd vmxlh VRR_VVV "vector maximum logical halfword" z13 zarch +-e700000020fd vmxlf VRR_VVV "vector maximum logical word" z13 zarch +-e700000030fd vmxlg VRR_VVV "vector maximum logical doubleword" z13 zarch +-e700000000fe vmn VRR_VVV0U "vector minimum" z13 zarch +-e700000000fe vmnb VRR_VVV "vector minimum byte" z13 zarch +-e700000010fe vmnh VRR_VVV "vector minimum halfword" z13 zarch +-e700000020fe vmnf VRR_VVV "vector minimum word" z13 zarch +-e700000030fe vmng VRR_VVV "vector minimum doubleword" z13 zarch +-e700000000fc vmnl VRR_VVV0U "vector minimum logical" z13 zarch +-e700000000fc vmnlb VRR_VVV "vector minimum logical byte" z13 zarch +-e700000010fc vmnlh VRR_VVV "vector minimum logical halfword" z13 zarch +-e700000020fc vmnlf VRR_VVV "vector minimum logical word" z13 zarch +-e700000030fc vmnlg VRR_VVV "vector minimum logical doubleword" z13 zarch +-e700000000aa vmal VRR_VVVU0V "vector multiply and add low" z13 zarch +-e700000000aa vmalb VRR_VVV0V "vector multiply and add low byte" z13 zarch +-e700010000aa vmalhw VRR_VVV0V "vector multiply and add low halfword" z13 zarch +-e700020000aa vmalf VRR_VVV0V "vector multiply and add low word" z13 zarch +-e700000000ab vmah VRR_VVVU0V "vector multiply and add high" z13 zarch +-e700000000ab vmahb VRR_VVV0V "vector multiply and add high byte" z13 zarch +-e700010000ab vmahh VRR_VVV0V "vector multiply and add high halfword" z13 zarch +-e700020000ab vmahf VRR_VVV0V "vector multiply and add high word" z13 zarch +-e700000000a9 vmalh VRR_VVVU0V "vector multiply and add logical high" z13 zarch +-e700000000a9 vmalhb VRR_VVV0V "vector multiply and add logical high byte" z13 zarch +-e700010000a9 vmalhh VRR_VVV0V "vector multiply and add logical high halfword" z13 zarch +-e700020000a9 vmalhf VRR_VVV0V "vector multiply and add logical high word" z13 zarch +-e700000000ae vmae VRR_VVVU0V "vector multiply and add even" z13 zarch +-e700000000ae vmaeb VRR_VVV0V "vector multiply and add even byte" z13 zarch +-e700010000ae vmaeh VRR_VVV0V "vector multiply and add even halfword" z13 zarch +-e700020000ae vmaef VRR_VVV0V "vector multiply and add even word" z13 zarch +-e700000000ac vmale VRR_VVVU0V "vector multiply and add logical even" z13 zarch +-e700000000ac vmaleb VRR_VVV0V "vector multiply and add logical even byte" z13 zarch +-e700010000ac vmaleh VRR_VVV0V "vector multiply and add logical even halfword" z13 zarch +-e700020000ac vmalef VRR_VVV0V "vector multiply and add logical even word" z13 zarch +-e700000000af vmao VRR_VVVU0V "vector multiply and add odd" z13 zarch +-e700000000af vmaob VRR_VVV0V "vector multiply and add odd byte" z13 zarch +-e700010000af vmaoh VRR_VVV0V "vector multiply and add odd halfword" z13 zarch +-e700020000af vmaof VRR_VVV0V "vector multiply and add odd word" z13 zarch +-e700000000ad vmalo VRR_VVVU0V "vector multiply and add logical odd" z13 zarch +-e700000000ad vmalob VRR_VVV0V "vector multiply and add logical odd byte" z13 zarch +-e700010000ad vmaloh VRR_VVV0V "vector multiply and add logical odd halfword" z13 zarch +-e700020000ad vmalof VRR_VVV0V "vector multiply and add logical odd word" z13 zarch +-e700000000a3 vmh VRR_VVV0U "vector multiply high" z13 zarch +-e700000000a3 vmhb VRR_VVV "vector multiply high byte" z13 zarch +-e700000010a3 vmhh VRR_VVV "vector multiply high halfword" z13 zarch +-e700000020a3 vmhf VRR_VVV "vector multiply high word" z13 zarch +-e700000000a1 vmlh VRR_VVV0U "vector multiply logical high" z13 zarch +-e700000000a1 vmlhb VRR_VVV "vector multiply logical high byte" z13 zarch +-e700000010a1 vmlhh VRR_VVV "vector multiply logical high halfword" z13 zarch +-e700000020a1 vmlhf VRR_VVV "vector multiply logical high word" z13 zarch +-e700000000a2 vml VRR_VVV0U "vector multiply low" z13 zarch +-e700000000a2 vmlb VRR_VVV "vector multiply low byte" z13 zarch +-e700000010a2 vmlhw VRR_VVV "vector multiply low halfword" z13 zarch +-e700000020a2 vmlf VRR_VVV "vector multiply low word" z13 zarch +-e700000000a6 vme VRR_VVV0U "vector multiply even" z13 zarch +-e700000000a6 vmeb VRR_VVV "vector multiply even byte" z13 zarch +-e700000010a6 vmeh VRR_VVV "vector multiply even halfword" z13 zarch +-e700000020a6 vmef VRR_VVV "vector multiply even word" z13 zarch +-e700000000a4 vmle VRR_VVV0U "vector multiply logical even" z13 zarch +-e700000000a4 vmleb VRR_VVV "vector multiply logical even byte" z13 zarch +-e700000010a4 vmleh VRR_VVV "vector multiply logical even halfword" z13 zarch +-e700000020a4 vmlef VRR_VVV "vector multiply logical even word" z13 zarch +-e700000000a7 vmo VRR_VVV0U "vector multiply odd" z13 zarch +-e700000000a7 vmob VRR_VVV "vector multiply odd byte" z13 zarch +-e700000010a7 vmoh VRR_VVV "vector multiply odd halfword" z13 zarch +-e700000020a7 vmof VRR_VVV "vector multiply odd word" z13 zarch +-e700000000a5 vmlo VRR_VVV0U "vector multiply logical odd" z13 zarch +-e700000000a5 vmlob VRR_VVV "vector multiply logical odd byte" z13 zarch +-e700000010a5 vmloh VRR_VVV "vector multiply logical odd halfword" z13 zarch +-e700000020a5 vmlof VRR_VVV "vector multiply logical odd word" z13 zarch +-e7000000006b vno VRR_VVV "vector nor" z13 zarch +-e7000000006b vnot VRR_VVV2 "vector not" z13 zarch +-e7000000006a vo VRR_VVV "vector or" z13 zarch +-e70000000050 vpopct VRR_VV0U "vector population count" z13 zarch +-e70000000073 verllv VRR_VVV0U "vector element rotate left logical reg" z13 zarch +-e70000000073 verllvb VRR_VVV "vector element rotate left logical reg byte" z13 zarch +-e70000001073 verllvh VRR_VVV "vector element rotate left logical reg halfword" z13 zarch +-e70000002073 verllvf VRR_VVV "vector element rotate left logical reg word" z13 zarch +-e70000003073 verllvg VRR_VVV "vector element rotate left logical reg doubleword" z13 zarch +-e70000000033 verll VRS_VVRDU "vector element rotate left logical mem" z13 zarch +-e70000000033 verllb VRS_VVRD "vector element rotate left logical mem byte" z13 zarch +-e70000001033 verllh VRS_VVRD "vector element rotate left logical mem halfword" z13 zarch +-e70000002033 verllf VRS_VVRD "vector element rotate left logical mem word" z13 zarch +-e70000003033 verllg VRS_VVRD "vector element rotate left logical mem doubleword" z13 zarch +-e70000000072 verim VRI_VVV0UU "vector element rotate and insert under mask" z13 zarch +-e70000000072 verimb VRI_VVV0U "vector element rotate and insert under mask byte" z13 zarch +-e70000001072 verimh VRI_VVV0U "vector element rotate and insert under mask halfword" z13 zarch +-e70000002072 verimf VRI_VVV0U "vector element rotate and insert under mask word" z13 zarch +-e70000003072 verimg VRI_VVV0U "vector element rotate and insert under mask doubleword" z13 zarch +-e70000000070 veslv VRR_VVV0U "vector element shift left reg" z13 zarch +-e70000000070 veslvb VRR_VVV "vector element shift left reg byte" z13 zarch +-e70000001070 veslvh VRR_VVV "vector element shift left reg halfword" z13 zarch +-e70000002070 veslvf VRR_VVV "vector element shift left reg word" z13 zarch +-e70000003070 veslvg VRR_VVV "vector element shift left reg doubleword" z13 zarch +-e70000000030 vesl VRS_VVRDU "vector element shift left mem" z13 zarch +-e70000000030 veslb VRS_VVRD "vector element shift left mem byte" z13 zarch +-e70000001030 veslh VRS_VVRD "vector element shift left mem halfword" z13 zarch +-e70000002030 veslf VRS_VVRD "vector element shift left mem word" z13 zarch +-e70000003030 veslg VRS_VVRD "vector element shift left mem doubleword" z13 zarch +-e7000000007a vesrav VRR_VVV0U "vector element shift right arithmetic reg" z13 zarch +-e7000000007a vesravb VRR_VVV "vector element shift right arithmetic reg byte" z13 zarch +-e7000000107a vesravh VRR_VVV "vector element shift right arithmetic reg halfword" z13 zarch +-e7000000207a vesravf VRR_VVV "vector element shift right arithmetic reg word" z13 zarch +-e7000000307a vesravg VRR_VVV "vector element shift right arithmetic reg doubleword" z13 zarch +-e7000000003a vesra VRS_VVRDU "vector element shift right arithmetic mem" z13 zarch +-e7000000003a vesrab VRS_VVRD "vector element shift right arithmetic mem byte" z13 zarch +-e7000000103a vesrah VRS_VVRD "vector element shift right arithmetic mem halfword" z13 zarch +-e7000000203a vesraf VRS_VVRD "vector element shift right arithmetic mem word" z13 zarch +-e7000000303a vesrag VRS_VVRD "vector element shift right arithmetic mem doubleword" z13 zarch +-e70000000078 vesrlv VRR_VVV0U "vector element shift right logical reg" z13 zarch +-e70000000078 vesrlvb VRR_VVV "vector element shift right logical reg byte" z13 zarch +-e70000001078 vesrlvh VRR_VVV "vector element shift right logical reg halfword" z13 zarch +-e70000002078 vesrlvf VRR_VVV "vector element shift right logical reg word" z13 zarch +-e70000003078 vesrlvg VRR_VVV "vector element shift right logical reg doubleword" z13 zarch +-e70000000038 vesrl VRS_VVRDU "vector element shift right logical mem" z13 zarch +-e70000000038 vesrlb VRS_VVRD "vector element shift right logical mem byte" z13 zarch +-e70000001038 vesrlh VRS_VVRD "vector element shift right logical mem halfword" z13 zarch +-e70000002038 vesrlf VRS_VVRD "vector element shift right logical mem word" z13 zarch +-e70000003038 vesrlg VRS_VVRD "vector element shift right logical mem doubleword" z13 zarch +-e70000000074 vsl VRR_VVV "vector shift left" z13 zarch +-e70000000075 vslb VRR_VVV "vector shift left by byte" z13 zarch +-e70000000077 vsldb VRI_VVV0U "vector shift left double by byte" z13 zarch +-e7000000007e vsra VRR_VVV "vector shift right arithmetic" z13 zarch +-e7000000007f vsrab VRR_VVV "vector shift right arithmetic by byte" z13 zarch +-e7000000007c vsrl VRR_VVV "vector shift right logical" z13 zarch +-e7000000007d vsrlb VRR_VVV "vector shift right logical by byte" z13 zarch +-e700000000f7 vs VRR_VVV0U "vector subtract" z13 zarch +-e700000000f7 vsb VRR_VVV "vector subtract byte" z13 zarch +-e700000010f7 vsh VRR_VVV "vector subtract halfword" z13 zarch +-e700000020f7 vsf VRR_VVV "vector subtract word" z13 zarch +-e700000030f7 vsg VRR_VVV "vector subtract doubleword" z13 zarch +-e700000040f7 vsq VRR_VVV "vector subtract quadword" z13 zarch +-e700000000f5 vscbi VRR_VVV0U "vector subtract compute borrow indication" z13 zarch +-e700000000f5 vscbib VRR_VVV "vector subtract compute borrow indication byte" z13 zarch +-e700000010f5 vscbih VRR_VVV "vector subtract compute borrow indication halfword" z13 zarch +-e700000020f5 vscbif VRR_VVV "vector subtract compute borrow indication word" z13 zarch +-e700000030f5 vscbig VRR_VVV "vector subtract compute borrow indication doubleword" z13 zarch +-e700000040f5 vscbiq VRR_VVV "vector subtract compute borrow indication quadword" z13 zarch +-e700000000bf vsbi VRR_VVVU0V "vector subtract with borrow indication" z13 zarch +-e700040000bf vsbiq VRR_VVV0V "vector subtract with borrow indication quadword" z13 zarch +-e700000000bd vsbcbi VRR_VVVU0V "vector subtract with borrow compute borrow indication" z13 zarch +-e700040000bd vsbcbiq VRR_VVV0V "vector subtract with borrow compute borrow indication quadword" z13 zarch +-e70000000065 vsumg VRR_VVV0U "vector sum across doubleword" z13 zarch +-e70000001065 vsumgh VRR_VVV "vector sum across doubleword - halfword" z13 zarch +-e70000002065 vsumgf VRR_VVV "vector sum across doubleword - word" z13 zarch +-e70000000067 vsumq VRR_VVV0U "vector sum across quadword" z13 zarch +-e70000002067 vsumqf VRR_VVV "vector sum across quadword - word elements" z13 zarch +-e70000003067 vsumqg VRR_VVV "vector sum across quadword - doubleword elements" z13 zarch +-e70000000064 vsum VRR_VVV0U "vector sum across word" z13 zarch +-e70000000064 vsumb VRR_VVV "vector sum across word - byte elements" z13 zarch +-e70000001064 vsumh VRR_VVV "vector sum across word - halfword elements" z13 zarch +-e700000000d8 vtm VRR_VV "vector test under mask" z13 zarch ++e700000000f3 va VRR_VVV0U "vector add" z13 zarch vx ++e700000000f3 vab VRR_VVV "vector add byte" z13 zarch vx ++e700000010f3 vah VRR_VVV "vector add halfword" z13 zarch vx ++e700000020f3 vaf VRR_VVV "vector add word" z13 zarch vx ++e700000030f3 vag VRR_VVV "vector add double word" z13 zarch vx ++e700000040f3 vaq VRR_VVV "vector add quad word" z13 zarch vx ++e700000000f1 vacc VRR_VVV0U "vector add compute carry" z13 zarch vx ++e700000000f1 vaccb VRR_VVV "vector add compute carry byte" z13 zarch vx ++e700000010f1 vacch VRR_VVV "vector add compute carry halfword" z13 zarch vx ++e700000020f1 vaccf VRR_VVV "vector add compute carry word" z13 zarch vx ++e700000030f1 vaccg VRR_VVV "vector add compute carry doubleword" z13 zarch vx ++e700000040f1 vaccq VRR_VVV "vector add compute carry quadword" z13 zarch vx ++e700000000bb vac VRR_VVVU0V "vector add with carry" z13 zarch vx ++e700040000bb vacq VRR_VVV0V "vector add with carry quadword" z13 zarch vx ++e700000000b9 vaccc VRR_VVVU0V "vector add with carry compute carry" z13 zarch vx ++e700040000b9 vacccq VRR_VVV0V "vector add with carry compute carry quadword" z13 zarch vx ++e70000000068 vn VRR_VVV "vector and" z13 zarch vx ++e70000000069 vnc VRR_VVV "vector and with complement" z13 zarch vx ++e700000000f2 vavg VRR_VVV0U "vector average" z13 zarch vx ++e700000000f2 vavgb VRR_VVV "vector average byte" z13 zarch vx ++e700000010f2 vavgh VRR_VVV "vector average half word" z13 zarch vx ++e700000020f2 vavgf VRR_VVV "vector average word" z13 zarch vx ++e700000030f2 vavgg VRR_VVV "vector average double word" z13 zarch vx ++e700000000f0 vavgl VRR_VVV0U "vector average logical" z13 zarch vx ++e700000000f0 vavglb VRR_VVV "vector average logical byte" z13 zarch vx ++e700000010f0 vavglh VRR_VVV "vector average logical half word" z13 zarch vx ++e700000020f0 vavglf VRR_VVV "vector average logical word" z13 zarch vx ++e700000030f0 vavglg VRR_VVV "vector average logical double word" z13 zarch vx ++e70000000066 vcksm VRR_VVV "vector checksum" z13 zarch vx ++e700000000db vec VRR_VV0U "vector element compare" z13 zarch vx ++e700000000db vecb VRR_VV "vector element compare byte" z13 zarch vx ++e700000010db vech VRR_VV "vector element compare half word" z13 zarch vx ++e700000020db vecf VRR_VV "vector element compare word" z13 zarch vx ++e700000030db vecg VRR_VV "vector element compare double word" z13 zarch vx ++e700000000d9 vecl VRR_VV0U "vector element compare logical" z13 zarch vx ++e700000000d9 veclb VRR_VV "vector element compare logical byte" z13 zarch vx ++e700000010d9 veclh VRR_VV "vector element compare logical half word" z13 zarch vx ++e700000020d9 veclf VRR_VV "vector element compare logical word" z13 zarch vx ++e700000030d9 veclg VRR_VV "vector element compare logical double word" z13 zarch vx ++e700000000f8 vceq VRR_VVV0U0U "vector compare equal" z13 zarch vx ++e700000000f8 vceqb VRR_VVV "vector compare equal byte" z13 zarch vx ++e700000010f8 vceqh VRR_VVV "vector compare equal half word" z13 zarch vx ++e700000020f8 vceqf VRR_VVV "vector compare equal word" z13 zarch vx ++e700000030f8 vceqg VRR_VVV "vector compare equal double word" z13 zarch vx ++e700001000f8 vceqbs VRR_VVV "vector compare equal byte" z13 zarch vx ++e700001010f8 vceqhs VRR_VVV "vector compare equal half word" z13 zarch vx ++e700001020f8 vceqfs VRR_VVV "vector compare equal word" z13 zarch vx ++e700001030f8 vceqgs VRR_VVV "vector compare equal double word" z13 zarch vx ++e700000000fb vch VRR_VVV0U0U "vector compare high" z13 zarch vx ++e700000000fb vchb VRR_VVV "vector compare high byte" z13 zarch vx ++e700000010fb vchh VRR_VVV "vector compare high half word" z13 zarch vx ++e700000020fb vchf VRR_VVV "vector compare high word" z13 zarch vx ++e700000030fb vchg VRR_VVV "vector compare high double word" z13 zarch vx ++e700001000fb vchbs VRR_VVV "vector compare high byte" z13 zarch vx ++e700001010fb vchhs VRR_VVV "vector compare high half word" z13 zarch vx ++e700001020fb vchfs VRR_VVV "vector compare high word" z13 zarch vx ++e700001030fb vchgs VRR_VVV "vector compare high double word" z13 zarch vx ++e700000000f9 vchl VRR_VVV0U0U "vector compare high logical" z13 zarch vx ++e700000000f9 vchlb VRR_VVV "vector compare high logical byte" z13 zarch vx ++e700000010f9 vchlh VRR_VVV "vector compare high logical half word" z13 zarch vx ++e700000020f9 vchlf VRR_VVV "vector compare high logical word" z13 zarch vx ++e700000030f9 vchlg VRR_VVV "vector compare high logical double word" z13 zarch vx ++e700001000f9 vchlbs VRR_VVV "vector compare high logical byte" z13 zarch vx ++e700001010f9 vchlhs VRR_VVV "vector compare high logical half word" z13 zarch vx ++e700001020f9 vchlfs VRR_VVV "vector compare high logical word" z13 zarch vx ++e700001030f9 vchlgs VRR_VVV "vector compare high logical double word" z13 zarch vx ++e70000000053 vclz VRR_VV0U "vector count leading zeros" z13 zarch vx ++e70000000053 vclzb VRR_VV "vector count leading zeros byte" z13 zarch vx ++e70000001053 vclzh VRR_VV "vector count leading zeros halfword" z13 zarch vx ++e70000002053 vclzf VRR_VV "vector count leading zeros word" z13 zarch vx ++e70000003053 vclzg VRR_VV "vector count leading zeros doubleword" z13 zarch vx ++e70000000052 vctz VRR_VV0U "vector count trailing zeros" z13 zarch vx ++e70000000052 vctzb VRR_VV "vector count trailing zeros byte" z13 zarch vx ++e70000001052 vctzh VRR_VV "vector count trailing zeros halfword" z13 zarch vx ++e70000002052 vctzf VRR_VV "vector count trailing zeros word" z13 zarch vx ++e70000003052 vctzg VRR_VV "vector count trailing zeros doubleword" z13 zarch vx ++e7000000006d vx VRR_VVV "vector exclusive or" z13 zarch vx ++e700000000b4 vgfm VRR_VVV0U "vector galois field multiply sum" z13 zarch vx ++e700000000b4 vgfmb VRR_VVV "vector galois field multiply sum byte" z13 zarch vx ++e700000010b4 vgfmh VRR_VVV "vector galois field multiply sum halfword" z13 zarch vx ++e700000020b4 vgfmf VRR_VVV "vector galois field multiply sum word" z13 zarch vx ++e700000030b4 vgfmg VRR_VVV "vector galois field multiply sum doubleword" z13 zarch vx ++e700000000bc vgfma VRR_VVVU0V "vector galois field multiply sum and accumulate" z13 zarch vx ++e700000000bc vgfmab VRR_VVV0V "vector galois field multiply sum and accumulate byte" z13 zarch vx ++e700010000bc vgfmah VRR_VVV0V "vector galois field multiply sum and accumulate halfword" z13 zarch vx ++e700020000bc vgfmaf VRR_VVV0V "vector galois field multiply sum and accumulate word" z13 zarch vx ++e700030000bc vgfmag VRR_VVV0V "vector galois field multiply sum and accumulate doubleword" z13 zarch vx ++e700000000de vlc VRR_VV0U "vector load complement" z13 zarch vx ++e700000000de vlcb VRR_VV "vector load complement byte" z13 zarch vx ++e700000010de vlch VRR_VV "vector load complement halfword" z13 zarch vx ++e700000020de vlcf VRR_VV "vector load complement word" z13 zarch vx ++e700000030de vlcg VRR_VV "vector load complement doubleword" z13 zarch vx ++e700000000df vlp VRR_VV0U "vector load positive" z13 zarch vx ++e700000000df vlpb VRR_VV "vector load positive byte" z13 zarch vx ++e700000010df vlph VRR_VV "vector load positive halfword" z13 zarch vx ++e700000020df vlpf VRR_VV "vector load positive word" z13 zarch vx ++e700000030df vlpg VRR_VV "vector load positive doubleword" z13 zarch vx ++e700000000ff vmx VRR_VVV0U "vector maximum" z13 zarch vx ++e700000000ff vmxb VRR_VVV "vector maximum byte" z13 zarch vx ++e700000010ff vmxh VRR_VVV "vector maximum halfword" z13 zarch vx ++e700000020ff vmxf VRR_VVV "vector maximum word" z13 zarch vx ++e700000030ff vmxg VRR_VVV "vector maximum doubleword" z13 zarch vx ++e700000000fd vmxl VRR_VVV0U "vector maximum logical" z13 zarch vx ++e700000000fd vmxlb VRR_VVV "vector maximum logical byte" z13 zarch vx ++e700000010fd vmxlh VRR_VVV "vector maximum logical halfword" z13 zarch vx ++e700000020fd vmxlf VRR_VVV "vector maximum logical word" z13 zarch vx ++e700000030fd vmxlg VRR_VVV "vector maximum logical doubleword" z13 zarch vx ++e700000000fe vmn VRR_VVV0U "vector minimum" z13 zarch vx ++e700000000fe vmnb VRR_VVV "vector minimum byte" z13 zarch vx ++e700000010fe vmnh VRR_VVV "vector minimum halfword" z13 zarch vx ++e700000020fe vmnf VRR_VVV "vector minimum word" z13 zarch vx ++e700000030fe vmng VRR_VVV "vector minimum doubleword" z13 zarch vx ++e700000000fc vmnl VRR_VVV0U "vector minimum logical" z13 zarch vx ++e700000000fc vmnlb VRR_VVV "vector minimum logical byte" z13 zarch vx ++e700000010fc vmnlh VRR_VVV "vector minimum logical halfword" z13 zarch vx ++e700000020fc vmnlf VRR_VVV "vector minimum logical word" z13 zarch vx ++e700000030fc vmnlg VRR_VVV "vector minimum logical doubleword" z13 zarch vx ++e700000000aa vmal VRR_VVVU0V "vector multiply and add low" z13 zarch vx ++e700000000aa vmalb VRR_VVV0V "vector multiply and add low byte" z13 zarch vx ++e700010000aa vmalhw VRR_VVV0V "vector multiply and add low halfword" z13 zarch vx ++e700020000aa vmalf VRR_VVV0V "vector multiply and add low word" z13 zarch vx ++e700000000ab vmah VRR_VVVU0V "vector multiply and add high" z13 zarch vx ++e700000000ab vmahb VRR_VVV0V "vector multiply and add high byte" z13 zarch vx ++e700010000ab vmahh VRR_VVV0V "vector multiply and add high halfword" z13 zarch vx ++e700020000ab vmahf VRR_VVV0V "vector multiply and add high word" z13 zarch vx ++e700000000a9 vmalh VRR_VVVU0V "vector multiply and add logical high" z13 zarch vx ++e700000000a9 vmalhb VRR_VVV0V "vector multiply and add logical high byte" z13 zarch vx ++e700010000a9 vmalhh VRR_VVV0V "vector multiply and add logical high halfword" z13 zarch vx ++e700020000a9 vmalhf VRR_VVV0V "vector multiply and add logical high word" z13 zarch vx ++e700000000ae vmae VRR_VVVU0V "vector multiply and add even" z13 zarch vx ++e700000000ae vmaeb VRR_VVV0V "vector multiply and add even byte" z13 zarch vx ++e700010000ae vmaeh VRR_VVV0V "vector multiply and add even halfword" z13 zarch vx ++e700020000ae vmaef VRR_VVV0V "vector multiply and add even word" z13 zarch vx ++e700000000ac vmale VRR_VVVU0V "vector multiply and add logical even" z13 zarch vx ++e700000000ac vmaleb VRR_VVV0V "vector multiply and add logical even byte" z13 zarch vx ++e700010000ac vmaleh VRR_VVV0V "vector multiply and add logical even halfword" z13 zarch vx ++e700020000ac vmalef VRR_VVV0V "vector multiply and add logical even word" z13 zarch vx ++e700000000af vmao VRR_VVVU0V "vector multiply and add odd" z13 zarch vx ++e700000000af vmaob VRR_VVV0V "vector multiply and add odd byte" z13 zarch vx ++e700010000af vmaoh VRR_VVV0V "vector multiply and add odd halfword" z13 zarch vx ++e700020000af vmaof VRR_VVV0V "vector multiply and add odd word" z13 zarch vx ++e700000000ad vmalo VRR_VVVU0V "vector multiply and add logical odd" z13 zarch vx ++e700000000ad vmalob VRR_VVV0V "vector multiply and add logical odd byte" z13 zarch vx ++e700010000ad vmaloh VRR_VVV0V "vector multiply and add logical odd halfword" z13 zarch vx ++e700020000ad vmalof VRR_VVV0V "vector multiply and add logical odd word" z13 zarch vx ++e700000000a3 vmh VRR_VVV0U "vector multiply high" z13 zarch vx ++e700000000a3 vmhb VRR_VVV "vector multiply high byte" z13 zarch vx ++e700000010a3 vmhh VRR_VVV "vector multiply high halfword" z13 zarch vx ++e700000020a3 vmhf VRR_VVV "vector multiply high word" z13 zarch vx ++e700000000a1 vmlh VRR_VVV0U "vector multiply logical high" z13 zarch vx ++e700000000a1 vmlhb VRR_VVV "vector multiply logical high byte" z13 zarch vx ++e700000010a1 vmlhh VRR_VVV "vector multiply logical high halfword" z13 zarch vx ++e700000020a1 vmlhf VRR_VVV "vector multiply logical high word" z13 zarch vx ++e700000000a2 vml VRR_VVV0U "vector multiply low" z13 zarch vx ++e700000000a2 vmlb VRR_VVV "vector multiply low byte" z13 zarch vx ++e700000010a2 vmlhw VRR_VVV "vector multiply low halfword" z13 zarch vx ++e700000020a2 vmlf VRR_VVV "vector multiply low word" z13 zarch vx ++e700000000a6 vme VRR_VVV0U "vector multiply even" z13 zarch vx ++e700000000a6 vmeb VRR_VVV "vector multiply even byte" z13 zarch vx ++e700000010a6 vmeh VRR_VVV "vector multiply even halfword" z13 zarch vx ++e700000020a6 vmef VRR_VVV "vector multiply even word" z13 zarch vx ++e700000000a4 vmle VRR_VVV0U "vector multiply logical even" z13 zarch vx ++e700000000a4 vmleb VRR_VVV "vector multiply logical even byte" z13 zarch vx ++e700000010a4 vmleh VRR_VVV "vector multiply logical even halfword" z13 zarch vx ++e700000020a4 vmlef VRR_VVV "vector multiply logical even word" z13 zarch vx ++e700000000a7 vmo VRR_VVV0U "vector multiply odd" z13 zarch vx ++e700000000a7 vmob VRR_VVV "vector multiply odd byte" z13 zarch vx ++e700000010a7 vmoh VRR_VVV "vector multiply odd halfword" z13 zarch vx ++e700000020a7 vmof VRR_VVV "vector multiply odd word" z13 zarch vx ++e700000000a5 vmlo VRR_VVV0U "vector multiply logical odd" z13 zarch vx ++e700000000a5 vmlob VRR_VVV "vector multiply logical odd byte" z13 zarch vx ++e700000010a5 vmloh VRR_VVV "vector multiply logical odd halfword" z13 zarch vx ++e700000020a5 vmlof VRR_VVV "vector multiply logical odd word" z13 zarch vx ++e7000000006b vno VRR_VVV "vector nor" z13 zarch vx ++e7000000006b vnot VRR_VVV2 "vector not" z13 zarch vx ++e7000000006a vo VRR_VVV "vector or" z13 zarch vx ++e70000000050 vpopct VRR_VV0U "vector population count" z13 zarch vx ++e70000000073 verllv VRR_VVV0U "vector element rotate left logical reg" z13 zarch vx ++e70000000073 verllvb VRR_VVV "vector element rotate left logical reg byte" z13 zarch vx ++e70000001073 verllvh VRR_VVV "vector element rotate left logical reg halfword" z13 zarch vx ++e70000002073 verllvf VRR_VVV "vector element rotate left logical reg word" z13 zarch vx ++e70000003073 verllvg VRR_VVV "vector element rotate left logical reg doubleword" z13 zarch vx ++e70000000033 verll VRS_VVRDU "vector element rotate left logical mem" z13 zarch vx ++e70000000033 verllb VRS_VVRD "vector element rotate left logical mem byte" z13 zarch vx ++e70000001033 verllh VRS_VVRD "vector element rotate left logical mem halfword" z13 zarch vx ++e70000002033 verllf VRS_VVRD "vector element rotate left logical mem word" z13 zarch vx ++e70000003033 verllg VRS_VVRD "vector element rotate left logical mem doubleword" z13 zarch vx ++e70000000072 verim VRI_VVV0UU "vector element rotate and insert under mask" z13 zarch vx ++e70000000072 verimb VRI_VVV0U "vector element rotate and insert under mask byte" z13 zarch vx ++e70000001072 verimh VRI_VVV0U "vector element rotate and insert under mask halfword" z13 zarch vx ++e70000002072 verimf VRI_VVV0U "vector element rotate and insert under mask word" z13 zarch vx ++e70000003072 verimg VRI_VVV0U "vector element rotate and insert under mask doubleword" z13 zarch vx ++e70000000070 veslv VRR_VVV0U "vector element shift left reg" z13 zarch vx ++e70000000070 veslvb VRR_VVV "vector element shift left reg byte" z13 zarch vx ++e70000001070 veslvh VRR_VVV "vector element shift left reg halfword" z13 zarch vx ++e70000002070 veslvf VRR_VVV "vector element shift left reg word" z13 zarch vx ++e70000003070 veslvg VRR_VVV "vector element shift left reg doubleword" z13 zarch vx ++e70000000030 vesl VRS_VVRDU "vector element shift left mem" z13 zarch vx ++e70000000030 veslb VRS_VVRD "vector element shift left mem byte" z13 zarch vx ++e70000001030 veslh VRS_VVRD "vector element shift left mem halfword" z13 zarch vx ++e70000002030 veslf VRS_VVRD "vector element shift left mem word" z13 zarch vx ++e70000003030 veslg VRS_VVRD "vector element shift left mem doubleword" z13 zarch vx ++e7000000007a vesrav VRR_VVV0U "vector element shift right arithmetic reg" z13 zarch vx ++e7000000007a vesravb VRR_VVV "vector element shift right arithmetic reg byte" z13 zarch vx ++e7000000107a vesravh VRR_VVV "vector element shift right arithmetic reg halfword" z13 zarch vx ++e7000000207a vesravf VRR_VVV "vector element shift right arithmetic reg word" z13 zarch vx ++e7000000307a vesravg VRR_VVV "vector element shift right arithmetic reg doubleword" z13 zarch vx ++e7000000003a vesra VRS_VVRDU "vector element shift right arithmetic mem" z13 zarch vx ++e7000000003a vesrab VRS_VVRD "vector element shift right arithmetic mem byte" z13 zarch vx ++e7000000103a vesrah VRS_VVRD "vector element shift right arithmetic mem halfword" z13 zarch vx ++e7000000203a vesraf VRS_VVRD "vector element shift right arithmetic mem word" z13 zarch vx ++e7000000303a vesrag VRS_VVRD "vector element shift right arithmetic mem doubleword" z13 zarch vx ++e70000000078 vesrlv VRR_VVV0U "vector element shift right logical reg" z13 zarch vx ++e70000000078 vesrlvb VRR_VVV "vector element shift right logical reg byte" z13 zarch vx ++e70000001078 vesrlvh VRR_VVV "vector element shift right logical reg halfword" z13 zarch vx ++e70000002078 vesrlvf VRR_VVV "vector element shift right logical reg word" z13 zarch vx ++e70000003078 vesrlvg VRR_VVV "vector element shift right logical reg doubleword" z13 zarch vx ++e70000000038 vesrl VRS_VVRDU "vector element shift right logical mem" z13 zarch vx ++e70000000038 vesrlb VRS_VVRD "vector element shift right logical mem byte" z13 zarch vx ++e70000001038 vesrlh VRS_VVRD "vector element shift right logical mem halfword" z13 zarch vx ++e70000002038 vesrlf VRS_VVRD "vector element shift right logical mem word" z13 zarch vx ++e70000003038 vesrlg VRS_VVRD "vector element shift right logical mem doubleword" z13 zarch vx ++e70000000074 vsl VRR_VVV "vector shift left" z13 zarch vx ++e70000000075 vslb VRR_VVV "vector shift left by byte" z13 zarch vx ++e70000000077 vsldb VRI_VVV0U "vector shift left double by byte" z13 zarch vx ++e7000000007e vsra VRR_VVV "vector shift right arithmetic" z13 zarch vx ++e7000000007f vsrab VRR_VVV "vector shift right arithmetic by byte" z13 zarch vx ++e7000000007c vsrl VRR_VVV "vector shift right logical" z13 zarch vx ++e7000000007d vsrlb VRR_VVV "vector shift right logical by byte" z13 zarch vx ++e700000000f7 vs VRR_VVV0U "vector subtract" z13 zarch vx ++e700000000f7 vsb VRR_VVV "vector subtract byte" z13 zarch vx ++e700000010f7 vsh VRR_VVV "vector subtract halfword" z13 zarch vx ++e700000020f7 vsf VRR_VVV "vector subtract word" z13 zarch vx ++e700000030f7 vsg VRR_VVV "vector subtract doubleword" z13 zarch vx ++e700000040f7 vsq VRR_VVV "vector subtract quadword" z13 zarch vx ++e700000000f5 vscbi VRR_VVV0U "vector subtract compute borrow indication" z13 zarch vx ++e700000000f5 vscbib VRR_VVV "vector subtract compute borrow indication byte" z13 zarch vx ++e700000010f5 vscbih VRR_VVV "vector subtract compute borrow indication halfword" z13 zarch vx ++e700000020f5 vscbif VRR_VVV "vector subtract compute borrow indication word" z13 zarch vx ++e700000030f5 vscbig VRR_VVV "vector subtract compute borrow indication doubleword" z13 zarch vx ++e700000040f5 vscbiq VRR_VVV "vector subtract compute borrow indication quadword" z13 zarch vx ++e700000000bf vsbi VRR_VVVU0V "vector subtract with borrow indication" z13 zarch vx ++e700040000bf vsbiq VRR_VVV0V "vector subtract with borrow indication quadword" z13 zarch vx ++e700000000bd vsbcbi VRR_VVVU0V "vector subtract with borrow compute borrow indication" z13 zarch vx ++e700040000bd vsbcbiq VRR_VVV0V "vector subtract with borrow compute borrow indication quadword" z13 zarch vx ++e70000000065 vsumg VRR_VVV0U "vector sum across doubleword" z13 zarch vx ++e70000001065 vsumgh VRR_VVV "vector sum across doubleword - halfword" z13 zarch vx ++e70000002065 vsumgf VRR_VVV "vector sum across doubleword - word" z13 zarch vx ++e70000000067 vsumq VRR_VVV0U "vector sum across quadword" z13 zarch vx ++e70000002067 vsumqf VRR_VVV "vector sum across quadword - word elements" z13 zarch vx ++e70000003067 vsumqg VRR_VVV "vector sum across quadword - doubleword elements" z13 zarch vx ++e70000000064 vsum VRR_VVV0U "vector sum across word" z13 zarch vx ++e70000000064 vsumb VRR_VVV "vector sum across word - byte elements" z13 zarch vx ++e70000001064 vsumh VRR_VVV "vector sum across word - halfword elements" z13 zarch vx ++e700000000d8 vtm VRR_VV "vector test under mask" z13 zarch vx + + # Chapter 23 - Vector String Instructions +-e70000000082 vfae VRR_VVV0U0U "vector find any element equal" z13 zarch optparm +-e70000000082 vfaeb VRR_VVV0U0 "vector find any element equal byte" z13 zarch optparm +-e70000001082 vfaeh VRR_VVV0U0 "vector find any element equal halfword" z13 zarch optparm +-e70000002082 vfaef VRR_VVV0U0 "vector find any element equal word" z13 zarch optparm +-e70000100082 vfaebs VRR_VVV0U1 "vector find any element equal" z13 zarch optparm +-e70000101082 vfaehs VRR_VVV0U1 "vector find any element equal" z13 zarch optparm +-e70000102082 vfaefs VRR_VVV0U1 "vector find any element equal" z13 zarch optparm +-e70000200082 vfaezb VRR_VVV0U2 "vector find any element equal" z13 zarch optparm +-e70000201082 vfaezh VRR_VVV0U2 "vector find any element equal" z13 zarch optparm +-e70000202082 vfaezf VRR_VVV0U2 "vector find any element equal" z13 zarch optparm +-e70000300082 vfaezbs VRR_VVV0U3 "vector find any element equal" z13 zarch optparm +-e70000301082 vfaezhs VRR_VVV0U3 "vector find any element equal" z13 zarch optparm +-e70000302082 vfaezfs VRR_VVV0U3 "vector find any element equal" z13 zarch optparm +-e70000000080 vfee VRR_VVV0U0U "vector find element equal" z13 zarch optparm +-e70000000080 vfeeb VRR_VVV0U0 "vector find element equal byte" z13 zarch optparm +-e70000001080 vfeeh VRR_VVV0U0 "vector find element equal halfword" z13 zarch optparm +-e70000002080 vfeef VRR_VVV0U0 "vector find element equal word" z13 zarch optparm +-e70000100080 vfeebs VRR_VVV "vector find element equal byte" z13 zarch +-e70000101080 vfeehs VRR_VVV "vector find element equal halfword" z13 zarch +-e70000102080 vfeefs VRR_VVV "vector find element equal word" z13 zarch +-e70000200080 vfeezb VRR_VVV "vector find element equal byte" z13 zarch +-e70000201080 vfeezh VRR_VVV "vector find element equal halfword" z13 zarch +-e70000202080 vfeezf VRR_VVV "vector find element equal word" z13 zarch +-e70000300080 vfeezbs VRR_VVV "vector find element equal byte" z13 zarch +-e70000301080 vfeezhs VRR_VVV "vector find element equal halfword" z13 zarch +-e70000302080 vfeezfs VRR_VVV "vector find element equal word" z13 zarch +-e70000000081 vfene VRR_VVV0U0U "vector find element not equal" z13 zarch optparm +-e70000000081 vfeneb VRR_VVV0U0 "vector find element not equal byte" z13 zarch optparm +-e70000001081 vfeneh VRR_VVV0U0 "vector find element not equal halfword" z13 zarch optparm +-e70000002081 vfenef VRR_VVV0U0 "vector find element not equal word" z13 zarch optparm +-e70000100081 vfenebs VRR_VVV "vector find element not equal byte" z13 zarch +-e70000101081 vfenehs VRR_VVV "vector find element not equal halfword" z13 zarch +-e70000102081 vfenefs VRR_VVV "vector find element not equal word" z13 zarch +-e70000200081 vfenezb VRR_VVV "vector find element not equal byte" z13 zarch +-e70000201081 vfenezh VRR_VVV "vector find element not equal halfword" z13 zarch +-e70000202081 vfenezf VRR_VVV "vector find element not equal word" z13 zarch +-e70000300081 vfenezbs VRR_VVV "vector find element not equal byte" z13 zarch +-e70000301081 vfenezhs VRR_VVV "vector find element not equal halfword" z13 zarch +-e70000302081 vfenezfs VRR_VVV "vector find element not equal word" z13 zarch +-e7000000005c vistr VRR_VV0U0U "vector isolate string" z13 zarch optparm +-e7000000005c vistrb VRR_VV0U2 "vector isolate string byte" z13 zarch optparm +-e7000000105c vistrh VRR_VV0U2 "vector isolate string halfword" z13 zarch optparm +-e7000000205c vistrf VRR_VV0U2 "vector isolate string word" z13 zarch optparm +-e7000010005c vistrbs VRR_VV "vector isolate string byte" z13 zarch +-e7000010105c vistrhs VRR_VV "vector isolate string halfword" z13 zarch +-e7000010205c vistrfs VRR_VV "vector isolate string word" z13 zarch +-e7000000008a vstrc VRR_VVVUU0V "vector string range compare" z13 zarch optparm +-e7000000008a vstrcb VRR_VVVU0VB "vector string range compare byte" z13 zarch optparm +-e7000100008a vstrch VRR_VVVU0VB "vector string range compare halfword" z13 zarch optparm +-e7000200008a vstrcf VRR_VVVU0VB "vector string range compare word" z13 zarch optparm +-e7000010008a vstrcbs VRR_VVVU0VB1 "vector string range compare byte" z13 zarch optparm +-e7000110008a vstrchs VRR_VVVU0VB1 "vector string range compare halfword" z13 zarch optparm +-e7000210008a vstrcfs VRR_VVVU0VB1 "vector string range compare word" z13 zarch optparm +-e7000020008a vstrczb VRR_VVVU0VB2 "vector string range compare byte" z13 zarch optparm +-e7000120008a vstrczh VRR_VVVU0VB2 "vector string range compare halfword" z13 zarch optparm +-e7000220008a vstrczf VRR_VVVU0VB2 "vector string range compare word" z13 zarch optparm +-e7000030008a vstrczbs VRR_VVVU0VB3 "vector string range compare byte" z13 zarch optparm +-e7000130008a vstrczhs VRR_VVVU0VB3 "vector string range compare halfword" z13 zarch optparm +-e7000230008a vstrczfs VRR_VVVU0VB3 "vector string range compare word" z13 zarch optparm ++e70000000082 vfae VRR_VVV0U0U "vector find any element equal" z13 zarch optparm,vx ++e70000000082 vfaeb VRR_VVV0U0 "vector find any element equal byte" z13 zarch optparm,vx ++e70000001082 vfaeh VRR_VVV0U0 "vector find any element equal halfword" z13 zarch optparm,vx ++e70000002082 vfaef VRR_VVV0U0 "vector find any element equal word" z13 zarch optparm,vx ++e70000100082 vfaebs VRR_VVV0U1 "vector find any element equal" z13 zarch optparm,vx ++e70000101082 vfaehs VRR_VVV0U1 "vector find any element equal" z13 zarch optparm,vx ++e70000102082 vfaefs VRR_VVV0U1 "vector find any element equal" z13 zarch optparm,vx ++e70000200082 vfaezb VRR_VVV0U2 "vector find any element equal" z13 zarch optparm,vx ++e70000201082 vfaezh VRR_VVV0U2 "vector find any element equal" z13 zarch optparm,vx ++e70000202082 vfaezf VRR_VVV0U2 "vector find any element equal" z13 zarch optparm,vx ++e70000300082 vfaezbs VRR_VVV0U3 "vector find any element equal" z13 zarch optparm,vx ++e70000301082 vfaezhs VRR_VVV0U3 "vector find any element equal" z13 zarch optparm,vx ++e70000302082 vfaezfs VRR_VVV0U3 "vector find any element equal" z13 zarch optparm,vx ++e70000000080 vfee VRR_VVV0U0U "vector find element equal" z13 zarch optparm,vx ++e70000000080 vfeeb VRR_VVV0U0 "vector find element equal byte" z13 zarch optparm,vx ++e70000001080 vfeeh VRR_VVV0U0 "vector find element equal halfword" z13 zarch optparm,vx ++e70000002080 vfeef VRR_VVV0U0 "vector find element equal word" z13 zarch optparm,vx ++e70000100080 vfeebs VRR_VVV "vector find element equal byte" z13 zarch vx ++e70000101080 vfeehs VRR_VVV "vector find element equal halfword" z13 zarch vx ++e70000102080 vfeefs VRR_VVV "vector find element equal word" z13 zarch vx ++e70000200080 vfeezb VRR_VVV "vector find element equal byte" z13 zarch vx ++e70000201080 vfeezh VRR_VVV "vector find element equal halfword" z13 zarch vx ++e70000202080 vfeezf VRR_VVV "vector find element equal word" z13 zarch vx ++e70000300080 vfeezbs VRR_VVV "vector find element equal byte" z13 zarch vx ++e70000301080 vfeezhs VRR_VVV "vector find element equal halfword" z13 zarch vx ++e70000302080 vfeezfs VRR_VVV "vector find element equal word" z13 zarch vx ++e70000000081 vfene VRR_VVV0U0U "vector find element not equal" z13 zarch optparm,vx ++e70000000081 vfeneb VRR_VVV0U0 "vector find element not equal byte" z13 zarch optparm,vx ++e70000001081 vfeneh VRR_VVV0U0 "vector find element not equal halfword" z13 zarch optparm,vx ++e70000002081 vfenef VRR_VVV0U0 "vector find element not equal word" z13 zarch optparm,vx ++e70000100081 vfenebs VRR_VVV "vector find element not equal byte" z13 zarch vx ++e70000101081 vfenehs VRR_VVV "vector find element not equal halfword" z13 zarch vx ++e70000102081 vfenefs VRR_VVV "vector find element not equal word" z13 zarch vx ++e70000200081 vfenezb VRR_VVV "vector find element not equal byte" z13 zarch vx ++e70000201081 vfenezh VRR_VVV "vector find element not equal halfword" z13 zarch vx ++e70000202081 vfenezf VRR_VVV "vector find element not equal word" z13 zarch vx ++e70000300081 vfenezbs VRR_VVV "vector find element not equal byte" z13 zarch vx ++e70000301081 vfenezhs VRR_VVV "vector find element not equal halfword" z13 zarch vx ++e70000302081 vfenezfs VRR_VVV "vector find element not equal word" z13 zarch vx ++e7000000005c vistr VRR_VV0U0U "vector isolate string" z13 zarch optparm,vx ++e7000000005c vistrb VRR_VV0U2 "vector isolate string byte" z13 zarch optparm,vx ++e7000000105c vistrh VRR_VV0U2 "vector isolate string halfword" z13 zarch optparm,vx ++e7000000205c vistrf VRR_VV0U2 "vector isolate string word" z13 zarch optparm,vx ++e7000010005c vistrbs VRR_VV "vector isolate string byte" z13 zarch vx ++e7000010105c vistrhs VRR_VV "vector isolate string halfword" z13 zarch vx ++e7000010205c vistrfs VRR_VV "vector isolate string word" z13 zarch vx ++e7000000008a vstrc VRR_VVVUU0V "vector string range compare" z13 zarch optparm,vx ++e7000000008a vstrcb VRR_VVVU0VB "vector string range compare byte" z13 zarch optparm,vx ++e7000100008a vstrch VRR_VVVU0VB "vector string range compare halfword" z13 zarch optparm,vx ++e7000200008a vstrcf VRR_VVVU0VB "vector string range compare word" z13 zarch optparm,vx ++e7000010008a vstrcbs VRR_VVVU0VB1 "vector string range compare byte" z13 zarch optparm,vx ++e7000110008a vstrchs VRR_VVVU0VB1 "vector string range compare halfword" z13 zarch optparm,vx ++e7000210008a vstrcfs VRR_VVVU0VB1 "vector string range compare word" z13 zarch optparm,vx ++e7000020008a vstrczb VRR_VVVU0VB2 "vector string range compare byte" z13 zarch optparm,vx ++e7000120008a vstrczh VRR_VVVU0VB2 "vector string range compare halfword" z13 zarch optparm,vx ++e7000220008a vstrczf VRR_VVVU0VB2 "vector string range compare word" z13 zarch optparm,vx ++e7000030008a vstrczbs VRR_VVVU0VB3 "vector string range compare byte" z13 zarch optparm,vx ++e7000130008a vstrczhs VRR_VVVU0VB3 "vector string range compare halfword" z13 zarch optparm,vx ++e7000230008a vstrczfs VRR_VVVU0VB3 "vector string range compare word" z13 zarch optparm,vx + + # Chapter 24 +-e700000000e3 vfa VRR_VVV0UU "vector fp add" z13 zarch +-e700000030e3 vfadb VRR_VVV "vector fp add" z13 zarch +-e700000830e3 wfadb VRR_VVV "vector fp add" z13 zarch +-e700000000cb wfc VRR_VV0UU2 "vector fp compare scalar" z13 zarch +-e700000030cb wfcdb VRR_VV "vector fp compare scalar" z13 zarch +-e700000000ca wfk VRR_VV0UU2 "vector fp compare and signal scalar" z13 zarch +-e700000030ca wfkdb VRR_VV "vector fp compare and signal scalar" z13 zarch +-e700000000e8 vfce VRR_VVV0UUU "vector fp compare equal" z13 zarch +-e700000030e8 vfcedb VRR_VVV "vector fp compare equal" z13 zarch +-e700001030e8 vfcedbs VRR_VVV "vector fp compare equal" z13 zarch +-e700000830e8 wfcedb VRR_VVV "vector fp compare equal" z13 zarch +-e700001830e8 wfcedbs VRR_VVV "vector fp compare equal" z13 zarch +-e700000000eb vfch VRR_VVV0UUU "vector fp compare high" z13 zarch +-e700000030eb vfchdb VRR_VVV "vector fp compare high" z13 zarch +-e700001030eb vfchdbs VRR_VVV "vector fp compare high" z13 zarch +-e700000830eb wfchdb VRR_VVV "vector fp compare high" z13 zarch +-e700001830eb wfchdbs VRR_VVV "vector fp compare high" z13 zarch +-e700000000ea vfche VRR_VVV0UUU "vector fp compare high or equal" z13 zarch +-e700000030ea vfchedb VRR_VVV "vector fp compare high or equal" z13 zarch +-e700001030ea vfchedbs VRR_VVV "vector fp compare high or equal" z13 zarch +-e700000830ea wfchedb VRR_VVV "vector fp compare high or equal" z13 zarch +-e700001830ea wfchedbs VRR_VVV "vector fp compare high or equal" z13 zarch +-e700000000c3 vcdg VRR_VV0UUU "vector fp convert from fixed 64 bit" z13 zarch +-e700000030c3 vcdgb VRR_VV0UU "vector fp convert from fixed 64 bit" z13 zarch +-e700000830c3 wcdgb VRR_VV0UU8 "vector fp convert from fixed 64 bit" z13 zarch +-e700000000c1 vcdlg VRR_VV0UUU "vector fp convert from logical 64 bit" z13 zarch +-e700000030c1 vcdlgb VRR_VV0UU "vector fp convert from logical 64 bit" z13 zarch +-e700000830c1 wcdlgb VRR_VV0UU8 "vector fp convert from logical 64 bit" z13 zarch +-e700000000c2 vcgd VRR_VV0UUU "vector fp convert to fixed 64 bit" z13 zarch +-e700000030c2 vcgdb VRR_VV0UU "vector fp convert to fixed 64 bit" z13 zarch +-e700000830c2 wcgdb VRR_VV0UU8 "vector fp convert to fixed 64 bit" z13 zarch +-e700000000c0 vclgd VRR_VV0UUU "vector fp convert to logical 64 bit" z13 zarch +-e700000030c0 vclgdb VRR_VV0UU "vector fp convert to logical 64 bit" z13 zarch +-e700000830c0 wclgdb VRR_VV0UU8 "vector fp convert to logical 64 bit" z13 zarch +-e700000000e5 vfd VRR_VVV0UU "vector fp divide" z13 zarch +-e700000030e5 vfddb VRR_VVV "vector fp divide" z13 zarch +-e700000830e5 wfddb VRR_VVV "vector fp divide" z13 zarch +-e700000000c7 vfi VRR_VV0UUU "vector load fp integer" z13 zarch +-e700000030c7 vfidb VRR_VV0UU "vector load fp integer" z13 zarch +-e700000830c7 wfidb VRR_VV0UU8 "vector load fp integer" z13 zarch +-e700000000c4 vlde VRR_VV0UU2 "vector fp load lengthened" z13 zarch +-e700000020c4 vldeb VRR_VV "vector fp load lengthened" z13 zarch +-e700000820c4 wldeb VRR_VV "vector fp load lengthened" z13 zarch +-e700000000c5 vled VRR_VV0UUU "vector fp load rounded" z13 zarch +-e700000030c5 vledb VRR_VV0UU "vector fp load rounded" z13 zarch +-e700000830c5 wledb VRR_VV0UU8 "vector fp load rounded" z13 zarch +-e700000000e7 vfm VRR_VVV0UU "vector fp multiply" z13 zarch +-e700000030e7 vfmdb VRR_VVV "vector fp multiply" z13 zarch +-e700000830e7 wfmdb VRR_VVV "vector fp multiply" z13 zarch +-e7000000008f vfma VRR_VVVU0UV "vector fp multiply and add" z13 zarch +-e7000300008f vfmadb VRR_VVVV "vector fp multiply and add" z13 zarch +-e7000308008f wfmadb VRR_VVVV "vector fp multiply and add" z13 zarch +-e7000000008e vfms VRR_VVVU0UV "vector fp multiply and subtract" z13 zarch +-e7000300008e vfmsdb VRR_VVVV "vector fp multiply and subtract" z13 zarch +-e7000308008e wfmsdb VRR_VVVV "vector fp multiply and subtract" z13 zarch +-e700000000cc vfpso VRR_VV0UUU "vector fp perform sign operation" z13 zarch +-e700000030cc vfpsodb VRR_VV0U2 "vector fp perform sign operation" z13 zarch +-e700000830cc wfpsodb VRR_VV0U2 "vector fp perform sign operation" z13 zarch +-e700000030cc vflcdb VRR_VV "vector fp perform sign operation" z13 zarch +-e700000830cc wflcdb VRR_VV "vector fp perform sign operation" z13 zarch +-e700001030cc vflndb VRR_VV "vector fp perform sign operation" z13 zarch +-e700001830cc wflndb VRR_VV "vector fp perform sign operation" z13 zarch +-e700002030cc vflpdb VRR_VV "vector fp perform sign operation" z13 zarch +-e700002830cc wflpdb VRR_VV "vector fp perform sign operation" z13 zarch +-e700000000ce vfsq VRR_VV0UU2 "vector fp square root" z13 zarch +-e700000030ce vfsqdb VRR_VV "vector fp square root" z13 zarch +-e700000830ce wfsqdb VRR_VV "vector fp square root" z13 zarch +-e700000000e2 vfs VRR_VVV0UU "vector fp subtract" z13 zarch +-e700000030e2 vfsdb VRR_VVV "vector fp subtract" z13 zarch +-e700000830e2 wfsdb VRR_VVV "vector fp subtract" z13 zarch +-e7000000004a vftci VRI_VVUUU "vector fp test data class immediate" z13 zarch +-e7000000304a vftcidb VRI_VVU2 "vector fp test data class immediate" z13 zarch +-e7000008304a wftcidb VRI_VVU2 "vector fp test data class immediate" z13 zarch ++e700000000e3 vfa VRR_VVV0UU "vector fp add" z13 zarch vx ++e700000030e3 vfadb VRR_VVV "vector fp add" z13 zarch vx ++e700000830e3 wfadb VRR_VVV "vector fp add" z13 zarch vx ++e700000000cb wfc VRR_VV0UU2 "vector fp compare scalar" z13 zarch vx ++e700000030cb wfcdb VRR_VV "vector fp compare scalar" z13 zarch vx ++e700000000ca wfk VRR_VV0UU2 "vector fp compare and signal scalar" z13 zarch vx ++e700000030ca wfkdb VRR_VV "vector fp compare and signal scalar" z13 zarch vx ++e700000000e8 vfce VRR_VVV0UUU "vector fp compare equal" z13 zarch vx ++e700000030e8 vfcedb VRR_VVV "vector fp compare equal" z13 zarch vx ++e700001030e8 vfcedbs VRR_VVV "vector fp compare equal" z13 zarch vx ++e700000830e8 wfcedb VRR_VVV "vector fp compare equal" z13 zarch vx ++e700001830e8 wfcedbs VRR_VVV "vector fp compare equal" z13 zarch vx ++e700000000eb vfch VRR_VVV0UUU "vector fp compare high" z13 zarch vx ++e700000030eb vfchdb VRR_VVV "vector fp compare high" z13 zarch vx ++e700001030eb vfchdbs VRR_VVV "vector fp compare high" z13 zarch vx ++e700000830eb wfchdb VRR_VVV "vector fp compare high" z13 zarch vx ++e700001830eb wfchdbs VRR_VVV "vector fp compare high" z13 zarch vx ++e700000000ea vfche VRR_VVV0UUU "vector fp compare high or equal" z13 zarch vx ++e700000030ea vfchedb VRR_VVV "vector fp compare high or equal" z13 zarch vx ++e700001030ea vfchedbs VRR_VVV "vector fp compare high or equal" z13 zarch vx ++e700000830ea wfchedb VRR_VVV "vector fp compare high or equal" z13 zarch vx ++e700001830ea wfchedbs VRR_VVV "vector fp compare high or equal" z13 zarch vx ++e700000000c3 vcdg VRR_VV0UUU "vector fp convert from fixed 64 bit" z13 zarch vx ++e700000030c3 vcdgb VRR_VV0UU "vector fp convert from fixed 64 bit" z13 zarch vx ++e700000830c3 wcdgb VRR_VV0UU8 "vector fp convert from fixed 64 bit" z13 zarch vx ++e700000000c1 vcdlg VRR_VV0UUU "vector fp convert from logical 64 bit" z13 zarch vx ++e700000030c1 vcdlgb VRR_VV0UU "vector fp convert from logical 64 bit" z13 zarch vx ++e700000830c1 wcdlgb VRR_VV0UU8 "vector fp convert from logical 64 bit" z13 zarch vx ++e700000000c2 vcgd VRR_VV0UUU "vector fp convert to fixed 64 bit" z13 zarch vx ++e700000030c2 vcgdb VRR_VV0UU "vector fp convert to fixed 64 bit" z13 zarch vx ++e700000830c2 wcgdb VRR_VV0UU8 "vector fp convert to fixed 64 bit" z13 zarch vx ++e700000000c0 vclgd VRR_VV0UUU "vector fp convert to logical 64 bit" z13 zarch vx ++e700000030c0 vclgdb VRR_VV0UU "vector fp convert to logical 64 bit" z13 zarch vx ++e700000830c0 wclgdb VRR_VV0UU8 "vector fp convert to logical 64 bit" z13 zarch vx ++e700000000e5 vfd VRR_VVV0UU "vector fp divide" z13 zarch vx ++e700000030e5 vfddb VRR_VVV "vector fp divide" z13 zarch vx ++e700000830e5 wfddb VRR_VVV "vector fp divide" z13 zarch vx ++e700000000c7 vfi VRR_VV0UUU "vector load fp integer" z13 zarch vx ++e700000030c7 vfidb VRR_VV0UU "vector load fp integer" z13 zarch vx ++e700000830c7 wfidb VRR_VV0UU8 "vector load fp integer" z13 zarch vx ++e700000000c4 vlde VRR_VV0UU2 "vector fp load lengthened" z13 zarch vx ++e700000020c4 vldeb VRR_VV "vector fp load lengthened" z13 zarch vx ++e700000820c4 wldeb VRR_VV "vector fp load lengthened" z13 zarch vx ++e700000000c5 vled VRR_VV0UUU "vector fp load rounded" z13 zarch vx ++e700000030c5 vledb VRR_VV0UU "vector fp load rounded" z13 zarch vx ++e700000830c5 wledb VRR_VV0UU8 "vector fp load rounded" z13 zarch vx ++e700000000e7 vfm VRR_VVV0UU "vector fp multiply" z13 zarch vx ++e700000030e7 vfmdb VRR_VVV "vector fp multiply" z13 zarch vx ++e700000830e7 wfmdb VRR_VVV "vector fp multiply" z13 zarch vx ++e7000000008f vfma VRR_VVVU0UV "vector fp multiply and add" z13 zarch vx ++e7000300008f vfmadb VRR_VVVV "vector fp multiply and add" z13 zarch vx ++e7000308008f wfmadb VRR_VVVV "vector fp multiply and add" z13 zarch vx ++e7000000008e vfms VRR_VVVU0UV "vector fp multiply and subtract" z13 zarch vx ++e7000300008e vfmsdb VRR_VVVV "vector fp multiply and subtract" z13 zarch vx ++e7000308008e wfmsdb VRR_VVVV "vector fp multiply and subtract" z13 zarch vx ++e700000000cc vfpso VRR_VV0UUU "vector fp perform sign operation" z13 zarch vx ++e700000030cc vfpsodb VRR_VV0U2 "vector fp perform sign operation" z13 zarch vx ++e700000830cc wfpsodb VRR_VV0U2 "vector fp perform sign operation" z13 zarch vx ++e700000030cc vflcdb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700000830cc wflcdb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700001030cc vflndb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700001830cc wflndb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700002030cc vflpdb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700002830cc wflpdb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700000000ce vfsq VRR_VV0UU2 "vector fp square root" z13 zarch vx ++e700000030ce vfsqdb VRR_VV "vector fp square root" z13 zarch vx ++e700000830ce wfsqdb VRR_VV "vector fp square root" z13 zarch vx ++e700000000e2 vfs VRR_VVV0UU "vector fp subtract" z13 zarch vx ++e700000030e2 vfsdb VRR_VVV "vector fp subtract" z13 zarch vx ++e700000830e2 wfsdb VRR_VVV "vector fp subtract" z13 zarch vx ++e7000000004a vftci VRI_VVUUU "vector fp test data class immediate" z13 zarch vx ++e7000000304a vftcidb VRI_VVU2 "vector fp test data class immediate" z13 zarch vx ++e7000008304a wftcidb VRI_VVU2 "vector fp test data class immediate" z13 zarch vx + + ed00000000ae cdpt RSL_LRDFU "convert from packed to long dfp" z13 zarch + ed00000000af cxpt RSL_LRDFEU "convert from packed to extended dfp" z13 zarch diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-3of6.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-3of6.patch new file mode 100644 index 0000000..1689a0c --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-3of6.patch @@ -0,0 +1,92 @@ +commit 952c3f51ac994f5e98aa829076609124cf9e5243 +Author: Andreas Krebbel +Date: Mon Sep 12 16:32:02 2016 +0200 + + S/390: Add alternate processor names. + + This patch adds alternate CPU names which adhere to the number of the + architecture document. So instead of having z196, zEC12, and z13 you + can use arch9, arch10, and arch11. The old cpu names stay valid and + should primarily be used. + + The alternate names are supposed to improve compatibility with the IBM + XL compiler toolchain which uses the arch numbering. + + opcodes/ChangeLog: + + 2016-09-12 Andreas Krebbel + + * s390-mkopc.c (main): Support alternate arch strings. + + gas/ChangeLog: + + 2016-09-12 Andreas Krebbel + + * config/tc-s390.c (s390_parse_cpu): Support alternate arch + strings. + * doc/as.texinfo: Document new arch strings. + * doc/c-s390.texi: Likewise. + +### a/opcodes/ChangeLog +### b/opcodes/ChangeLog +## -1,3 +1,7 @@ ++2016-09-12 Andreas Krebbel ++ ++ * s390-mkopc.c (main): Support alternate arch strings. ++ + 2016-09-12 Patrick Steuer + + * s390-opc.txt: Fix kmctr instruction type. +--- a/opcodes/s390-mkopc.c ++++ b/opcodes/s390-mkopc.c +@@ -334,7 +334,7 @@ main (void) + char *str; + + if (currentLine[0] == '#' || currentLine[0] == '\n') +- continue; ++ continue; + memset (opcode, 0, 8); + num_matched = + sscanf (currentLine, "%15s %15s %15s \"%79[^\"]\" %15s %15s %79[^\n]", +@@ -346,25 +346,33 @@ main (void) + exit (1); + } + +- if (strcmp (cpu_string, "g5") == 0) ++ if (strcmp (cpu_string, "g5") == 0 ++ || strcmp (cpu_string, "arch3") == 0) + min_cpu = S390_OPCODE_G5; + else if (strcmp (cpu_string, "g6") == 0) + min_cpu = S390_OPCODE_G6; +- else if (strcmp (cpu_string, "z900") == 0) ++ else if (strcmp (cpu_string, "z900") == 0 ++ || strcmp (cpu_string, "arch5") == 0) + min_cpu = S390_OPCODE_Z900; +- else if (strcmp (cpu_string, "z990") == 0) ++ else if (strcmp (cpu_string, "z990") == 0 ++ || strcmp (cpu_string, "arch6") == 0) + min_cpu = S390_OPCODE_Z990; + else if (strcmp (cpu_string, "z9-109") == 0) + min_cpu = S390_OPCODE_Z9_109; +- else if (strcmp (cpu_string, "z9-ec") == 0) ++ else if (strcmp (cpu_string, "z9-ec") == 0 ++ || strcmp (cpu_string, "arch7") == 0) + min_cpu = S390_OPCODE_Z9_EC; +- else if (strcmp (cpu_string, "z10") == 0) ++ else if (strcmp (cpu_string, "z10") == 0 ++ || strcmp (cpu_string, "arch8") == 0) + min_cpu = S390_OPCODE_Z10; +- else if (strcmp (cpu_string, "z196") == 0) ++ else if (strcmp (cpu_string, "z196") == 0 ++ || strcmp (cpu_string, "arch9") == 0) + min_cpu = S390_OPCODE_Z196; +- else if (strcmp (cpu_string, "zEC12") == 0) ++ else if (strcmp (cpu_string, "zEC12") == 0 ++ || strcmp (cpu_string, "arch10") == 0) + min_cpu = S390_OPCODE_ZEC12; +- else if (strcmp (cpu_string, "z13") == 0) ++ else if (strcmp (cpu_string, "z13") == 0 ++ || strcmp (cpu_string, "arch11") == 0) + min_cpu = S390_OPCODE_Z13; + else { + fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string); diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-4of6.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-4of6.patch new file mode 100644 index 0000000..794f46e --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-4of6.patch @@ -0,0 +1,252 @@ +commit 08f3c71119c8fce6b392bb59b8f3ea82444d38ea +Author: Andreas Krebbel +Date: Thu Sep 10 14:27:02 2015 +0200 + + S/390: Remove F_20 and FE_20. Adjust comments. + + This is cleanup only. + + opcodes/ChangeLog: + + 2015-09-10 Andreas Krebbel + + * s390-opc.c: Remove unused (and broken) F_20 and FE_20 operand + types and adjust numbering accordingly. Fix some comments. + +--- a/opcodes/s390-opc.c ++++ b/opcodes/s390-opc.c +@@ -84,30 +84,26 @@ const struct s390_operand s390_operands[] = + { 4, 12, S390_OPERAND_FPR }, + #define F_16 17 /* FPR starting at position 16 */ + { 4, 16, S390_OPERAND_FPR }, +-#define F_20 18 /* FPR starting at position 16 */ +- { 4, 16, S390_OPERAND_FPR }, +-#define F_24 19 /* FPR starting at position 24 */ ++#define F_24 18 /* FPR starting at position 24 */ + { 4, 24, S390_OPERAND_FPR }, +-#define F_28 20 /* FPR starting at position 28 */ ++#define F_28 19 /* FPR starting at position 28 */ + { 4, 28, S390_OPERAND_FPR }, +-#define F_32 21 /* FPR starting at position 32 */ ++#define F_32 20 /* FPR starting at position 32 */ + { 4, 32, S390_OPERAND_FPR }, + + /* Floating point register pair operands. */ + +-#define FE_8 22 /* FPR starting at position 8 */ ++#define FE_8 21 /* FPR starting at position 8 */ + { 4, 8, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, +-#define FE_12 23 /* FPR starting at position 12 */ ++#define FE_12 22 /* FPR starting at position 12 */ + { 4, 12, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, +-#define FE_16 24 /* FPR starting at position 16 */ +- { 4, 16, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, +-#define FE_20 25 /* FPR starting at position 16 */ ++#define FE_16 23 /* FPR starting at position 16 */ + { 4, 16, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, +-#define FE_24 26 /* FPR starting at position 24 */ ++#define FE_24 24 /* FPR starting at position 24 */ + { 4, 24, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, +-#define FE_28 27 /* FPR starting at position 28 */ ++#define FE_28 25 /* FPR starting at position 28 */ + { 4, 28, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, +-#define FE_32 28 /* FPR starting at position 32 */ ++#define FE_32 26 /* FPR starting at position 32 */ + { 4, 32, S390_OPERAND_FPR | S390_OPERAND_REG_PAIR }, + + /* Vector register operands. */ +@@ -115,137 +111,137 @@ const struct s390_operand s390_operands[] = + /* For each of these operands and additional bit in the RXB operand is + needed. */ + +-#define V_8 29 /* Vector reg. starting at position 8 */ ++#define V_8 27 /* Vector reg. starting at position 8 */ + { 4, 8, S390_OPERAND_VR }, +-#define V_12 30 /* Vector reg. starting at position 12 */ ++#define V_12 28 /* Vector reg. starting at position 12 */ + { 4, 12, S390_OPERAND_VR }, +-#define V_CP16_12 31 /* Vector reg. starting at position 12 */ ++#define V_CP16_12 29 /* Vector reg. starting at position 12 */ + { 4, 12, S390_OPERAND_VR | S390_OPERAND_CP16 }, /* with a copy at pos 16 */ +-#define V_16 32 /* Vector reg. starting at position 16 */ ++#define V_16 30 /* Vector reg. starting at position 16 */ + { 4, 16, S390_OPERAND_VR }, +-#define V_32 33 /* Vector reg. starting at position 32 */ ++#define V_32 31 /* Vector reg. starting at position 32 */ + { 4, 32, S390_OPERAND_VR }, + + /* Access register operands. */ + +-#define A_8 34 /* Access reg. starting at position 8 */ ++#define A_8 32 /* Access reg. starting at position 8 */ + { 4, 8, S390_OPERAND_AR }, +-#define A_12 35 /* Access reg. starting at position 12 */ ++#define A_12 33 /* Access reg. starting at position 12 */ + { 4, 12, S390_OPERAND_AR }, +-#define A_24 36 /* Access reg. starting at position 24 */ ++#define A_24 34 /* Access reg. starting at position 24 */ + { 4, 24, S390_OPERAND_AR }, +-#define A_28 37 /* Access reg. starting at position 28 */ ++#define A_28 35 /* Access reg. starting at position 28 */ + { 4, 28, S390_OPERAND_AR }, + + /* Control register operands. */ + +-#define C_8 38 /* Control reg. starting at position 8 */ ++#define C_8 36 /* Control reg. starting at position 8 */ + { 4, 8, S390_OPERAND_CR }, +-#define C_12 39 /* Control reg. starting at position 12 */ ++#define C_12 37 /* Control reg. starting at position 12 */ + { 4, 12, S390_OPERAND_CR }, + + /* Base register operands. */ + +-#define B_16 40 /* Base register starting at position 16 */ ++#define B_16 38 /* Base register starting at position 16 */ + { 4, 16, S390_OPERAND_BASE | S390_OPERAND_GPR }, +-#define B_32 41 /* Base register starting at position 32 */ ++#define B_32 39 /* Base register starting at position 32 */ + { 4, 32, S390_OPERAND_BASE | S390_OPERAND_GPR }, + +-#define X_12 42 /* Index register starting at position 12 */ ++#define X_12 40 /* Index register starting at position 12 */ + { 4, 12, S390_OPERAND_INDEX | S390_OPERAND_GPR }, + +-#define VX_12 43 /* Vector index register starting at position 12 */ ++#define VX_12 41 /* Vector index register starting at position 12 */ + { 4, 12, S390_OPERAND_INDEX | S390_OPERAND_VR }, + + /* Address displacement operands. */ + +-#define D_20 44 /* Displacement starting at position 20 */ ++#define D_20 42 /* Displacement starting at position 20 */ + { 12, 20, S390_OPERAND_DISP }, +-#define D_36 45 /* Displacement starting at position 36 */ ++#define D_36 43 /* Displacement starting at position 36 */ + { 12, 36, S390_OPERAND_DISP }, +-#define D20_20 46 /* 20 bit displacement starting at 20 */ ++#define D20_20 44 /* 20 bit displacement starting at 20 */ + { 20, 20, S390_OPERAND_DISP | S390_OPERAND_SIGNED }, + + /* Length operands. */ + +-#define L4_8 47 /* 4 bit length starting at position 8 */ ++#define L4_8 45 /* 4 bit length starting at position 8 */ + { 4, 8, S390_OPERAND_LENGTH }, +-#define L4_12 48 /* 4 bit length starting at position 12 */ ++#define L4_12 46 /* 4 bit length starting at position 12 */ + { 4, 12, S390_OPERAND_LENGTH }, +-#define L8_8 49 /* 8 bit length starting at position 8 */ ++#define L8_8 47 /* 8 bit length starting at position 8 */ + { 8, 8, S390_OPERAND_LENGTH }, + + /* Signed immediate operands. */ + +-#define I8_8 50 /* 8 bit signed value starting at 8 */ ++#define I8_8 48 /* 8 bit signed value starting at 8 */ + { 8, 8, S390_OPERAND_SIGNED }, +-#define I8_32 51 /* 8 bit signed value starting at 32 */ ++#define I8_32 49 /* 8 bit signed value starting at 32 */ + { 8, 32, S390_OPERAND_SIGNED }, +-#define I12_12 52 /* 12 bit signed value starting at 12 */ ++#define I12_12 50 /* 12 bit signed value starting at 12 */ + { 12, 12, S390_OPERAND_SIGNED }, +-#define I16_16 53 /* 16 bit signed value starting at 16 */ ++#define I16_16 51 /* 16 bit signed value starting at 16 */ + { 16, 16, S390_OPERAND_SIGNED }, +-#define I16_32 54 /* 16 bit signed value starting at 32 */ ++#define I16_32 52 /* 16 bit signed value starting at 32 */ + { 16, 32, S390_OPERAND_SIGNED }, +-#define I24_24 55 /* 24 bit signed value starting at 24 */ ++#define I24_24 53 /* 24 bit signed value starting at 24 */ + { 24, 24, S390_OPERAND_SIGNED }, +-#define I32_16 56 /* 32 bit signed value starting at 16 */ ++#define I32_16 54 /* 32 bit signed value starting at 16 */ + { 32, 16, S390_OPERAND_SIGNED }, + + /* Unsigned immediate operands. */ + +-#define U4_8 57 /* 4 bit unsigned value starting at 8 */ ++#define U4_8 55 /* 4 bit unsigned value starting at 8 */ + { 4, 8, 0 }, +-#define U4_12 58 /* 4 bit unsigned value starting at 12 */ ++#define U4_12 56 /* 4 bit unsigned value starting at 12 */ + { 4, 12, 0 }, +-#define U4_16 59 /* 4 bit unsigned value starting at 16 */ ++#define U4_16 57 /* 4 bit unsigned value starting at 16 */ + { 4, 16, 0 }, +-#define U4_20 60 /* 4 bit unsigned value starting at 20 */ ++#define U4_20 58 /* 4 bit unsigned value starting at 20 */ + { 4, 20, 0 }, +-#define U4_24 61 /* 4 bit unsigned value starting at 24 */ ++#define U4_24 59 /* 4 bit unsigned value starting at 24 */ + { 4, 24, 0 }, +-#define U4_OR1_24 62 /* 4 bit unsigned value starting at 24 */ +- { 4, 24, S390_OPERAND_OR1 }, +-#define U4_OR2_24 63 /* 4 bit unsigned value starting at 24 */ +- { 4, 24, S390_OPERAND_OR2 }, +-#define U4_OR3_24 64 /* 4 bit unsigned value starting at 24 */ +- { 4, 24, S390_OPERAND_OR1 | S390_OPERAND_OR2 }, +-#define U4_28 65 /* 4 bit unsigned value starting at 28 */ ++#define U4_OR1_24 60 /* 4 bit unsigned value ORed with 1 */ ++ { 4, 24, S390_OPERAND_OR1 }, /* starting at 24 */ ++#define U4_OR2_24 61 /* 4 bit unsigned value ORed with 2 */ ++ { 4, 24, S390_OPERAND_OR2 }, /* starting at 24 */ ++#define U4_OR3_24 62 /* 4 bit unsigned value ORed with 3 */ ++ { 4, 24, S390_OPERAND_OR1 | S390_OPERAND_OR2 }, /* starting at 24 */ ++#define U4_28 63 /* 4 bit unsigned value starting at 28 */ + { 4, 28, 0 }, +-#define U4_OR8_28 66 +- { 4, 28, S390_OPERAND_OR8 }, +-#define U4_32 67 /* 4 bit unsigned value starting at 32 */ ++#define U4_OR8_28 64 /* 4 bit unsigned value ORed with 8 */ ++ { 4, 28, S390_OPERAND_OR8 }, /* starting at 28 */ ++#define U4_32 65 /* 4 bit unsigned value starting at 32 */ + { 4, 32, 0 }, +-#define U4_36 68 /* 4 bit unsigned value starting at 36 */ ++#define U4_36 66 /* 4 bit unsigned value starting at 36 */ + { 4, 36, 0 }, +-#define U8_8 69 /* 8 bit unsigned value starting at 8 */ ++#define U8_8 67 /* 8 bit unsigned value starting at 8 */ + { 8, 8, 0 }, +-#define U8_16 70 /* 8 bit unsigned value starting at 16 */ ++#define U8_16 68 /* 8 bit unsigned value starting at 16 */ + { 8, 16, 0 }, +-#define U8_24 71 /* 8 bit unsigned value starting at 24 */ ++#define U8_24 69 /* 8 bit unsigned value starting at 24 */ + { 8, 24, 0 }, +-#define U8_32 72 /* 8 bit unsigned value starting at 32 */ ++#define U8_32 70 /* 8 bit unsigned value starting at 32 */ + { 8, 32, 0 }, +-#define U12_16 73 /* 12 bit unsigned value starting at 16 */ ++#define U12_16 71 /* 12 bit unsigned value starting at 16 */ + { 12, 16, 0 }, +-#define U16_16 74 /* 16 bit unsigned value starting at 16 */ ++#define U16_16 72 /* 16 bit unsigned value starting at 16 */ + { 16, 16, 0 }, +-#define U16_32 75 /* 16 bit unsigned value starting at 32 */ ++#define U16_32 73 /* 16 bit unsigned value starting at 32 */ + { 16, 32, 0 }, +-#define U32_16 76 /* 32 bit unsigned value starting at 16 */ ++#define U32_16 74 /* 32 bit unsigned value starting at 16 */ + { 32, 16, 0 }, + + /* PC-relative address operands. */ + +-#define J12_12 77 /* 12 bit PC relative offset at 12 */ ++#define J12_12 75 /* 12 bit PC relative offset at 12 */ + { 12, 12, S390_OPERAND_PCREL }, +-#define J16_16 78 /* 16 bit PC relative offset at 16 */ ++#define J16_16 76 /* 16 bit PC relative offset at 16 */ + { 16, 16, S390_OPERAND_PCREL }, +-#define J16_32 79 /* 24 bit PC relative offset at 24 */ ++#define J16_32 77 /* 16 bit PC relative offset at 32 */ + { 16, 32, S390_OPERAND_PCREL }, +-#define J24_24 80 /* 24 bit PC relative offset at 24 */ ++#define J24_24 78 /* 24 bit PC relative offset at 24 */ + { 24, 24, S390_OPERAND_PCREL }, +-#define J32_16 81 /* 32 bit PC relative offset at 16 */ ++#define J32_16 79 /* 32 bit PC relative offset at 16 */ + { 32, 16, S390_OPERAND_PCREL }, + + }; diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-5of6.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-5of6.patch new file mode 100644 index 0000000..359552f --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-5of6.patch @@ -0,0 +1,26 @@ +commit c694bafc0bc795a63e607689cc35ad44047790e6 +Author: Andreas Krebbel +Date: Mon Sep 7 10:25:17 2015 +0200 + + S/390: Fix opcode of ppno. + + opcodes/ChangeLog: + + 2015-09-09 Andreas Krebbel + + * s390-opc.txt: Fix opcode of ppno instruction. + + gas/testsuite/ChangeLog: + + 2015-09-09 Andreas Krebbel + + * gas/s390/zarch-z13.d: Fix opcode of ppno instruction. + +--- a/opcodes/s390-opc.txt ++++ b/opcodes/s390-opc.txt +@@ -1678,4 +1678,4 @@ eb00000000e1 stocfh*12 RSY_R0RD "store high on condition" z13 zarch + e3000000003a llzrgf RXY_RRRD "load logical and zero rightmost bytes 32->64" z13 zarch + e3000000003b lzrf RXY_RRRD "load and zero rightmost byte 32->32" z13 zarch + e3000000002a lzrg RXY_RRRD "load and zero rightmost byte 64->64" z13 zarch +-b9ec ppno RRE_RR "perform pseudorandom number operation" z13 zarch ++b93c ppno RRE_RR "perform pseudorandom number operation" z13 zarch diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-6of6.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-6of6.patch new file mode 100644 index 0000000..8f99a8d --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-6of6.patch @@ -0,0 +1,623 @@ +commit 64025b4ec97fe8e932c367c6cb719e5fcf2448e8 +Author: Andreas Krebbel +Date: Mon Jan 2 16:40:29 2017 +0100 + + S/390: Add support for new cpu architecture - arch12. + + This adds support of new instructions to the S/390 specific parts. + + The important feature of the new instruction set is the support of + single and extended precision floating point vector operations. + + Note: arch12 is NOT the official name of the new CPU. It just + continues the series of archXX options supported as alternate names. + The archXX terminology refers to the edition number of the Principle + of Operations manual. The official CPU name will be added later while + keeping support of the arch12 for backwards compatibility. + + No testsuite regressions. + + Committed to mainline. + + Bye, + + -Andreas- + + opcodes/ChangeLog: + + 2017-02-23 Andreas Krebbel + + * s390-mkopc.c (main): Accept arch12 as cpu string and vx2 as + facility. + * s390-opc.c: Add new operand description macros, new instruction + types, instruction masks, and new .insn instruction types. + * s390-opc.txt: Add new arch12 instructions. + + include/ChangeLog: + + 2017-02-23 Andreas Krebbel + + * opcode/s390.h (enum s390_opcode_cpu_val): New value + S390_OPCODE_ARCH12. + (S390_INSTR_FLAG_VX2): New macro definition. + + gas/ChangeLog: + + 2017-02-23 Andreas Krebbel + + * config/tc-s390.c (s390_parse_cpu): New entry for arch12. + * doc/as.texinfo: Document arch12 as cpu type. + * doc/c-s390.texi: Likewise. + * testsuite/gas/s390/s390.exp: Run arch12 specific tests. + * testsuite/gas/s390/zarch-arch12.d: New test. + * testsuite/gas/s390/zarch-arch12.s: New test. + * testsuite/gas/s390/zarch-z13.d: Rename some mnemonics in the + output patterns. + +--- a/include/opcode/s390.h ++++ b/include/opcode/s390.h +@@ -42,14 +42,17 @@ enum s390_opcode_cpu_val + S390_OPCODE_Z196, + S390_OPCODE_ZEC12, + S390_OPCODE_Z13, ++ S390_OPCODE_ARCH12, + S390_OPCODE_MAXCPU + }; + + /* Instruction specific flags. */ + #define S390_INSTR_FLAG_OPTPARM 0x1 ++ + #define S390_INSTR_FLAG_HTM 0x2 + #define S390_INSTR_FLAG_VX 0x4 +-#define S390_INSTR_FLAG_FACILITY_MASK 0x6 ++#define S390_INSTR_FLAG_VX2 0x8 ++#define S390_INSTR_FLAG_FACILITY_MASK 0xe + + /* The opcode table is an array of struct s390_opcode. */ + +--- a/opcodes/s390-mkopc.c ++++ b/opcodes/s390-mkopc.c +@@ -374,6 +374,8 @@ main (void) + else if (strcmp (cpu_string, "z13") == 0 + || strcmp (cpu_string, "arch11") == 0) + min_cpu = S390_OPCODE_Z13; ++ else if (strcmp (cpu_string, "arch12") == 0) ++ min_cpu = S390_OPCODE_ARCH12; + else { + fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string); + exit (1); +@@ -417,6 +419,10 @@ main (void) + && (str[2] == 0 || str[2] == ',')) { + flag_bits |= S390_INSTR_FLAG_VX; + str += 2; ++ } else if (strncmp (str, "vx2", 3) == 0 ++ && (str[3] == 0 || str[3] == ',')) { ++ flag_bits |= S390_INSTR_FLAG_VX2; ++ str += 3; + } else { + fprintf (stderr, "Couldn't parse flags string %s\n", + flags_string); +--- a/opcodes/s390-opc.c ++++ b/opcodes/s390-opc.c +@@ -220,28 +220,30 @@ const struct s390_operand s390_operands[] = + { 8, 16, 0 }, + #define U8_24 69 /* 8 bit unsigned value starting at 24 */ + { 8, 24, 0 }, +-#define U8_32 70 /* 8 bit unsigned value starting at 32 */ ++#define U8_28 70 /* 8 bit unsigned value starting at 28 */ ++ { 8, 28, 0 }, ++#define U8_32 71 /* 8 bit unsigned value starting at 32 */ + { 8, 32, 0 }, +-#define U12_16 71 /* 12 bit unsigned value starting at 16 */ ++#define U12_16 72 /* 12 bit unsigned value starting at 16 */ + { 12, 16, 0 }, +-#define U16_16 72 /* 16 bit unsigned value starting at 16 */ ++#define U16_16 73 /* 16 bit unsigned value starting at 16 */ + { 16, 16, 0 }, +-#define U16_32 73 /* 16 bit unsigned value starting at 32 */ ++#define U16_32 74 /* 16 bit unsigned value starting at 32 */ + { 16, 32, 0 }, +-#define U32_16 74 /* 32 bit unsigned value starting at 16 */ ++#define U32_16 75 /* 32 bit unsigned value starting at 16 */ + { 32, 16, 0 }, + + /* PC-relative address operands. */ + +-#define J12_12 75 /* 12 bit PC relative offset at 12 */ ++#define J12_12 76 /* 12 bit PC relative offset at 12 */ + { 12, 12, S390_OPERAND_PCREL }, +-#define J16_16 76 /* 16 bit PC relative offset at 16 */ ++#define J16_16 77 /* 16 bit PC relative offset at 16 */ + { 16, 16, S390_OPERAND_PCREL }, +-#define J16_32 77 /* 16 bit PC relative offset at 32 */ ++#define J16_32 78 /* 16 bit PC relative offset at 32 */ + { 16, 32, S390_OPERAND_PCREL }, +-#define J24_24 78 /* 24 bit PC relative offset at 24 */ ++#define J24_24 79 /* 24 bit PC relative offset at 24 */ + { 24, 24, S390_OPERAND_PCREL }, +-#define J32_16 79 /* 32 bit PC relative offset at 16 */ ++#define J32_16 80 /* 32 bit PC relative offset at 16 */ + { 32, 16, S390_OPERAND_PCREL }, + + }; +@@ -425,6 +427,7 @@ const struct s390_operand s390_operands[] = + #define INSTR_RXY_RERRD 6, { RE_8,D20_20,X_12,B_16,0,0 } /* e.g. dsg */ + #define INSTR_RXY_FRRD 6, { F_8,D20_20,X_12,B_16,0,0 } /* e.g. ley */ + #define INSTR_RXY_URRD 6, { U4_8,D20_20,X_12,B_16,0,0 } /* e.g. pfd */ ++#define INSTR_RXY_0RRD 6, { D20_20,X_12,B_16,0,0 } /* e.g. bic */ + #define INSTR_RX_0RRD 4, { D_20,X_12,B_16,0,0,0 } /* e.g. be */ + #define INSTR_RX_FRRD 4, { F_8,D_20,X_12,B_16,0,0 } /* e.g. ae */ + #define INSTR_RX_FERRD 4, { FE_8,D_20,X_12,B_16,0,0 } /* e.g. mxd */ +@@ -454,23 +457,29 @@ const struct s390_operand s390_operands[] = + #define INSTR_VRI_V 6, { V_8,0,0,0,0,0 } /* e.g. vzero */ + #define INSTR_VRI_V0UUU 6, { V_8,U8_16,U8_24,U4_32,0,0 } /* e.g. vgm */ + #define INSTR_VRI_V0UU 6, { V_8,U8_16,U8_24,0,0,0 } /* e.g. vgmb */ ++#define INSTR_VRI_V0UU2 6, { V_8,U16_16,U4_32,0,0,0 } /* e.g. vlip */ + #define INSTR_VRI_VVUU 6, { V_8,V_12,U16_16,U4_32,0,0 } /* e.g. vrep */ + #define INSTR_VRI_VVU 6, { V_8,V_12,U16_16,0,0,0 } /* e.g. vrepb */ + #define INSTR_VRI_VVU2 6, { V_8,V_12,U12_16,0,0,0 } /* e.g. vftcidb */ + #define INSTR_VRI_V0IU 6, { V_8,I16_16,U4_32,0,0,0 } /* e.g. vrepi */ + #define INSTR_VRI_V0I 6, { V_8,I16_16,0,0,0,0 } /* e.g. vrepib */ + #define INSTR_VRI_VVV0UU 6, { V_8,V_12,V_16,U8_24,U4_32,0 } /* e.g. verim */ ++#define INSTR_VRI_VVV0UU2 6, { V_8,V_12,V_16,U8_28,U4_24,0 } /* e.g. vap */ + #define INSTR_VRI_VVV0U 6, { V_8,V_12,V_16,U8_24,0,0 } /* e.g. verimb*/ + #define INSTR_VRI_VVUUU 6, { V_8,V_12,U12_16,U4_32,U4_28,0 } /* e.g. vftci */ ++#define INSTR_VRI_VVUUU2 6, { V_8,V_12,U8_28,U8_16,U4_24,0 } /* e.g. vpsop */ ++#define INSTR_VRI_VR0UU 6, { V_8,R_12,U8_28,U4_24,0,0 } /* e.g. vcvd */ + #define INSTR_VRX_VRRD 6, { V_8,D_20,X_12,B_16,0,0 } /* e.g. vl */ + #define INSTR_VRX_VV 6, { V_8,V_12,0,0,0,0 } /* e.g. vlr */ +-#define INSTR_VRX_VRRDU 6, { V_8,D_20,X_12,B_16,U4_32,0 } /* e.g. vlrp */ ++#define INSTR_VRX_VRRDU 6, { V_8,D_20,X_12,B_16,U4_32,0 } /* e.g. vlrep */ + #define INSTR_VRS_RVRDU 6, { R_8,V_12,D_20,B_16,U4_32,0 } /* e.g. vlgv */ + #define INSTR_VRS_RVRD 6, { R_8,V_12,D_20,B_16,0,0 } /* e.g. vlgvb */ + #define INSTR_VRS_VVRDU 6, { V_8,V_12,D_20,B_16,U4_32,0 } /* e.g. verll */ + #define INSTR_VRS_VVRD 6, { V_8,V_12,D_20,B_16,0,0 } /* e.g. vlm */ + #define INSTR_VRS_VRRDU 6, { V_8,R_12,D_20,B_16,U4_32,0 } /* e.g. vlvg */ + #define INSTR_VRS_VRRD 6, { V_8,R_12,D_20,B_16,0,0 } /* e.g. vlvgb */ ++#define INSTR_VRS_RRDV 6, { V_32,R_12,D_20,B_16,0,0 } /* e.g. vlrlr */ ++#define INSTR_VRR_0V 6, { V_12,0,0,0,0,0 } /* e.g. vtp */ + #define INSTR_VRR_VRR 6, { V_8,R_12,R_16,0,0,0 } /* e.g. vlvgp */ + #define INSTR_VRR_VVV0U 6, { V_8,V_12,V_16,U4_32,0,0 } /* e.g. vmrh */ + #define INSTR_VRR_VVV0U0 6, { V_8,V_12,V_16,U4_24,0,0 } /* e.g. vfaeb */ +@@ -499,6 +508,9 @@ const struct s390_operand s390_operands[] = + #define INSTR_VRR_VV0UUU 6, { V_8,V_12,U4_32,U4_28,U4_24,0 } /* e.g. vcdg */ + #define INSTR_VRR_VVVU0UV 6, { V_8,V_12,V_16,V_32,U4_28,U4_20 } /* e.g. vfma */ + #define INSTR_VRR_VV0U0U 6, { V_8,V_12,U4_32,U4_24,0,0 } /* e.g. vistr */ ++#define INSTR_VRR_0VV0U 6, { V_12,V_16,U4_24,0,0,0 } /* e.g. vcp */ ++#define INSTR_VRR_RV0U 6, { R_8,V_12,U4_24,0,0,0 } /* e.g. vcvb */ ++#define INSTR_VSI_URDV 6, { V_32,D_20,B_16,U8_8,0,0 } /* e.g. vlrl */ + + #define MASK_E { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } + #define MASK_IE_UU { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 } +@@ -631,6 +643,7 @@ const struct s390_operand s390_operands[] = + #define MASK_RXY_RERRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } + #define MASK_RXY_FRRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } + #define MASK_RXY_URRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } ++#define MASK_RXY_0RRD { 0xff, 0xf0, 0x00, 0x00, 0x00, 0xff } + #define MASK_RX_0RRD { 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00 } + #define MASK_RX_FRRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } + #define MASK_RX_FERRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } +@@ -660,14 +673,18 @@ const struct s390_operand s390_operands[] = + #define MASK_VRI_V { 0xff, 0x0f, 0xff, 0xff, 0xf0, 0xff } + #define MASK_VRI_V0UUU { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff } + #define MASK_VRI_V0UU { 0xff, 0x0f, 0x00, 0x00, 0xf0, 0xff } ++#define MASK_VRI_V0UU2 { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff } + #define MASK_VRI_VVUU { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } + #define MASK_VRI_VVU { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff } + #define MASK_VRI_VVU2 { 0xff, 0x00, 0x00, 0x0f, 0xf0, 0xff } + #define MASK_VRI_V0IU { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff } + #define MASK_VRI_V0I { 0xff, 0x0f, 0x00, 0x00, 0xf0, 0xff } + #define MASK_VRI_VVV0UU { 0xff, 0x00, 0x0f, 0x00, 0x00, 0xff } ++#define MASK_VRI_VVV0UU2 { 0xff, 0x00, 0x0f, 0x00, 0x00, 0xff } + #define MASK_VRI_VVV0U { 0xff, 0x00, 0x0f, 0x00, 0xf0, 0xff } + #define MASK_VRI_VVUUU { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } ++#define MASK_VRI_VVUUU2 { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } ++#define MASK_VRI_VR0UU { 0xff, 0x00, 0xff, 0x00, 0x00, 0xff } + #define MASK_VRX_VRRD { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff } + #define MASK_VRX_VV { 0xff, 0x00, 0xff, 0xff, 0xf0, 0xff } + #define MASK_VRX_VRRDU { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } +@@ -677,6 +694,8 @@ const struct s390_operand s390_operands[] = + #define MASK_VRS_VVRD { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff } + #define MASK_VRS_VRRDU { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } + #define MASK_VRS_VRRD { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff } ++#define MASK_VRS_RRDV { 0xff, 0xf0, 0x00, 0x00, 0x00, 0xff } ++#define MASK_VRR_0V { 0xff, 0xf0, 0xff, 0xff, 0xf0, 0xff } + #define MASK_VRR_VRR { 0xff, 0x00, 0x0f, 0xff, 0xf0, 0xff } + #define MASK_VRR_VVV0U { 0xff, 0x00, 0x0f, 0xff, 0x00, 0xff } + #define MASK_VRR_VVV0U0 { 0xff, 0x00, 0x0f, 0x0f, 0xf0, 0xff } +@@ -705,36 +724,46 @@ const struct s390_operand s390_operands[] = + #define MASK_VRR_VV0UUU { 0xff, 0x00, 0xff, 0x00, 0x00, 0xff } + #define MASK_VRR_VVVU0UV { 0xff, 0x00, 0x00, 0xf0, 0x00, 0xff } + #define MASK_VRR_VV0U0U { 0xff, 0x00, 0xff, 0x0f, 0x00, 0xff } ++#define MASK_VRR_0VV0U { 0xff, 0xf0, 0x0f, 0x0f, 0xf0, 0xff } ++#define MASK_VRR_RV0U { 0xff, 0x00, 0xff, 0x0f, 0xf0, 0xff } ++#define MASK_VSI_URDV { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } ++ + + /* The opcode formats table (blueprints for .insn pseudo mnemonic). */ + + const struct s390_opcode s390_opformats[] = + { +- { "e", OP8(0x00LL), MASK_E, INSTR_E, 3, 0 ,0 }, +- { "ri", OP8(0x00LL), MASK_RI_RI, INSTR_RI_RI, 3, 0 ,0 }, +- { "rie", OP8(0x00LL), MASK_RIE_RRP, INSTR_RIE_RRP, 3, 0 ,0 }, +- { "ril", OP8(0x00LL), MASK_RIL_RP, INSTR_RIL_RP, 3, 0 ,0 }, +- { "rilu", OP8(0x00LL), MASK_RIL_RU, INSTR_RIL_RU, 3, 0 ,0 }, +- { "ris", OP8(0x00LL), MASK_RIS_RURDI, INSTR_RIS_RURDI,3, 6 ,0 }, +- { "rr", OP8(0x00LL), MASK_RR_RR, INSTR_RR_RR, 3, 0 ,0 }, +- { "rre", OP8(0x00LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0 ,0 }, +- { "rrf", OP8(0x00LL), MASK_RRF_RURR, INSTR_RRF_RURR, 3, 0 ,0 }, +- { "rrs", OP8(0x00LL), MASK_RRS_RRRDU, INSTR_RRS_RRRDU,3, 6 ,0 }, +- { "rs", OP8(0x00LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0 ,0 }, +- { "rse", OP8(0x00LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 3, 0 ,0 }, +- { "rsi", OP8(0x00LL), MASK_RSI_RRP, INSTR_RSI_RRP, 3, 0 ,0 }, +- { "rsy", OP8(0x00LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 3, 3 ,0 }, +- { "rx", OP8(0x00LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0 ,0 }, +- { "rxe", OP8(0x00LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 0 ,0 }, +- { "rxf", OP8(0x00LL), MASK_RXF_RRRDR, INSTR_RXF_RRRDR,3, 0 ,0 }, +- { "rxy", OP8(0x00LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3 ,0 }, +- { "s", OP8(0x00LL), MASK_S_RD, INSTR_S_RD, 3, 0 ,0 }, +- { "si", OP8(0x00LL), MASK_SI_URD, INSTR_SI_URD, 3, 0 ,0 }, +- { "siy", OP8(0x00LL), MASK_SIY_URD, INSTR_SIY_URD, 3, 3 ,0 }, +- { "sil", OP8(0x00LL), MASK_SIL_RDI, INSTR_SIL_RDI, 3, 6 ,0 }, +- { "ss", OP8(0x00LL), MASK_SS_RRRDRD, INSTR_SS_RRRDRD,3, 0 ,0 }, +- { "sse", OP8(0x00LL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 3, 0 ,0 }, +- { "ssf", OP8(0x00LL), MASK_SSF_RRDRD, INSTR_SSF_RRDRD,3, 0 ,0 }, ++ { "e", OP8(0x00LL), MASK_E, INSTR_E, 3, 0 ,0 }, ++ { "ri", OP8(0x00LL), MASK_RI_RI, INSTR_RI_RI, 3, 0 ,0 }, ++ { "rie", OP8(0x00LL), MASK_RIE_RRP, INSTR_RIE_RRP, 3, 0 ,0 }, ++ { "ril", OP8(0x00LL), MASK_RIL_RP, INSTR_RIL_RP, 3, 0 ,0 }, ++ { "rilu", OP8(0x00LL), MASK_RIL_RU, INSTR_RIL_RU, 3, 0 ,0 }, ++ { "ris", OP8(0x00LL), MASK_RIS_RURDI, INSTR_RIS_RURDI, 3, 6 ,0 }, ++ { "rr", OP8(0x00LL), MASK_RR_RR, INSTR_RR_RR, 3, 0 ,0 }, ++ { "rre", OP8(0x00LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0 ,0 }, ++ { "rrf", OP8(0x00LL), MASK_RRF_RURR, INSTR_RRF_RURR, 3, 0 ,0 }, ++ { "rrs", OP8(0x00LL), MASK_RRS_RRRDU, INSTR_RRS_RRRDU, 3, 6 ,0 }, ++ { "rs", OP8(0x00LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0 ,0 }, ++ { "rse", OP8(0x00LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 3, 0 ,0 }, ++ { "rsi", OP8(0x00LL), MASK_RSI_RRP, INSTR_RSI_RRP, 3, 0 ,0 }, ++ { "rsy", OP8(0x00LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 3, 3 ,0 }, ++ { "rx", OP8(0x00LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0 ,0 }, ++ { "rxe", OP8(0x00LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 0 ,0 }, ++ { "rxf", OP8(0x00LL), MASK_RXF_RRRDR, INSTR_RXF_RRRDR, 3, 0 ,0 }, ++ { "rxy", OP8(0x00LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3 ,0 }, ++ { "s", OP8(0x00LL), MASK_S_RD, INSTR_S_RD, 3, 0 ,0 }, ++ { "si", OP8(0x00LL), MASK_SI_URD, INSTR_SI_URD, 3, 0 ,0 }, ++ { "siy", OP8(0x00LL), MASK_SIY_URD, INSTR_SIY_URD, 3, 3 ,0 }, ++ { "sil", OP8(0x00LL), MASK_SIL_RDI, INSTR_SIL_RDI, 3, 6 ,0 }, ++ { "ss", OP8(0x00LL), MASK_SS_RRRDRD, INSTR_SS_RRRDRD, 3, 0 ,0 }, ++ { "sse", OP8(0x00LL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 3, 0 ,0 }, ++ { "ssf", OP8(0x00LL), MASK_SSF_RRDRD, INSTR_SSF_RRDRD, 3, 0 ,0 }, ++ { "vrv", OP8(0x00LL), MASK_VRV_VVXRDU, INSTR_VRV_VVXRDU, 3, 9 ,0 }, ++ { "vri", OP8(0x00LL), MASK_VRI_VVUUU, INSTR_VRI_VVUUU, 3, 9 ,0 }, ++ { "vrx", OP8(0x00LL), MASK_VRX_VRRDU, INSTR_VRX_VRRDU, 3, 9 ,0 }, ++ { "vrs", OP8(0x00LL), MASK_VRS_RVRDU, INSTR_VRS_RVRDU, 3, 9 ,0 }, ++ { "vrr", OP8(0x00LL), MASK_VRR_VVV0UUU, INSTR_VRR_VVV0UUU, 3, 9 ,0 }, ++ { "vsi", OP8(0x00LL), MASK_VSI_URDV, INSTR_VSI_URDV, 3, 10 ,0 }, + }; + + const int s390_num_opformats = +--- a/opcodes/s390-opc.txt ++++ b/opcodes/s390-opc.txt +@@ -630,7 +630,7 @@ eb0000000051 tmy SIY_URD "test under mask with long offset" z990 zarch + # 'old' instructions extended to long displacement + # these instructions are entered into the opcode table twice. + e30000000003 lrag RXY_RRRD "load real address with long offset 64" z990 zarch +-e30000000004 lg RXY_RRRD " load 64" z990 zarch ++e30000000004 lg RXY_RRRD "load 64" z990 zarch + e30000000008 ag RXY_RRRD "add with long offset 64" z990 zarch + e30000000009 sg RXY_RRRD "subtract with long offset 64" z990 zarch + e3000000000a alg RXY_RRRD "add logical with long offset 64" z990 zarch +@@ -1584,27 +1584,27 @@ e7000230008a vstrczfs VRR_VVVU0VB3 "vector string range compare word" z13 zarch + + # Chapter 24 + e700000000e3 vfa VRR_VVV0UU "vector fp add" z13 zarch vx +-e700000030e3 vfadb VRR_VVV "vector fp add" z13 zarch vx +-e700000830e3 wfadb VRR_VVV "vector fp add" z13 zarch vx ++e700000030e3 vfadb VRR_VVV "vector fp add long" z13 zarch vx ++e700000830e3 wfadb VRR_VVV "vector fp add long" z13 zarch vx + e700000000cb wfc VRR_VV0UU2 "vector fp compare scalar" z13 zarch vx +-e700000030cb wfcdb VRR_VV "vector fp compare scalar" z13 zarch vx ++e700000030cb wfcdb VRR_VV "vector fp compare scalar long" z13 zarch vx + e700000000ca wfk VRR_VV0UU2 "vector fp compare and signal scalar" z13 zarch vx +-e700000030ca wfkdb VRR_VV "vector fp compare and signal scalar" z13 zarch vx ++e700000030ca wfkdb VRR_VV "vector fp compare and signal scalar long" z13 zarch vx + e700000000e8 vfce VRR_VVV0UUU "vector fp compare equal" z13 zarch vx +-e700000030e8 vfcedb VRR_VVV "vector fp compare equal" z13 zarch vx +-e700001030e8 vfcedbs VRR_VVV "vector fp compare equal" z13 zarch vx +-e700000830e8 wfcedb VRR_VVV "vector fp compare equal" z13 zarch vx +-e700001830e8 wfcedbs VRR_VVV "vector fp compare equal" z13 zarch vx ++e700000030e8 vfcedb VRR_VVV "vector fp compare equal long" z13 zarch vx ++e700001030e8 vfcedbs VRR_VVV "vector fp compare equal long" z13 zarch vx ++e700000830e8 wfcedb VRR_VVV "vector fp compare equal long" z13 zarch vx ++e700001830e8 wfcedbs VRR_VVV "vector fp compare equal long" z13 zarch vx + e700000000eb vfch VRR_VVV0UUU "vector fp compare high" z13 zarch vx +-e700000030eb vfchdb VRR_VVV "vector fp compare high" z13 zarch vx +-e700001030eb vfchdbs VRR_VVV "vector fp compare high" z13 zarch vx +-e700000830eb wfchdb VRR_VVV "vector fp compare high" z13 zarch vx +-e700001830eb wfchdbs VRR_VVV "vector fp compare high" z13 zarch vx ++e700000030eb vfchdb VRR_VVV "vector fp compare high long" z13 zarch vx ++e700001030eb vfchdbs VRR_VVV "vector fp compare high long" z13 zarch vx ++e700000830eb wfchdb VRR_VVV "vector fp compare high long" z13 zarch vx ++e700001830eb wfchdbs VRR_VVV "vector fp compare high long" z13 zarch vx + e700000000ea vfche VRR_VVV0UUU "vector fp compare high or equal" z13 zarch vx +-e700000030ea vfchedb VRR_VVV "vector fp compare high or equal" z13 zarch vx +-e700001030ea vfchedbs VRR_VVV "vector fp compare high or equal" z13 zarch vx +-e700000830ea wfchedb VRR_VVV "vector fp compare high or equal" z13 zarch vx +-e700001830ea wfchedbs VRR_VVV "vector fp compare high or equal" z13 zarch vx ++e700000030ea vfchedb VRR_VVV "vector fp compare high or equal long" z13 zarch vx ++e700001030ea vfchedbs VRR_VVV "vector fp compare high or equal long" z13 zarch vx ++e700000830ea wfchedb VRR_VVV "vector fp compare high or equal long" z13 zarch vx ++e700001830ea wfchedbs VRR_VVV "vector fp compare high or equal long" z13 zarch vx + e700000000c3 vcdg VRR_VV0UUU "vector fp convert from fixed 64 bit" z13 zarch vx + e700000030c3 vcdgb VRR_VV0UU "vector fp convert from fixed 64 bit" z13 zarch vx + e700000830c3 wcdgb VRR_VV0UU8 "vector fp convert from fixed 64 bit" z13 zarch vx +@@ -1618,41 +1618,41 @@ e700000000c0 vclgd VRR_VV0UUU "vector fp convert to logical 64 bit" z13 zarch vx + e700000030c0 vclgdb VRR_VV0UU "vector fp convert to logical 64 bit" z13 zarch vx + e700000830c0 wclgdb VRR_VV0UU8 "vector fp convert to logical 64 bit" z13 zarch vx + e700000000e5 vfd VRR_VVV0UU "vector fp divide" z13 zarch vx +-e700000030e5 vfddb VRR_VVV "vector fp divide" z13 zarch vx +-e700000830e5 wfddb VRR_VVV "vector fp divide" z13 zarch vx ++e700000030e5 vfddb VRR_VVV "vector fp divide long" z13 zarch vx ++e700000830e5 wfddb VRR_VVV "vector fp divide long" z13 zarch vx + e700000000c7 vfi VRR_VV0UUU "vector load fp integer" z13 zarch vx +-e700000030c7 vfidb VRR_VV0UU "vector load fp integer" z13 zarch vx +-e700000830c7 wfidb VRR_VV0UU8 "vector load fp integer" z13 zarch vx ++e700000030c7 vfidb VRR_VV0UU "vector load fp integer long" z13 zarch vx ++e700000830c7 wfidb VRR_VV0UU8 "vector load fp integer long" z13 zarch vx + e700000000c4 vlde VRR_VV0UU2 "vector fp load lengthened" z13 zarch vx +-e700000020c4 vldeb VRR_VV "vector fp load lengthened" z13 zarch vx +-e700000820c4 wldeb VRR_VV "vector fp load lengthened" z13 zarch vx ++e700000020c4 vldeb VRR_VV "vector fp load lengthened short to long" z13 zarch vx ++e700000820c4 wldeb VRR_VV "vector fp load lengthened short to long" z13 zarch vx + e700000000c5 vled VRR_VV0UUU "vector fp load rounded" z13 zarch vx +-e700000030c5 vledb VRR_VV0UU "vector fp load rounded" z13 zarch vx +-e700000830c5 wledb VRR_VV0UU8 "vector fp load rounded" z13 zarch vx ++e700000030c5 vledb VRR_VV0UU "vector fp load rounded long to short" z13 zarch vx ++e700000830c5 wledb VRR_VV0UU8 "vector fp load rounded long to short" z13 zarch vx + e700000000e7 vfm VRR_VVV0UU "vector fp multiply" z13 zarch vx +-e700000030e7 vfmdb VRR_VVV "vector fp multiply" z13 zarch vx +-e700000830e7 wfmdb VRR_VVV "vector fp multiply" z13 zarch vx ++e700000030e7 vfmdb VRR_VVV "vector fp multiply long" z13 zarch vx ++e700000830e7 wfmdb VRR_VVV "vector fp multiply long" z13 zarch vx + e7000000008f vfma VRR_VVVU0UV "vector fp multiply and add" z13 zarch vx +-e7000300008f vfmadb VRR_VVVV "vector fp multiply and add" z13 zarch vx +-e7000308008f wfmadb VRR_VVVV "vector fp multiply and add" z13 zarch vx ++e7000300008f vfmadb VRR_VVVV "vector fp multiply and add long" z13 zarch vx ++e7000308008f wfmadb VRR_VVVV "vector fp multiply and add long" z13 zarch vx + e7000000008e vfms VRR_VVVU0UV "vector fp multiply and subtract" z13 zarch vx +-e7000300008e vfmsdb VRR_VVVV "vector fp multiply and subtract" z13 zarch vx +-e7000308008e wfmsdb VRR_VVVV "vector fp multiply and subtract" z13 zarch vx ++e7000300008e vfmsdb VRR_VVVV "vector fp multiply and subtract long" z13 zarch vx ++e7000308008e wfmsdb VRR_VVVV "vector fp multiply and subtract long" z13 zarch vx + e700000000cc vfpso VRR_VV0UUU "vector fp perform sign operation" z13 zarch vx +-e700000030cc vfpsodb VRR_VV0U2 "vector fp perform sign operation" z13 zarch vx +-e700000830cc wfpsodb VRR_VV0U2 "vector fp perform sign operation" z13 zarch vx +-e700000030cc vflcdb VRR_VV "vector fp perform sign operation" z13 zarch vx +-e700000830cc wflcdb VRR_VV "vector fp perform sign operation" z13 zarch vx +-e700001030cc vflndb VRR_VV "vector fp perform sign operation" z13 zarch vx +-e700001830cc wflndb VRR_VV "vector fp perform sign operation" z13 zarch vx +-e700002030cc vflpdb VRR_VV "vector fp perform sign operation" z13 zarch vx +-e700002830cc wflpdb VRR_VV "vector fp perform sign operation" z13 zarch vx ++e700000030cc vfpsodb VRR_VV0U2 "vector fp perform sign operation long" z13 zarch vx ++e700000830cc wfpsodb VRR_VV0U2 "vector fp perform sign operation long" z13 zarch vx ++e700000030cc vflcdb VRR_VV "vector fp perform sign operation long" z13 zarch vx ++e700000830cc wflcdb VRR_VV "vector fp perform sign operation long" z13 zarch vx ++e700001030cc vflndb VRR_VV "vector fp perform sign operation long" z13 zarch vx ++e700001830cc wflndb VRR_VV "vector fp perform sign operation long" z13 zarch vx ++e700002030cc vflpdb VRR_VV "vector fp perform sign operation long" z13 zarch vx ++e700002830cc wflpdb VRR_VV "vector fp perform sign operation long" z13 zarch vx + e700000000ce vfsq VRR_VV0UU2 "vector fp square root" z13 zarch vx +-e700000030ce vfsqdb VRR_VV "vector fp square root" z13 zarch vx +-e700000830ce wfsqdb VRR_VV "vector fp square root" z13 zarch vx ++e700000030ce vfsqdb VRR_VV "vector fp square root long" z13 zarch vx ++e700000830ce wfsqdb VRR_VV "vector fp square root long" z13 zarch vx + e700000000e2 vfs VRR_VVV0UU "vector fp subtract" z13 zarch vx +-e700000030e2 vfsdb VRR_VVV "vector fp subtract" z13 zarch vx +-e700000830e2 wfsdb VRR_VVV "vector fp subtract" z13 zarch vx ++e700000030e2 vfsdb VRR_VVV "vector fp subtract long" z13 zarch vx ++e700000830e2 wfsdb VRR_VVV "vector fp subtract long" z13 zarch vx + e7000000004a vftci VRI_VVUUU "vector fp test data class immediate" z13 zarch vx + e7000000304a vftcidb VRI_VVU2 "vector fp test data class immediate" z13 zarch vx + e7000008304a wftcidb VRI_VVU2 "vector fp test data class immediate" z13 zarch vx +@@ -1679,3 +1679,200 @@ e3000000003a llzrgf RXY_RRRD "load logical and zero rightmost bytes 32->64" z13 + e3000000003b lzrf RXY_RRRD "load and zero rightmost byte 32->32" z13 zarch + e3000000002a lzrg RXY_RRRD "load and zero rightmost byte 64->64" z13 zarch + b93c ppno RRE_RR "perform pseudorandom number operation" z13 zarch ++ ++# arch12 instructions ++ ++# Vector Enhancements Facility 1 ++ ++e70000000085 vbperm VRR_VVV "vector bit permute" arch12 zarch ++e70000006004 vllezlf VRX_VRRD "vector load logical word element and zero - left aligned" arch12 zarch vx2 ++e700000000b8 vmsl VRR_VVVUU0V "vector multiply sum logical" arch12 zarch vx2 ++e700030000b8 vmslg VRR_VVVU0VB "vector multiply sum logical double word" arch12 zarch vx2 ++e7000000006c vnx VRR_VVV "vector not exclusive or" arch12 zarch vx2 ++e7000000006e vnn VRR_VVV "vector nand" arch12 zarch ++e7000000006f voc VRR_VVV "vector or with complement" arch12 zarch vx2 ++e70000000050 vpopctb VRR_VV "vector population count byte" arch12 zarch vx2 ++e70000001050 vpopcth VRR_VV "vector population count halfword" arch12 zarch vx2 ++e70000002050 vpopctf VRR_VV "vector population count word" arch12 zarch vx2 ++e70000003050 vpopctg VRR_VV "vector population count double word" arch12 zarch vx2 ++e700000020e3 vfasb VRR_VVV "vector fp add short" arch12 zarch vx2 ++e700000820e3 wfasb VRR_VVV "scalar vector fp add scalar short" arch12 zarch vx2 ++e700000840e3 wfaxb VRR_VVV "scalar vector fp add scalar extended" arch12 zarch vx2 ++e700000020cb wfcsb VRR_VV "scalar vector fp compare scalar short" arch12 zarch vx2 ++e700000040cb wfcxb VRR_VV "scalar vector fp compare scalar extended" arch12 zarch vx2 ++e700000020ca wfksb VRR_VV "scalar vector fp compare and signal scalar short" arch12 zarch vx2 ++e700000040ca wfkxb VRR_VV "scalar vector fp compare and signal scalar extended" arch12 zarch vx2 ++ ++e700000020e8 vfcesb VRR_VVV "vector fp compare equal short" arch12 zarch vx2 ++e700001020e8 vfcesbs VRR_VVV "vector fp compare equal short" arch12 zarch vx2 ++e700000820e8 wfcesb VRR_VVV "scalar vector fp compare equal scalar short" arch12 zarch vx2 ++e700001820e8 wfcesbs VRR_VVV "scalar fp compare equal scalar short" arch12 zarch vx2 ++e700000840e8 wfcexb VRR_VVV "scalar vector fp compare equal scalar extended" arch12 zarch vx2 ++e700001840e8 wfcexbs VRR_VVV "scalar vector fp compare equal scalar extended" arch12 zarch vx2 ++ ++e700000420e8 vfkesb VRR_VVV "vector fp compare and signal equal short" arch12 zarch vx2 ++e700001420e8 vfkesbs VRR_VVV "vector fp compare and signal equal short" arch12 zarch vx2 ++e700000c20e8 wfkesb VRR_VVV "scalar vector fp compare and signal equal scalar short" arch12 zarch vx2 ++e700001c20e8 wfkesbs VRR_VVV "scalar fp compare and signal equal scalar short" arch12 zarch vx2 ++e700000430e8 vfkedb VRR_VVV "vector fp compare and signal equal long" arch12 zarch vx ++e700001430e8 vfkedbs VRR_VVV "vector fp compare and signal equal long" arch12 zarch vx ++e700000c30e8 wfkedb VRR_VVV "vector fp compare and signal equal long" arch12 zarch vx ++e700001c30e8 wfkedbs VRR_VVV "vector fp compare and signal equal long" arch12 zarch vx ++e700000c40e8 wfkexb VRR_VVV "scalar vector fp compare and signal equal scalar extended" arch12 zarch vx2 ++e700001c40e8 wfkexbs VRR_VVV "scalar vector fp compare and signal equal scalar extended" arch12 zarch vx2 ++ ++e700000020eb vfchsb VRR_VVV "vector fp compare high short" arch12 zarch vx2 ++e700001020eb vfchsbs VRR_VVV "vector fp compare high short" arch12 zarch vx2 ++e700000820eb wfchsb VRR_VVV "scalar vector fp compare high scalar short" arch12 zarch vx2 ++e700001820eb wfchsbs VRR_VVV "scalar vector fp compare high scalar short" arch12 zarch vx2 ++e700000840eb wfchxb VRR_VVV "scalar vector fp compare high scalar extended" arch12 zarch vx2 ++e700001840eb wfchxbs VRR_VVV "scalar vector fp compare high scalar extended" arch12 zarch vx2 ++ ++e700000420eb vfkhsb VRR_VVV "vector fp compare and signal high short" arch12 zarch vx2 ++e700001420eb vfkhsbs VRR_VVV "vector fp compare and signal high short" arch12 zarch vx2 ++e700000c20eb wfkhsb VRR_VVV "scalar vector fp compare and signal high scalar short" arch12 zarch vx2 ++e700001c20eb wfkhsbs VRR_VVV "scalar vector fp compare and signal high scalar short" arch12 zarch vx2 ++e700000430eb vfkhdb VRR_VVV "vector fp compare and signal high long" arch12 zarch vx ++e700001430eb vfkhdbs VRR_VVV "vector fp compare and signal high long" arch12 zarch vx ++e700000c30eb wfkhdb VRR_VVV "vector fp compare and signal high long" arch12 zarch vx ++e700001c30eb wfkhdbs VRR_VVV "vector fp compare and signal high long" arch12 zarch vx ++e700000c40eb wfkhxb VRR_VVV "scalar vector fp compare and signal high scalar extended" arch12 zarch vx2 ++e700001c40eb wfkhxbs VRR_VVV "scalar vector fp compare and signal high scalar extended" arch12 zarch vx2 ++ ++e700000020ea vfchesb VRR_VVV "vector fp compare high or equal short" arch12 zarch vx2 ++e700001020ea vfchesbs VRR_VVV "vector fp compare high or equal short" arch12 zarch vx2 ++e700000820ea wfchesb VRR_VVV "scalar vector fp compare high or equal scalar short" arch12 zarch vx2 ++e700001820ea wfchesbs VRR_VVV "scalar vector fp compare high or equal scalar short" arch12 zarch vx2 ++e700000840ea wfchexb VRR_VVV "scalar vector fp compare high or equal scalar extended" arch12 zarch vx2 ++e700001840ea wfchexbs VRR_VVV "scalar vector fp compare high or equal scalar extended" arch12 zarch vx2 ++ ++e700000420ea vfkhesb VRR_VVV "vector fp compare and signal high or equal short" arch12 zarch vx2 ++e700001420ea vfkhesbs VRR_VVV "vector fp compare and signal high or equal short" arch12 zarch vx2 ++e700000c20ea wfkhesb VRR_VVV "scalar vector fp compare and signal high or equal scalar short" arch12 zarch vx2 ++e700001c20ea wfkhesbs VRR_VVV "scalar vector fp compare and signal high or equal scalar short" arch12 zarch vx2 ++e700000430ea vfkhedb VRR_VVV "vector fp compare and signal high or equal long" arch12 zarch vx ++e700001430ea vfkhedbs VRR_VVV "vector fp compare and signal high or equal long" arch12 zarch vx ++e700000c30ea wfkhedb VRR_VVV "vector fp compare and signal high or equal long" arch12 zarch vx ++e700001c30ea wfkhedbs VRR_VVV "vector fp compare and signal high or equal long" arch12 zarch vx ++e700000c40ea wfkhexb VRR_VVV "scalar vector fp compare and signal high or equal scalar extended" arch12 zarch vx2 ++e700001c40ea wfkhexbs VRR_VVV "scalar vector fp compare and signal high or equal scalar extended" arch12 zarch vx2 ++ ++e700000020e5 vfdsb VRR_VVV "vector fp divide short" arch12 zarch vx2 ++e700000820e5 wfdsb VRR_VVV "scalar vector fp divide scalar short" arch12 zarch vx2 ++e700000840e5 wfdxb VRR_VVV "scalar vector fp divide scalar extended" arch12 zarch vx2 ++e700000020c7 vfisb VRR_VV0UU "vector load fp integer short" arch12 zarch vx2 ++e700000820c7 wfisb VRR_VV0UU8 "scalar vector load fp integer scalar short" arch12 zarch vx2 ++e700000840c7 wfixb VRR_VV0UU8 "scalar vector load fp integer scalar extended" arch12 zarch vx2 ++e700000000c4 vfll VRR_VV0UU2 "vector fp load lengthened" arch12 zarch vx2 ++e700000020c4 vflls VRR_VV "vector fp load lengthened" arch12 zarch vx2 ++e700000820c4 wflls VRR_VV "scalar vector fp load lengthened short" arch12 zarch vx2 ++e700000830c4 wflld VRR_VV "scalar vector fp load lengthened long" arch12 zarch vx2 ++e700000000c5 vflr VRR_VV0UUU "vector fp load rounded" arch12 zarch vx2 ++e700000030c5 vflrd VRR_VV0UU "vector fp load rounded long" arch12 zarch vx2 ++e700000830c5 wflrd VRR_VV0UU8 "scalar vector fp load rounded long" arch12 zarch vx2 ++e700000840c5 wflrx VRR_VV0UU8 "scalar vector fp load rounded extended" arch12 zarch vx2 ++e700000000ef vfmax VRR_VVV0UUU "vector fp maximum" arch12 zarch vx2 ++e700000020ef vfmaxsb VRR_VVV0U0 "vector fp maximum short" arch12 zarch vx2 ++e700000030ef vfmaxdb VRR_VVV0U0 "vector fp maximum long" arch12 zarch vx2 ++e700000820ef wfmaxsb VRR_VVV0U0 "scalar fp maximum scalar short" arch12 zarch vx2 ++e700000830ef wfmaxdb VRR_VVV0U0 "scalar fp maximum scalar long" arch12 zarch vx2 ++e700000840ef wfmaxxb VRR_VVV0U0 "scalar fp maximum scalar extended" arch12 zarch vx2 ++e700000000ee vfmin VRR_VVV0UUU "vector fp minimum" arch12 zarch vx2 ++e700000020ee vfminsb VRR_VVV0U0 "vector fp minimum short" arch12 zarch vx2 ++e700000030ee vfmindb VRR_VVV0U0 "vector fp minimum long" arch12 zarch vx2 ++e700000820ee wfminsb VRR_VVV0U0 "scalar fp minimum scalar short" arch12 zarch vx2 ++e700000830ee wfmindb VRR_VVV0U0 "scalar fp minimum scalar long" arch12 zarch vx2 ++e700000840ee wfminxb VRR_VVV0U0 "scalar fp minimum scalar extended" arch12 zarch vx2 ++e700000020e7 vfmsb VRR_VVV "vector fp multiply short" arch12 zarch vx2 ++e700000820e7 wfmsb VRR_VVV "scalar vector fp multiply scalar short" arch12 zarch vx2 ++e700000840e7 wfmxb VRR_VVV "scalar vector fp multiply scalar extended" arch12 zarch vx2 ++e7000200008f vfmasb VRR_VVVV "vector fp multiply and add short" arch12 zarch vx2 ++e7000208008f wfmasb VRR_VVVV "scalar vector fp multiply and add scalar short" arch12 zarch vx2 ++e7000408008f wfmaxb VRR_VVVV "scalar vector fp multiply and add scalar extended" arch12 zarch vx2 ++e7000200008e vfmssb VRR_VVVV "vector fp multiply and subtract short" arch12 zarch vx2 ++e7000208008e wfmssb VRR_VVVV "scalar vector fp multiply and subtract scalar short" arch12 zarch vx2 ++e7000408008e wfmsxb VRR_VVVV "scalar vector fp multiply and subtract scalar extended" arch12 zarch vx2 ++e7000000009f vfnma VRR_VVVU0UV "vector fp negative multiply and add" arch12 zarch vx2 ++e7000200009f vfnmasb VRR_VVVV "vector fp negative multiply and add short" arch12 zarch vx2 ++e7000208009f wfnmasb VRR_VVVV "scalar vector fp negative multiply and add scalar short" arch12 zarch vx2 ++e7000300009f vfnmadb VRR_VVVV "vector fp negative multiply and add long" arch12 zarch vx2 ++e7000308009f wfnmadb VRR_VVVV "scalar vector fp negative multiply and add scalar long" arch12 zarch vx2 ++e7000408009f wfnmaxb VRR_VVVV "scalar vector fp negative multiply and add scalar extended" arch12 zarch vx2 ++e7000000009e vfnms VRR_VVVU0UV "vector fp negative multiply and subtract" arch12 zarch vx2 ++e7000200009e vfnmssb VRR_VVVV "vector fp negative multiply and subtract short" arch12 zarch vx2 ++e7000208009e wfnmssb VRR_VVVV "scalar vector fp negative multiply and subtract scalar short" arch12 zarch vx2 ++e7000300009e vfnmsdb VRR_VVVV "vector fp negative multiply and subtract long" arch12 zarch vx2 ++e7000308009e wfnmsdb VRR_VVVV "scalar vector fp negative multiply and subtract scalar long" arch12 zarch vx2 ++e7000408009e wfnmsxb VRR_VVVV "scalar vector fp negative multiply and subtract scalar extended" arch12 zarch vx2 ++e700000020cc vfpsosb VRR_VV0U2 "vector fp perform sign operation short" arch12 zarch vx2 ++e700000820cc wfpsosb VRR_VV0U2 "scalar vector fp perform sign operation scalar short" arch12 zarch vx2 ++e700000020cc vflcsb VRR_VV "vector fp perform sign operation short" arch12 zarch vx2 ++e700000820cc wflcsb VRR_VV "scalar vector fp perform sign operation scalar short" arch12 zarch vx2 ++e700001020cc vflnsb VRR_VV "vector fp perform sign operation short" arch12 zarch vx2 ++e700001820cc wflnsb VRR_VV "scalar vector fp perform sign operation scalar short" arch12 zarch vx2 ++e700002020cc vflpsb VRR_VV "vector fp perform sign operation short" arch12 zarch vx2 ++e700002820cc wflpsb VRR_VV "scalar vector fp perform sign operation scalar short" arch12 zarch vx2 ++e700000840cc wfpsoxb VRR_VV0U2 "scalar vector fp perform sign operation scalar extended" arch12 zarch vx2 ++e700000840cc wflcxb VRR_VV "scalar vector fp perform sign operation scalar extended" arch12 zarch vx2 ++e700001840cc wflnxb VRR_VV "scalar vector fp perform sign operation scalar extended" arch12 zarch vx2 ++e700002840cc wflpxb VRR_VV "scalar vector fp perform sign operation scalar extended" arch12 zarch vx2 ++e700000020ce vfsqsb VRR_VV "vector fp square root short" arch12 zarch vx2 ++e700000820ce wfsqsb VRR_VV "scalar vector fp square root scalar short" arch12 zarch vx2 ++e700000840ce wfsqxb VRR_VV "scalar vector fp square root scalar extended" arch12 zarch vx2 ++e700000020e2 vfssb VRR_VVV "vector fp subtract short" arch12 zarch vx2 ++e700000820e2 wfssb VRR_VVV "scalar vector fp subtract scalar short" arch12 zarch vx2 ++e700000840e2 wfsxb VRR_VVV "scalar vector fp subtract scalar extended" arch12 zarch vx2 ++e7000000204a vftcisb VRI_VVU2 "vector fp test data class immediate short" arch12 zarch vx2 ++e7000008204a wftcisb VRI_VVU2 "scalar vector fp test data class immediate scalar short" arch12 zarch vx2 ++e7000008404a wftcixb VRI_VVU2 "scalar vector fp test data class immediate scalar extended" arch12 zarch vx2 ++ ++# Miscellaneous Instruction Extensions Facility 2 ++ ++e30000000038 agh RXY_RRRD "add halfword to 64 bit value" arch12 zarch ++e30000000047 bic RXY_URRD "branch indirect on condition" arch12 zarch ++e3f000000047 bi RXY_0RRD "unconditional indirect branch" arch12 zarch ++e30000000047 bi*8 RXY_0RRD "branch indirect on condition" arch12 zarch ++b9ec mgrk RRF_R0RR2 "multiply 64x64reg -> 128" arch12 zarch ++e30000000084 mg RXY_RRRD "multiply 64x64mem -> 128" arch12 zarch ++e3000000003c mgh RXY_RRRD "multiply halfword 64x16mem -> 64" arch12 zarch ++b9fd msrkc RRF_R0RR2 "multiply single 32x32 -> 32" arch12 zarch ++b9ed msgrkc RRF_R0RR2 "multiply single 64x64 -> 64" arch12 zarch ++e30000000053 msc RXY_RRRD "multiply single 32x32mem -> 32" arch12 zarch ++e30000000083 msgc RXY_RRRD "multiply single 64x64mem -> 64" arch12 zarch ++e30000000039 sgh RXY_RRRD "subtract halfword from 64 bit value" arch12 zarch ++ ++# Vector packed decimal facility ++ ++e60000000037 vlrlr VRS_RRDV "vector load rightmost with length" arch12 zarch vx2 ++e60000000035 vlrl VSI_URDV "vector load rightmost with immediate length" arch12 zarch vx2 ++e6000000003f vstrlr VRS_RRDV "vector store rightmost with length" arch12 zarch vx2 ++e6000000003d vstrl VSI_URDV "vector store rightmost with immediate length" arch12 zarch vx2 ++e60000000071 vap VRI_VVV0UU2 "vector add decimal" arch12 zarch vx2 ++e60000000077 vcp VRR_0VV0U "vector compare decimal" arch12 zarch vx2 ++e60000000050 vcvb VRR_RV0U "vector convert to binary 32 bit" arch12 zarch vx2 ++e60000000052 vcvbg VRR_RV0U "vector convert to binary 64 bit" arch12 zarch vx2 ++e60000000058 vcvd VRI_VR0UU "vector convert to decimal 32 bit" arch12 zarch vx2 ++e6000000005a vcvdg VRI_VR0UU "vector convert to decimal 64 bit" arch12 zarch vx2 ++e6000000007a vdp VRI_VVV0UU2 "vector divide decimal" arch12 zarch vx2 ++e60000000049 vlip VRI_V0UU2 "vector load immediate decimal" arch12 zarch vx2 ++e60000000078 vmp VRI_VVV0UU2 "vector multiply decimal" arch12 zarch vx2 ++e60000000079 vmsp VRI_VVV0UU2 "vector multiply and shift decimal" arch12 zarch vx2 ++e60000000034 vpkz VSI_URDV "vector pack zoned" arch12 zarch vx2 ++e6000000005b vpsop VRI_VVUUU2 "vector perform sign operation decimal" arch12 zarch vx2 ++e6000000007b vrp VRI_VVV0UU2 "vector remainder decimal" arch12 zarch vx2 ++e6000000007e vsdp VRI_VVV0UU2 "vector shift and divide decimal" arch12 zarch vx2 ++e60000000059 vsrp VRI_VVUUU2 "vector shift and round decimal" arch12 zarch vx2 ++e60000000073 vsp VRI_VVV0UU2 "vector subtract decimal" arch12 zarch vx2 ++e6000000005f vtp VRR_0V "vector test decimal" arch12 zarch vx2 ++e6000000003c vupkz VSI_URDV "vector unpack zoned" arch12 zarch vx2 ++ ++# Guarded storage facility ++ ++e3000000004c lgg RXY_RRRD "load guarded 64 bit" arch12 zarch ++e30000000048 llgfsg RXY_RRRD "load logical and shift guarded 64 bit" arch12 zarch ++e3000000004d lgsc RXY_RRRD "load guarded storage controls" arch12 zarch ++e30000000049 stgsc RXY_RRRD "store guarded storage controls" arch12 zarch ++ ++# Message-Security-Assist Extension 8 ++ ++b929 kma RRF_R0RR "cipher message with galois counter mode" arch12 zarch diff --git a/SOURCES/gdb-rhbz1553104-s390x-arch12-test.patch b/SOURCES/gdb-rhbz1553104-s390x-arch12-test.patch new file mode 100644 index 0000000..cfa70b2 --- /dev/null +++ b/SOURCES/gdb-rhbz1553104-s390x-arch12-test.patch @@ -0,0 +1,67 @@ +--- /dev/null 2018-03-23 18:42:35.237667431 +0100 ++++ gdb-7.6.1/gdb/testsuite/gdb.arch/s390x-arch12.S 2018-03-22 19:12:59.000000000 +0100 +@@ -0,0 +1,4 @@ ++.text ++.globl load_guarded ++load_guarded: ++.byte 0xeb,0xbf,0xf0,0x58,0x00,0x24,0xe3,0xf0,0xff,0x50,0xff,0x71,0xb9,0x04,0x00,0xbf,0xe3,0x20,0xb0,0xa0,0x00,0x24,0xe3,0x10,0xb0,0xa0,0x00,0x04,0xe3,0x10,0x10,0x00,0x00,0x4c,0xe3,0x10,0xb0,0xa8,0x00,0x24,0xe3,0x10,0xb0,0xa8,0x00,0x04,0xb9,0x04,0x00,0x21,0xe3,0x40,0xb1,0x20,0x00,0x04,0xeb,0xbf,0xb1,0x08,0x00,0x04,0x07,0xf4 +--- /dev/null 2018-03-23 18:42:35.237667431 +0100 ++++ gdb-7.6.1/gdb/testsuite/gdb.arch/s390x-arch12.exp 2018-03-23 20:21:41.719888818 +0100 +@@ -0,0 +1,34 @@ ++# Copyright 2018 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 . ++ ++#if { ![istarget s390x-*linux-*] || ![is_lp64_target] } { ++# verbose "Skipping s390x-prologue-skip.exp" ++# return ++#} ++ ++set testfile "s390x-arch12" ++set uufile "${srcdir}/${subdir}/${testfile}.o.uu" ++set ofile "${srcdir}/${subdir}/${testfile}.o" ++ ++if { [catch "system \"uudecode -o ${ofile} ${uufile}\"" ] != 0 } { ++ untested "failed uudecode" ++ return -1 ++} ++ ++gdb_exit ++gdb_start ++gdb_load $ofile ++ ++gdb_test "disas load_guarded" " <\\+28>:\tlgg\t%r1,0\\(%r1\\)\r\n\[^\r\n\]* <\\+34>:\tstg\t%r1,168\\(%r11\\)\r\n.*" +--- /dev/null 2018-03-23 18:42:35.237667431 +0100 ++++ gdb-7.6.1/gdb/testsuite/gdb.arch/s390x-arch12.o.uu 2018-03-23 20:16:13.218543154 +0100 +@@ -0,0 +1,20 @@ ++begin 644 s390x-arch12.o ++M?T5,1@("`0`````````````!`!8````!```````````````````````````` ++M``$X``````!```````!```<`!.N_\%@`)./P_U#_<;D$`+_C(+"@`"3C$+"@ ++M``3C$!```$SC$+"H`"3C$+"H``2Y!``AXT"Q(``$Z[^Q"``$!_0`+G-Y;71A ++M8@`N 255) Index: gdb-7.6.1/gdb/ax.h =================================================================== ---- gdb-7.6.1.orig/gdb/ax.h 2013-03-07 01:48:25.000000000 +0100 -+++ gdb-7.6.1/gdb/ax.h 2016-03-13 22:01:57.811956451 +0100 +--- gdb-7.6.1.orig/gdb/ax.h 2018-05-05 17:15:29.625212042 +0200 ++++ gdb-7.6.1/gdb/ax.h 2018-05-05 17:15:31.427228142 +0200 @@ -190,7 +190,7 @@ extern void ax_zero_ext (struct agent_expr *EXPR, int N); @@ -1273,8 +1273,8 @@ Index: gdb-7.6.1/gdb/ax.h aop_if_goto). We assume we don't know the target offset yet, Index: gdb-7.6.1/gdb/breakpoint.c =================================================================== ---- gdb-7.6.1.orig/gdb/breakpoint.c 2016-03-13 22:01:57.611955015 +0100 -+++ gdb-7.6.1/gdb/breakpoint.c 2016-03-13 22:29:09.282659972 +0100 +--- gdb-7.6.1.orig/gdb/breakpoint.c 2018-05-05 17:15:29.628212068 +0200 ++++ gdb-7.6.1/gdb/breakpoint.c 2018-05-05 17:15:31.429228160 +0200 @@ -6677,7 +6677,7 @@ static int @@ -1295,8 +1295,8 @@ Index: gdb-7.6.1/gdb/breakpoint.c len = (target_exact_watchpoints Index: gdb-7.6.1/gdb/breakpoint.h =================================================================== ---- gdb-7.6.1.orig/gdb/breakpoint.h 2016-03-13 22:01:57.602954951 +0100 -+++ gdb-7.6.1/gdb/breakpoint.h 2016-03-13 22:01:57.815956480 +0100 +--- gdb-7.6.1.orig/gdb/breakpoint.h 2018-05-05 17:15:29.628212068 +0200 ++++ gdb-7.6.1/gdb/breakpoint.h 2018-05-05 17:15:31.429228160 +0200 @@ -250,7 +250,7 @@ /* If this is a ranged breakpoint, then this field contains the @@ -1317,8 +1317,8 @@ Index: gdb-7.6.1/gdb/breakpoint.h enum target_hw_bp_type watchpoint_type; Index: gdb-7.6.1/gdb/c-lang.c =================================================================== ---- gdb-7.6.1.orig/gdb/c-lang.c 2013-03-07 20:24:32.000000000 +0100 -+++ gdb-7.6.1/gdb/c-lang.c 2016-03-13 22:01:57.815956480 +0100 +--- gdb-7.6.1.orig/gdb/c-lang.c 2018-05-05 17:15:29.629212077 +0200 ++++ gdb-7.6.1/gdb/c-lang.c 2018-05-05 17:15:31.430228169 +0200 @@ -188,7 +188,7 @@ void @@ -1348,8 +1348,8 @@ Index: gdb-7.6.1/gdb/c-lang.c &low_bound, &high_bound) < 0) Index: gdb-7.6.1/gdb/c-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/c-lang.h 2013-01-01 07:32:40.000000000 +0100 -+++ gdb-7.6.1/gdb/c-lang.h 2016-03-13 22:01:57.816956487 +0100 +--- gdb-7.6.1.orig/gdb/c-lang.h 2018-05-05 17:15:29.629212077 +0200 ++++ gdb-7.6.1/gdb/c-lang.h 2018-05-05 17:15:31.430228169 +0200 @@ -73,7 +73,7 @@ struct ui_file *); @@ -1387,8 +1387,8 @@ Index: gdb-7.6.1/gdb/c-lang.h const struct value_print_options *, Index: gdb-7.6.1/gdb/c-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/c-valprint.c 2013-01-01 07:32:40.000000000 +0100 -+++ gdb-7.6.1/gdb/c-valprint.c 2016-03-13 22:01:57.816956487 +0100 +--- gdb-7.6.1.orig/gdb/c-valprint.c 2018-05-05 17:15:29.629212077 +0200 ++++ gdb-7.6.1/gdb/c-valprint.c 2018-05-05 17:15:31.430228169 +0200 @@ -132,7 +132,7 @@ void @@ -1432,8 +1432,8 @@ Index: gdb-7.6.1/gdb/c-valprint.c opts.deref_ref = 1; Index: gdb-7.6.1/gdb/cp-abi.c =================================================================== ---- gdb-7.6.1.orig/gdb/cp-abi.c 2013-01-17 21:26:14.000000000 +0100 -+++ gdb-7.6.1/gdb/cp-abi.c 2016-03-13 22:01:57.816956487 +0100 +--- gdb-7.6.1.orig/gdb/cp-abi.c 2018-05-05 17:15:29.630212086 +0200 ++++ gdb-7.6.1/gdb/cp-abi.c 2018-05-05 17:15:31.430228169 +0200 @@ -68,13 +68,13 @@ return (*current_cp_abi.is_operator_name) (name); } @@ -1471,8 +1471,8 @@ Index: gdb-7.6.1/gdb/cp-abi.c volatile struct gdb_exception e; Index: gdb-7.6.1/gdb/cp-abi.h =================================================================== ---- gdb-7.6.1.orig/gdb/cp-abi.h 2013-01-01 07:32:40.000000000 +0100 -+++ gdb-7.6.1/gdb/cp-abi.h 2016-03-13 22:01:57.816956487 +0100 +--- gdb-7.6.1.orig/gdb/cp-abi.h 2018-05-05 17:15:29.630212086 +0200 ++++ gdb-7.6.1/gdb/cp-abi.h 2018-05-05 17:15:31.430228169 +0200 @@ -108,7 +108,7 @@ struct fn_field *f, int j, @@ -1529,8 +1529,8 @@ Index: gdb-7.6.1/gdb/cp-abi.h struct ui_file *stream); Index: gdb-7.6.1/gdb/cp-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/cp-valprint.c 2013-01-07 17:40:36.000000000 +0100 -+++ gdb-7.6.1/gdb/cp-valprint.c 2016-03-13 22:29:09.785663564 +0100 +--- gdb-7.6.1.orig/gdb/cp-valprint.c 2018-05-05 17:15:29.630212086 +0200 ++++ gdb-7.6.1/gdb/cp-valprint.c 2018-05-05 17:15:31.431228178 +0200 @@ -82,7 +82,7 @@ const struct value_print_options *); @@ -1606,8 +1606,8 @@ Index: gdb-7.6.1/gdb/cp-valprint.c const char *basename = TYPE_NAME (baseclass); Index: gdb-7.6.1/gdb/d-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/d-lang.h 2013-01-01 07:32:41.000000000 +0100 -+++ gdb-7.6.1/gdb/d-lang.h 2016-03-13 22:01:57.817956494 +0100 +--- gdb-7.6.1.orig/gdb/d-lang.h 2018-05-05 17:15:29.630212086 +0200 ++++ gdb-7.6.1/gdb/d-lang.h 2018-05-05 17:15:31.431228178 +0200 @@ -25,7 +25,7 @@ extern char *d_demangle (const char *mangled, int options); @@ -1619,8 +1619,8 @@ Index: gdb-7.6.1/gdb/d-lang.h const struct value_print_options *options); Index: gdb-7.6.1/gdb/d-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/d-valprint.c 2013-01-01 07:32:41.000000000 +0100 -+++ gdb-7.6.1/gdb/d-valprint.c 2016-03-13 22:01:57.817956494 +0100 +--- gdb-7.6.1.orig/gdb/d-valprint.c 2018-05-05 17:15:29.630212086 +0200 ++++ gdb-7.6.1/gdb/d-valprint.c 2018-05-05 17:15:31.431228178 +0200 @@ -29,7 +29,7 @@ static int @@ -1645,8 +1645,8 @@ Index: gdb-7.6.1/gdb/d-valprint.c int ret; Index: gdb-7.6.1/gdb/doublest.c =================================================================== ---- gdb-7.6.1.orig/gdb/doublest.c 2013-01-01 07:32:41.000000000 +0100 -+++ gdb-7.6.1/gdb/doublest.c 2016-03-13 22:29:08.834656773 +0100 +--- gdb-7.6.1.orig/gdb/doublest.c 2018-05-05 17:15:29.631212095 +0200 ++++ gdb-7.6.1/gdb/doublest.c 2018-05-05 17:15:31.431228178 +0200 @@ -791,7 +791,7 @@ but not passed on by GDB. This should be fixed. */ @@ -1669,8 +1669,8 @@ Index: gdb-7.6.1/gdb/doublest.c Index: gdb-7.6.1/gdb/dwarf2loc.c =================================================================== ---- gdb-7.6.1.orig/gdb/dwarf2loc.c 2016-03-13 22:01:55.854942401 +0100 -+++ gdb-7.6.1/gdb/dwarf2loc.c 2016-03-13 22:29:09.785663564 +0100 +--- gdb-7.6.1.orig/gdb/dwarf2loc.c 2018-05-05 17:15:29.633212113 +0200 ++++ gdb-7.6.1/gdb/dwarf2loc.c 2018-05-05 17:15:31.432228187 +0200 @@ -1680,19 +1680,19 @@ BITS_BIG_ENDIAN is taken directly from gdbarch. */ @@ -1826,8 +1826,8 @@ Index: gdb-7.6.1/gdb/dwarf2loc.c invalid_synthetic_pointer (); Index: gdb-7.6.1/gdb/dwarf2read.c =================================================================== ---- gdb-7.6.1.orig/gdb/dwarf2read.c 2016-03-13 22:01:57.755956049 +0100 -+++ gdb-7.6.1/gdb/dwarf2read.c 2016-03-13 22:29:09.144658987 +0100 +--- gdb-7.6.1.orig/gdb/dwarf2read.c 2018-05-05 17:15:29.636212140 +0200 ++++ gdb-7.6.1/gdb/dwarf2read.c 2018-05-05 17:15:31.434228205 +0200 @@ -1227,12 +1227,12 @@ } @@ -1858,8 +1858,8 @@ Index: gdb-7.6.1/gdb/dwarf2read.c if (attr) Index: gdb-7.6.1/gdb/eval.c =================================================================== ---- gdb-7.6.1.orig/gdb/eval.c 2016-03-13 22:01:55.860942444 +0100 -+++ gdb-7.6.1/gdb/eval.c 2016-03-13 22:01:57.824956545 +0100 +--- gdb-7.6.1.orig/gdb/eval.c 2018-05-05 17:15:29.638212158 +0200 ++++ gdb-7.6.1/gdb/eval.c 2018-05-05 17:15:31.435228214 +0200 @@ -294,7 +294,8 @@ while (--nargs >= 0) { @@ -1924,8 +1924,8 @@ Index: gdb-7.6.1/gdb/eval.c get_user_print_options (&opts); Index: gdb-7.6.1/gdb/f-lang.c =================================================================== ---- gdb-7.6.1.orig/gdb/f-lang.c 2013-01-01 07:32:42.000000000 +0100 -+++ gdb-7.6.1/gdb/f-lang.c 2016-03-13 22:01:57.824956545 +0100 +--- gdb-7.6.1.orig/gdb/f-lang.c 2018-05-05 17:15:29.638212158 +0200 ++++ gdb-7.6.1/gdb/f-lang.c 2018-05-05 17:15:31.435228214 +0200 @@ -103,7 +103,7 @@ static void @@ -1937,8 +1937,8 @@ Index: gdb-7.6.1/gdb/f-lang.c const char *type_encoding = f_get_encoding (type); Index: gdb-7.6.1/gdb/f-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/f-lang.h 2016-03-13 22:01:55.861942451 +0100 -+++ gdb-7.6.1/gdb/f-lang.h 2016-03-13 22:29:09.645662565 +0100 +--- gdb-7.6.1.orig/gdb/f-lang.h 2018-05-05 17:15:29.638212158 +0200 ++++ gdb-7.6.1/gdb/f-lang.h 2018-05-05 17:15:31.435228214 +0200 @@ -33,7 +33,7 @@ (struct type *type, struct ui_file *stream); extern void f_object_address_data_valid_or_error (struct type *type); @@ -1950,8 +1950,8 @@ Index: gdb-7.6.1/gdb/f-lang.h const struct value_print_options *); Index: gdb-7.6.1/gdb/f-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/f-valprint.c 2016-03-13 22:01:55.861942451 +0100 -+++ gdb-7.6.1/gdb/f-valprint.c 2016-03-13 22:29:09.645662565 +0100 +--- gdb-7.6.1.orig/gdb/f-valprint.c 2018-05-05 17:15:29.638212158 +0200 ++++ gdb-7.6.1/gdb/f-valprint.c 2018-05-05 17:15:31.435228214 +0200 @@ -43,7 +43,7 @@ struct ui_file *); static void f77_get_dynamic_length_of_aggregate (struct type *); @@ -2018,8 +2018,8 @@ Index: gdb-7.6.1/gdb/f-valprint.c embedded_offset + offset, Index: gdb-7.6.1/gdb/findvar.c =================================================================== ---- gdb-7.6.1.orig/gdb/findvar.c 2016-03-13 22:01:55.862942458 +0100 -+++ gdb-7.6.1/gdb/findvar.c 2016-03-13 22:01:57.825956552 +0100 +--- gdb-7.6.1.orig/gdb/findvar.c 2018-05-05 17:15:29.638212158 +0200 ++++ gdb-7.6.1/gdb/findvar.c 2018-05-05 17:15:31.436228223 +0200 @@ -644,7 +644,7 @@ struct frame_info *frame) { @@ -2054,8 +2054,8 @@ Index: gdb-7.6.1/gdb/findvar.c { Index: gdb-7.6.1/gdb/frame.c =================================================================== ---- gdb-7.6.1.orig/gdb/frame.c 2013-02-16 09:57:48.000000000 +0100 -+++ gdb-7.6.1/gdb/frame.c 2016-03-13 22:29:06.551640469 +0100 +--- gdb-7.6.1.orig/gdb/frame.c 2018-05-05 17:15:29.639212167 +0200 ++++ gdb-7.6.1/gdb/frame.c 2018-05-05 17:15:31.436228223 +0200 @@ -1113,7 +1113,7 @@ int @@ -2076,8 +2076,8 @@ Index: gdb-7.6.1/gdb/frame.c while (len > 0) Index: gdb-7.6.1/gdb/frame.h =================================================================== ---- gdb-7.6.1.orig/gdb/frame.h 2013-08-14 13:53:11.000000000 +0200 -+++ gdb-7.6.1/gdb/frame.h 2016-03-13 22:29:06.407639441 +0100 +--- gdb-7.6.1.orig/gdb/frame.h 2018-05-05 17:15:29.639212167 +0200 ++++ gdb-7.6.1/gdb/frame.h 2018-05-05 17:15:31.436228223 +0200 @@ -532,7 +532,7 @@ contents are optimized out or unavailable, set *OPTIMIZEDP, *UNAVAILABLEP accordingly. */ @@ -2089,8 +2089,8 @@ Index: gdb-7.6.1/gdb/frame.h Index: gdb-7.6.1/gdb/gdbtypes.c =================================================================== ---- gdb-7.6.1.orig/gdb/gdbtypes.c 2016-03-13 22:01:55.863942465 +0100 -+++ gdb-7.6.1/gdb/gdbtypes.c 2016-03-13 22:29:08.834656773 +0100 +--- gdb-7.6.1.orig/gdb/gdbtypes.c 2018-05-05 17:15:29.641212184 +0200 ++++ gdb-7.6.1/gdb/gdbtypes.c 2018-05-05 17:15:31.437228231 +0200 @@ -2090,7 +2090,7 @@ least as long as OBJFILE. */ @@ -2160,8 +2160,8 @@ Index: gdb-7.6.1/gdb/gdbtypes.c Index: gdb-7.6.1/gdb/gdbtypes.h =================================================================== ---- gdb-7.6.1.orig/gdb/gdbtypes.h 2016-03-13 22:01:57.179951914 +0100 -+++ gdb-7.6.1/gdb/gdbtypes.h 2016-03-13 22:01:57.828956573 +0100 +--- gdb-7.6.1.orig/gdb/gdbtypes.h 2018-05-05 17:15:29.641212184 +0200 ++++ gdb-7.6.1/gdb/gdbtypes.h 2018-05-05 17:15:31.437228231 +0200 @@ -606,7 +606,7 @@ gdbarch_bits_big_endian=0 targets, it is the bit offset to the LSB. */ @@ -2197,8 +2197,8 @@ Index: gdb-7.6.1/gdb/gdbtypes.h extern struct type *arch_boolean_type (struct gdbarch *, int, int, char *); Index: gdb-7.6.1/gdb/gnu-v2-abi.c =================================================================== ---- gdb-7.6.1.orig/gdb/gnu-v2-abi.c 2013-01-21 18:29:39.000000000 +0100 -+++ gdb-7.6.1/gdb/gnu-v2-abi.c 2016-03-13 22:01:57.828956573 +0100 +--- gdb-7.6.1.orig/gdb/gnu-v2-abi.c 2018-05-05 17:15:29.642212193 +0200 ++++ gdb-7.6.1/gdb/gnu-v2-abi.c 2018-05-05 17:15:31.437228231 +0200 @@ -85,7 +85,7 @@ TYPE is the type in which F is located. */ static struct value * @@ -2252,8 +2252,8 @@ Index: gdb-7.6.1/gdb/gnu-v2-abi.c Index: gdb-7.6.1/gdb/gnu-v3-abi.c =================================================================== ---- gdb-7.6.1.orig/gdb/gnu-v3-abi.c 2013-01-31 19:37:37.000000000 +0100 -+++ gdb-7.6.1/gdb/gnu-v3-abi.c 2016-03-13 22:01:57.828956573 +0100 +--- gdb-7.6.1.orig/gdb/gnu-v3-abi.c 2018-05-05 17:15:29.642212193 +0200 ++++ gdb-7.6.1/gdb/gnu-v3-abi.c 2018-05-05 17:15:31.438228240 +0200 @@ -106,7 +106,7 @@ { struct type *t; @@ -2330,8 +2330,8 @@ Index: gdb-7.6.1/gdb/gnu-v3-abi.c if (BASETYPE_VIA_VIRTUAL (domain, i)) Index: gdb-7.6.1/gdb/go-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/go-lang.h 2013-01-01 07:32:44.000000000 +0100 -+++ gdb-7.6.1/gdb/go-lang.h 2016-03-13 22:01:57.828956573 +0100 +--- gdb-7.6.1.orig/gdb/go-lang.h 2018-05-05 17:15:29.642212193 +0200 ++++ gdb-7.6.1/gdb/go-lang.h 2018-05-05 17:15:31.438228240 +0200 @@ -83,7 +83,7 @@ /* Defined in go-valprint.c. */ @@ -2343,8 +2343,8 @@ Index: gdb-7.6.1/gdb/go-lang.h const struct value_print_options *options); Index: gdb-7.6.1/gdb/go-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/go-valprint.c 2013-01-01 07:32:44.000000000 +0100 -+++ gdb-7.6.1/gdb/go-valprint.c 2016-03-13 22:01:57.829956580 +0100 +--- gdb-7.6.1.orig/gdb/go-valprint.c 2018-05-05 17:15:29.642212193 +0200 ++++ gdb-7.6.1/gdb/go-valprint.c 2018-05-05 17:15:31.438228240 +0200 @@ -37,7 +37,7 @@ static void @@ -2369,8 +2369,8 @@ Index: gdb-7.6.1/gdb/go-valprint.c CHECK_TYPEDEF (type); Index: gdb-7.6.1/gdb/i386-nat.c =================================================================== ---- gdb-7.6.1.orig/gdb/i386-nat.c 2013-02-13 15:59:49.000000000 +0100 -+++ gdb-7.6.1/gdb/i386-nat.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/i386-nat.c 2018-05-05 17:15:29.643212202 +0200 ++++ gdb-7.6.1/gdb/i386-nat.c 2018-05-05 17:15:31.438228240 +0200 @@ -290,7 +290,7 @@ valid value, bombs through internal_error. */ static int i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state, @@ -2402,8 +2402,8 @@ Index: gdb-7.6.1/gdb/i386-nat.c = i386_debug_reg_state (ptid_get_pid (inferior_ptid)); Index: gdb-7.6.1/gdb/inf-ttrace.c =================================================================== ---- gdb-7.6.1.orig/gdb/inf-ttrace.c 2013-01-01 07:32:45.000000000 +0100 -+++ gdb-7.6.1/gdb/inf-ttrace.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/inf-ttrace.c 2018-05-05 17:15:29.643212202 +0200 ++++ gdb-7.6.1/gdb/inf-ttrace.c 2018-05-05 17:15:31.438228240 +0200 @@ -364,7 +364,7 @@ } @@ -2415,8 +2415,8 @@ Index: gdb-7.6.1/gdb/inf-ttrace.c } Index: gdb-7.6.1/gdb/jv-lang.c =================================================================== ---- gdb-7.6.1.orig/gdb/jv-lang.c 2016-03-13 22:01:57.180951921 +0100 -+++ gdb-7.6.1/gdb/jv-lang.c 2016-03-13 22:01:57.830956588 +0100 +--- gdb-7.6.1.orig/gdb/jv-lang.c 2018-05-05 17:15:29.643212202 +0200 ++++ gdb-7.6.1/gdb/jv-lang.c 2018-05-05 17:15:31.439228249 +0200 @@ -437,7 +437,7 @@ for (i = TYPE_N_BASECLASSES (type); i < nfields; i++) { @@ -2437,8 +2437,8 @@ Index: gdb-7.6.1/gdb/jv-lang.c const char *type_encoding = java_get_encoding (type); Index: gdb-7.6.1/gdb/jv-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/jv-lang.h 2013-01-01 07:32:46.000000000 +0100 -+++ gdb-7.6.1/gdb/jv-lang.h 2016-03-13 22:01:57.830956588 +0100 +--- gdb-7.6.1.orig/gdb/jv-lang.h 2018-05-05 17:15:29.643212202 +0200 ++++ gdb-7.6.1/gdb/jv-lang.h 2018-05-05 17:15:31.439228249 +0200 @@ -42,8 +42,8 @@ extern const struct builtin_java_type *builtin_java_type (struct gdbarch *); @@ -2452,8 +2452,8 @@ Index: gdb-7.6.1/gdb/jv-lang.h Index: gdb-7.6.1/gdb/jv-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/jv-valprint.c 2013-01-31 19:37:37.000000000 +0100 -+++ gdb-7.6.1/gdb/jv-valprint.c 2016-03-13 22:01:57.830956588 +0100 +--- gdb-7.6.1.orig/gdb/jv-valprint.c 2018-05-05 17:15:29.644212211 +0200 ++++ gdb-7.6.1/gdb/jv-valprint.c 2018-05-05 17:15:31.439228249 +0200 @@ -266,7 +266,7 @@ static void @@ -2474,8 +2474,8 @@ Index: gdb-7.6.1/gdb/jv-valprint.c const struct value_print_options *options) Index: gdb-7.6.1/gdb/language.c =================================================================== ---- gdb-7.6.1.orig/gdb/language.c 2013-01-01 07:32:46.000000000 +0100 -+++ gdb-7.6.1/gdb/language.c 2016-03-13 22:01:57.830956588 +0100 +--- gdb-7.6.1.orig/gdb/language.c 2018-05-05 17:15:29.644212211 +0200 ++++ gdb-7.6.1/gdb/language.c 2018-05-05 17:15:31.439228249 +0200 @@ -720,7 +720,7 @@ static void @@ -2496,8 +2496,8 @@ Index: gdb-7.6.1/gdb/language.c const struct value_print_options *options) Index: gdb-7.6.1/gdb/language.h =================================================================== ---- gdb-7.6.1.orig/gdb/language.h 2013-03-05 22:15:34.000000000 +0100 -+++ gdb-7.6.1/gdb/language.h 2016-03-13 22:01:57.831956595 +0100 +--- gdb-7.6.1.orig/gdb/language.h 2018-05-05 17:15:29.644212211 +0200 ++++ gdb-7.6.1/gdb/language.h 2018-05-05 17:15:31.439228249 +0200 @@ -175,7 +175,7 @@ struct ui_file * stream); @@ -2518,8 +2518,8 @@ Index: gdb-7.6.1/gdb/language.h const struct value_print_options *options); Index: gdb-7.6.1/gdb/m2-lang.c =================================================================== ---- gdb-7.6.1.orig/gdb/m2-lang.c 2013-01-07 17:40:36.000000000 +0100 -+++ gdb-7.6.1/gdb/m2-lang.c 2016-03-13 22:01:57.831956595 +0100 +--- gdb-7.6.1.orig/gdb/m2-lang.c 2018-05-05 17:15:29.644212211 +0200 ++++ gdb-7.6.1/gdb/m2-lang.c 2018-05-05 17:15:31.439228249 +0200 @@ -103,10 +103,10 @@ static void @@ -2556,8 +2556,8 @@ Index: gdb-7.6.1/gdb/m2-lang.c need_comma = 1; Index: gdb-7.6.1/gdb/m2-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/m2-lang.h 2013-01-01 07:32:46.000000000 +0100 -+++ gdb-7.6.1/gdb/m2-lang.h 2016-03-13 22:01:57.831956595 +0100 +--- gdb-7.6.1.orig/gdb/m2-lang.h 2018-05-05 17:15:29.644212211 +0200 ++++ gdb-7.6.1/gdb/m2-lang.h 2018-05-05 17:15:31.440228258 +0200 @@ -33,7 +33,7 @@ extern int m2_is_long_set (struct type *type); extern int m2_is_unbounded_array (struct type *type); @@ -2569,8 +2569,8 @@ Index: gdb-7.6.1/gdb/m2-lang.h const struct value_print_options *); Index: gdb-7.6.1/gdb/m2-typeprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/m2-typeprint.c 2013-01-31 19:37:37.000000000 +0100 -+++ gdb-7.6.1/gdb/m2-typeprint.c 2016-03-13 22:01:57.831956595 +0100 +--- gdb-7.6.1.orig/gdb/m2-typeprint.c 2018-05-05 17:15:29.645212220 +0200 ++++ gdb-7.6.1/gdb/m2-typeprint.c 2018-05-05 17:15:31.440228258 +0200 @@ -233,9 +233,12 @@ m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 1); } @@ -2589,8 +2589,8 @@ Index: gdb-7.6.1/gdb/m2-typeprint.c m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags); Index: gdb-7.6.1/gdb/m2-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/m2-valprint.c 2013-01-01 07:32:46.000000000 +0100 -+++ gdb-7.6.1/gdb/m2-valprint.c 2016-03-13 22:01:57.832956602 +0100 +--- gdb-7.6.1.orig/gdb/m2-valprint.c 2018-05-05 17:15:29.645212220 +0200 ++++ gdb-7.6.1/gdb/m2-valprint.c 2018-05-05 17:15:31.440228258 +0200 @@ -35,7 +35,7 @@ struct ui_file *stream); static void @@ -2658,8 +2658,8 @@ Index: gdb-7.6.1/gdb/m2-valprint.c for (temp_len = 0; Index: gdb-7.6.1/gdb/memrange.c =================================================================== ---- gdb-7.6.1.orig/gdb/memrange.c 2013-01-01 07:32:47.000000000 +0100 -+++ gdb-7.6.1/gdb/memrange.c 2016-03-13 22:01:57.832956602 +0100 +--- gdb-7.6.1.orig/gdb/memrange.c 2018-05-05 17:15:29.645212220 +0200 ++++ gdb-7.6.1/gdb/memrange.c 2018-05-05 17:15:31.440228258 +0200 @@ -21,8 +21,8 @@ #include "memrange.h" @@ -2673,8 +2673,8 @@ Index: gdb-7.6.1/gdb/memrange.c Index: gdb-7.6.1/gdb/memrange.h =================================================================== ---- gdb-7.6.1.orig/gdb/memrange.h 2013-01-01 07:32:47.000000000 +0100 -+++ gdb-7.6.1/gdb/memrange.h 2016-03-13 22:01:57.832956602 +0100 +--- gdb-7.6.1.orig/gdb/memrange.h 2018-05-05 17:15:29.645212220 +0200 ++++ gdb-7.6.1/gdb/memrange.h 2018-05-05 17:15:31.440228258 +0200 @@ -30,7 +30,7 @@ CORE_ADDR start; @@ -2697,8 +2697,8 @@ Index: gdb-7.6.1/gdb/memrange.h overlapping ranges. */ Index: gdb-7.6.1/gdb/mips-linux-nat.c =================================================================== ---- gdb-7.6.1.orig/gdb/mips-linux-nat.c 2013-02-19 08:50:30.000000000 +0100 -+++ gdb-7.6.1/gdb/mips-linux-nat.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/mips-linux-nat.c 2018-05-05 17:15:29.645212220 +0200 ++++ gdb-7.6.1/gdb/mips-linux-nat.c 2018-05-05 17:15:31.440228258 +0200 @@ -938,7 +938,7 @@ the specified region can be covered by the watch registers. */ @@ -2710,8 +2710,8 @@ Index: gdb-7.6.1/gdb/mips-linux-nat.c int i; Index: gdb-7.6.1/gdb/opencl-lang.c =================================================================== ---- gdb-7.6.1.orig/gdb/opencl-lang.c 2013-01-25 18:16:40.000000000 +0100 -+++ gdb-7.6.1/gdb/opencl-lang.c 2016-03-13 22:01:57.833956609 +0100 +--- gdb-7.6.1.orig/gdb/opencl-lang.c 2018-05-05 17:15:29.646212229 +0200 ++++ gdb-7.6.1/gdb/opencl-lang.c 2018-05-05 17:15:31.441228267 +0200 @@ -80,11 +80,11 @@ static struct type * @@ -2840,8 +2840,8 @@ Index: gdb-7.6.1/gdb/opencl-lang.c c->indices[i] * elsize + comp_offset, Index: gdb-7.6.1/gdb/p-lang.c =================================================================== ---- gdb-7.6.1.orig/gdb/p-lang.c 2013-01-07 17:40:36.000000000 +0100 -+++ gdb-7.6.1/gdb/p-lang.c 2016-03-13 22:01:57.833956609 +0100 +--- gdb-7.6.1.orig/gdb/p-lang.c 2018-05-05 17:15:29.646212229 +0200 ++++ gdb-7.6.1/gdb/p-lang.c 2018-05-05 17:15:31.441228267 +0200 @@ -95,8 +95,8 @@ are not multiple of TARGET_CHAR_BIT then the results are wrong but this does not happen for Free Pascal nor for GPC. */ @@ -2891,8 +2891,8 @@ Index: gdb-7.6.1/gdb/p-lang.c need_comma = 1; Index: gdb-7.6.1/gdb/p-lang.h =================================================================== ---- gdb-7.6.1.orig/gdb/p-lang.h 2013-01-01 07:32:47.000000000 +0100 -+++ gdb-7.6.1/gdb/p-lang.h 2016-03-13 22:01:57.833956609 +0100 +--- gdb-7.6.1.orig/gdb/p-lang.h 2018-05-05 17:15:29.647212238 +0200 ++++ gdb-7.6.1/gdb/p-lang.h 2018-05-05 17:15:31.441228267 +0200 @@ -35,7 +35,7 @@ extern void pascal_print_typedef (struct type *, struct symbol *, struct ui_file *); @@ -2929,8 +2929,8 @@ Index: gdb-7.6.1/gdb/p-lang.h const struct value *, Index: gdb-7.6.1/gdb/p-valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/p-valprint.c 2016-03-13 22:01:55.865942480 +0100 -+++ gdb-7.6.1/gdb/p-valprint.c 2016-03-13 22:29:09.785663564 +0100 +--- gdb-7.6.1.orig/gdb/p-valprint.c 2018-05-05 17:15:29.647212238 +0200 ++++ gdb-7.6.1/gdb/p-valprint.c 2018-05-05 17:15:31.441228267 +0200 @@ -58,7 +58,7 @@ void @@ -2994,8 +2994,8 @@ Index: gdb-7.6.1/gdb/p-valprint.c Index: gdb-7.6.1/gdb/ppc-linux-nat.c =================================================================== ---- gdb-7.6.1.orig/gdb/ppc-linux-nat.c 2016-03-13 22:01:55.928942932 +0100 -+++ gdb-7.6.1/gdb/ppc-linux-nat.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/ppc-linux-nat.c 2018-05-05 17:15:29.647212238 +0200 ++++ gdb-7.6.1/gdb/ppc-linux-nat.c 2018-05-05 17:15:31.442228276 +0200 @@ -1492,7 +1492,7 @@ } @@ -3007,8 +3007,8 @@ Index: gdb-7.6.1/gdb/ppc-linux-nat.c if (len <= 0) Index: gdb-7.6.1/gdb/printcmd.c =================================================================== ---- gdb-7.6.1.orig/gdb/printcmd.c 2016-03-13 22:01:56.371946113 +0100 -+++ gdb-7.6.1/gdb/printcmd.c 2016-03-13 22:01:57.835956624 +0100 +--- gdb-7.6.1.orig/gdb/printcmd.c 2018-05-05 17:15:29.648212247 +0200 ++++ gdb-7.6.1/gdb/printcmd.c 2018-05-05 17:15:31.442228276 +0200 @@ -290,7 +290,7 @@ struct ui_file *stream) { @@ -3029,8 +3029,8 @@ Index: gdb-7.6.1/gdb/printcmd.c /* String printing should go through val_print_scalar_formatted. */ Index: gdb-7.6.1/gdb/procfs.c =================================================================== ---- gdb-7.6.1.orig/gdb/procfs.c 2013-01-01 07:32:49.000000000 +0100 -+++ gdb-7.6.1/gdb/procfs.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/procfs.c 2018-05-05 17:15:29.649212256 +0200 ++++ gdb-7.6.1/gdb/procfs.c 2018-05-05 17:15:31.443228285 +0200 @@ -4926,7 +4926,7 @@ } @@ -3042,8 +3042,8 @@ Index: gdb-7.6.1/gdb/procfs.c system can support "thousands" of hardware watchpoints, but gives Index: gdb-7.6.1/gdb/python/py-prettyprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/python/py-prettyprint.c 2013-01-01 07:33:01.000000000 +0100 -+++ gdb-7.6.1/gdb/python/py-prettyprint.c 2016-03-13 22:01:57.836956631 +0100 +--- gdb-7.6.1.orig/gdb/python/py-prettyprint.c 2018-05-05 17:15:29.649212256 +0200 ++++ gdb-7.6.1/gdb/python/py-prettyprint.c 2018-05-05 17:15:31.443228285 +0200 @@ -689,7 +689,7 @@ int @@ -3064,8 +3064,8 @@ Index: gdb-7.6.1/gdb/python/py-prettyprint.c const struct value_print_options *options, Index: gdb-7.6.1/gdb/python/python.h =================================================================== ---- gdb-7.6.1.orig/gdb/python/python.h 2016-03-13 22:01:55.868942501 +0100 -+++ gdb-7.6.1/gdb/python/python.h 2016-03-13 22:29:06.600640819 +0100 +--- gdb-7.6.1.orig/gdb/python/python.h 2018-05-05 17:15:29.649212256 +0200 ++++ gdb-7.6.1/gdb/python/python.h 2018-05-05 17:15:31.443228285 +0200 @@ -37,7 +37,7 @@ void run_python_script (int argc, char **argv); @@ -3077,8 +3077,8 @@ Index: gdb-7.6.1/gdb/python/python.h const struct value_print_options *options, Index: gdb-7.6.1/gdb/regcache.c =================================================================== ---- gdb-7.6.1.orig/gdb/regcache.c 2013-03-07 19:59:54.000000000 +0100 -+++ gdb-7.6.1/gdb/regcache.c 2016-03-13 22:01:57.837956638 +0100 +--- gdb-7.6.1.orig/gdb/regcache.c 2018-05-05 17:15:29.650212265 +0200 ++++ gdb-7.6.1/gdb/regcache.c 2018-05-05 17:15:31.443228285 +0200 @@ -899,7 +899,7 @@ static enum register_status @@ -3126,8 +3126,8 @@ Index: gdb-7.6.1/gdb/regcache.c Index: gdb-7.6.1/gdb/regcache.h =================================================================== ---- gdb-7.6.1.orig/gdb/regcache.h 2013-01-01 07:32:49.000000000 +0100 -+++ gdb-7.6.1/gdb/regcache.h 2016-03-13 22:01:57.837956638 +0100 +--- gdb-7.6.1.orig/gdb/regcache.h 2018-05-05 17:15:29.650212265 +0200 ++++ gdb-7.6.1/gdb/regcache.h 2018-05-05 17:15:31.443228285 +0200 @@ -89,9 +89,9 @@ extern enum register_status @@ -3157,8 +3157,8 @@ Index: gdb-7.6.1/gdb/regcache.h Index: gdb-7.6.1/gdb/remote.c =================================================================== ---- gdb-7.6.1.orig/gdb/remote.c 2016-03-13 22:01:57.584954821 +0100 -+++ gdb-7.6.1/gdb/remote.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/remote.c 2018-05-05 17:15:29.652212283 +0200 ++++ gdb-7.6.1/gdb/remote.c 2018-05-05 17:15:31.445228303 +0200 @@ -8272,7 +8272,7 @@ int remote_hw_breakpoint_limit = -1; @@ -3170,8 +3170,8 @@ Index: gdb-7.6.1/gdb/remote.c return 0; Index: gdb-7.6.1/gdb/s390-nat.c =================================================================== ---- gdb-7.6.1.orig/gdb/s390-nat.c 2013-01-01 07:32:50.000000000 +0100 -+++ gdb-7.6.1/gdb/s390-nat.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/s390-nat.c 2018-05-05 17:15:29.652212283 +0200 ++++ gdb-7.6.1/gdb/s390-nat.c 2018-05-05 17:15:31.445228303 +0200 @@ -571,7 +571,7 @@ } @@ -3183,8 +3183,8 @@ Index: gdb-7.6.1/gdb/s390-nat.c } Index: gdb-7.6.1/gdb/spu-multiarch.c =================================================================== ---- gdb-7.6.1.orig/gdb/spu-multiarch.c 2013-03-01 16:38:26.000000000 +0100 -+++ gdb-7.6.1/gdb/spu-multiarch.c 2016-03-13 22:01:57.840956660 +0100 +--- gdb-7.6.1.orig/gdb/spu-multiarch.c 2018-05-05 17:15:29.652212283 +0200 ++++ gdb-7.6.1/gdb/spu-multiarch.c 2018-05-05 17:15:31.445228303 +0200 @@ -118,7 +118,7 @@ /* Override the to_region_ok_for_hw_watchpoint routine. */ @@ -3196,8 +3196,8 @@ Index: gdb-7.6.1/gdb/spu-multiarch.c while (ops_beneath && !ops_beneath->to_region_ok_for_hw_watchpoint) Index: gdb-7.6.1/gdb/stack.c =================================================================== ---- gdb-7.6.1.orig/gdb/stack.c 2016-03-13 22:01:55.869942508 +0100 -+++ gdb-7.6.1/gdb/stack.c 2016-03-13 22:29:06.600640819 +0100 +--- gdb-7.6.1.orig/gdb/stack.c 2018-05-05 17:15:29.653212292 +0200 ++++ gdb-7.6.1/gdb/stack.c 2018-05-05 17:15:31.446228312 +0200 @@ -174,7 +174,7 @@ argument (not just the first nameless argument). */ @@ -3238,8 +3238,8 @@ Index: gdb-7.6.1/gdb/stack.c start = gdbarch_frame_args_skip (get_frame_arch (frame)); Index: gdb-7.6.1/gdb/symmisc.c =================================================================== ---- gdb-7.6.1.orig/gdb/symmisc.c 2016-03-13 22:01:56.586947656 +0100 -+++ gdb-7.6.1/gdb/symmisc.c 2016-03-13 22:01:57.841956667 +0100 +--- gdb-7.6.1.orig/gdb/symmisc.c 2018-05-05 17:15:29.653212292 +0200 ++++ gdb-7.6.1/gdb/symmisc.c 2018-05-05 17:15:31.446228312 +0200 @@ -527,11 +527,11 @@ case LOC_CONST_BYTES: @@ -3257,8 +3257,8 @@ Index: gdb-7.6.1/gdb/symmisc.c (unsigned) SYMBOL_VALUE_BYTES (symbol)[i]); Index: gdb-7.6.1/gdb/target.c =================================================================== ---- gdb-7.6.1.orig/gdb/target.c 2016-03-13 22:01:57.586954836 +0100 -+++ gdb-7.6.1/gdb/target.c 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/target.c 2018-05-05 17:15:29.654212301 +0200 ++++ gdb-7.6.1/gdb/target.c 2018-05-05 17:15:31.447228321 +0200 @@ -51,7 +51,7 @@ static int default_watchpoint_addr_within_range (struct target_ops *, CORE_ADDR, CORE_ADDR, int); @@ -3297,8 +3297,8 @@ Index: gdb-7.6.1/gdb/target.c Index: gdb-7.6.1/gdb/target.h =================================================================== ---- gdb-7.6.1.orig/gdb/target.h 2016-03-13 22:01:57.586954836 +0100 -+++ gdb-7.6.1/gdb/target.h 2016-03-13 22:29:09.740663243 +0100 +--- gdb-7.6.1.orig/gdb/target.h 2018-05-05 17:15:29.655212309 +0200 ++++ gdb-7.6.1/gdb/target.h 2018-05-05 17:15:31.447228321 +0200 @@ -485,7 +485,7 @@ /* Documentation of this routine is provided with the corresponding @@ -3310,8 +3310,8 @@ Index: gdb-7.6.1/gdb/target.h struct expression *); Index: gdb-7.6.1/gdb/tracepoint.c =================================================================== ---- gdb-7.6.1.orig/gdb/tracepoint.c 2013-03-12 18:39:44.000000000 +0100 -+++ gdb-7.6.1/gdb/tracepoint.c 2016-03-13 22:01:57.843956681 +0100 +--- gdb-7.6.1.orig/gdb/tracepoint.c 2018-05-05 17:15:29.657212327 +0200 ++++ gdb-7.6.1/gdb/tracepoint.c 2018-05-05 17:15:31.448228330 +0200 @@ -959,13 +959,13 @@ static void add_memrange (struct collection_list *memranges, @@ -3407,8 +3407,8 @@ Index: gdb-7.6.1/gdb/tracepoint.c break; Index: gdb-7.6.1/gdb/typeprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/typeprint.c 2016-03-13 22:01:55.877942566 +0100 -+++ gdb-7.6.1/gdb/typeprint.c 2016-03-13 22:01:57.844956688 +0100 +--- gdb-7.6.1.orig/gdb/typeprint.c 2018-05-05 17:15:29.657212327 +0200 ++++ gdb-7.6.1/gdb/typeprint.c 2018-05-05 17:15:31.448228330 +0200 @@ -409,7 +409,7 @@ struct type *real_type = NULL; struct type *type; @@ -3420,8 +3420,8 @@ Index: gdb-7.6.1/gdb/typeprint.c struct type_print_options flags = default_ptype_flags; Index: gdb-7.6.1/gdb/valarith.c =================================================================== ---- gdb-7.6.1.orig/gdb/valarith.c 2016-03-13 22:01:55.879942580 +0100 -+++ gdb-7.6.1/gdb/valarith.c 2016-03-13 22:01:57.844956688 +0100 +--- gdb-7.6.1.orig/gdb/valarith.c 2018-05-05 17:15:29.658212336 +0200 ++++ gdb-7.6.1/gdb/valarith.c 2018-05-05 17:15:31.448228330 +0200 @@ -190,15 +190,15 @@ to doubles, but no longer does. */ @@ -3477,8 +3477,8 @@ Index: gdb-7.6.1/gdb/valarith.c { Index: gdb-7.6.1/gdb/valops.c =================================================================== ---- gdb-7.6.1.orig/gdb/valops.c 2016-03-13 22:01:57.016950743 +0100 -+++ gdb-7.6.1/gdb/valops.c 2016-03-13 22:29:09.785663564 +0100 +--- gdb-7.6.1.orig/gdb/valops.c 2018-05-05 17:15:29.662212372 +0200 ++++ gdb-7.6.1/gdb/valops.c 2018-05-05 17:15:31.449228339 +0200 @@ -54,11 +54,11 @@ struct field t1[], struct value *t2[]); @@ -3796,8 +3796,8 @@ Index: gdb-7.6.1/gdb/valops.c Index: gdb-7.6.1/gdb/valprint.c =================================================================== ---- gdb-7.6.1.orig/gdb/valprint.c 2016-03-13 22:01:55.880942587 +0100 -+++ gdb-7.6.1/gdb/valprint.c 2016-03-13 22:01:57.846956703 +0100 +--- gdb-7.6.1.orig/gdb/valprint.c 2018-05-05 17:15:29.663212381 +0200 ++++ gdb-7.6.1/gdb/valprint.c 2018-05-05 17:15:31.449228339 +0200 @@ -299,7 +299,7 @@ int valprint_check_validity (struct ui_file *stream, @@ -3893,8 +3893,8 @@ Index: gdb-7.6.1/gdb/valprint.c const struct value_print_options *options) Index: gdb-7.6.1/gdb/valprint.h =================================================================== ---- gdb-7.6.1.orig/gdb/valprint.h 2013-01-08 03:00:34.000000000 +0100 -+++ gdb-7.6.1/gdb/valprint.h 2016-03-13 22:01:57.846956703 +0100 +--- gdb-7.6.1.orig/gdb/valprint.h 2018-05-05 17:15:29.663212381 +0200 ++++ gdb-7.6.1/gdb/valprint.h 2018-05-05 17:15:31.450228348 +0200 @@ -113,11 +113,11 @@ struct ui_file *stream, const struct value_print_options *); @@ -3947,8 +3947,8 @@ Index: gdb-7.6.1/gdb/valprint.h const struct value_print_options *options); Index: gdb-7.6.1/gdb/value.c =================================================================== ---- gdb-7.6.1.orig/gdb/value.c 2016-03-13 22:01:57.181951928 +0100 -+++ gdb-7.6.1/gdb/value.c 2016-03-13 22:29:09.785663564 +0100 +--- gdb-7.6.1.orig/gdb/value.c 2018-05-05 17:15:29.667212417 +0200 ++++ gdb-7.6.1/gdb/value.c 2018-05-05 17:15:31.450228348 +0200 @@ -68,10 +68,10 @@ struct range { @@ -4254,8 +4254,8 @@ Index: gdb-7.6.1/gdb/value.c addr += bitpos / 8; Index: gdb-7.6.1/gdb/value.h =================================================================== ---- gdb-7.6.1.orig/gdb/value.h 2016-03-13 22:01:55.881942594 +0100 -+++ gdb-7.6.1/gdb/value.h 2016-03-13 22:01:57.848956717 +0100 +--- gdb-7.6.1.orig/gdb/value.h 2018-05-05 17:15:29.668212426 +0200 ++++ gdb-7.6.1/gdb/value.h 2018-05-05 17:15:31.451228357 +0200 @@ -82,8 +82,8 @@ within the registers structure. Note also the member embedded_offset below. */ @@ -4492,9 +4492,9 @@ Index: gdb-7.6.1/gdb/value.h Index: gdb-7.6.1/gdb/aarch64-linux-nat.c =================================================================== ---- gdb-7.6.1.orig/gdb/aarch64-linux-nat.c 2016-03-13 22:01:55.936942989 +0100 -+++ gdb-7.6.1/gdb/aarch64-linux-nat.c 2016-03-13 22:29:39.228873825 +0100 -@@ -427,14 +427,14 @@ +--- gdb-7.6.1.orig/gdb/aarch64-linux-nat.c 2018-05-05 17:15:29.669212435 +0200 ++++ gdb-7.6.1/gdb/aarch64-linux-nat.c 2018-05-05 17:17:17.355174655 +0200 +@@ -541,14 +541,14 @@ static void aarch64_show_debug_reg_state (struct aarch64_debug_reg_state *state, const char *func, CORE_ADDR addr, @@ -4512,28 +4512,28 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c type == hw_write ? "hw-write-watchpoint" : (type == hw_read ? "hw-read-watchpoint" : (type == hw_access ? "hw-access-watchpoint" -@@ -866,9 +866,9 @@ +@@ -981,9 +981,9 @@ gdbserver/linux-aarch64-low.c for more information. */ static void -aarch64_align_watchpoint (CORE_ADDR addr, int len, CORE_ADDR *aligned_addr_p, +aarch64_align_watchpoint (CORE_ADDR addr, LONGEST len, CORE_ADDR *aligned_addr_p, - int *aligned_len_p, CORE_ADDR *next_addr_p, -- int *next_len_p) -+ LONGEST *next_len_p) + int *aligned_offset_p, int *aligned_len_p, +- CORE_ADDR *next_addr_p, int *next_len_p, ++ CORE_ADDR *next_addr_p, LONGEST *next_len_p, + CORE_ADDR *next_addr_orig_p) { int aligned_len; - unsigned int offset; -@@ -988,7 +988,7 @@ +@@ -1100,7 +1100,7 @@ breakpoint/watchpoint control register. */ static unsigned int --aarch64_point_encode_ctrl_reg (int type, int len) -+aarch64_point_encode_ctrl_reg (int type, LONGEST len) +-aarch64_point_encode_ctrl_reg (int type, int offset, int len) ++aarch64_point_encode_ctrl_reg (int type, int offset, LONGEST len) { unsigned int ctrl, ttype; -@@ -1034,7 +1034,7 @@ +@@ -1149,7 +1149,7 @@ Return 0 for any non-compliant ADDR and/or LEN; return 1 otherwise. */ static int @@ -4542,25 +4542,25 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c { unsigned int alignment = is_watchpoint ? AARCH64_HWP_ALIGNMENT : AARCH64_HBP_ALIGNMENT; -@@ -1053,7 +1053,7 @@ +@@ -1171,7 +1171,7 @@ static int aarch64_dr_state_insert_one_point (struct aarch64_debug_reg_state *state, -- int type, CORE_ADDR addr, int len) -+ int type, CORE_ADDR addr, LONGEST len) +- int type, CORE_ADDR addr, int offset, int len, ++ int type, CORE_ADDR addr, int offset, LONGEST len, + CORE_ADDR addr_orig) { int i, idx, num_regs, is_watchpoint; - unsigned int ctrl, *dr_ctrl_p, *dr_ref_count; -@@ -1125,7 +1125,7 @@ +@@ -1250,7 +1250,7 @@ static int aarch64_dr_state_remove_one_point (struct aarch64_debug_reg_state *state, -- int type, CORE_ADDR addr, int len) -+ int type, CORE_ADDR addr, LONGEST len) +- int type, CORE_ADDR addr, int offset, int len, ++ int type, CORE_ADDR addr, int offset, LONGEST len, + CORE_ADDR addr_orig) { int i, num_regs, is_watchpoint; - unsigned int ctrl, *dr_ctrl_p, *dr_ref_count; -@@ -1264,7 +1264,7 @@ +@@ -1396,7 +1396,7 @@ from that it is an aligned watchpoint to be handled. */ static int @@ -4569,7 +4569,7 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c int is_insert) { struct aarch64_debug_reg_state *state -@@ -1284,7 +1284,7 @@ +@@ -1416,7 +1416,7 @@ Return 0 if succeed. */ static int @@ -4578,18 +4578,22 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c int is_insert) { struct aarch64_debug_reg_state *state -@@ -1309,8 +1309,8 @@ - fprintf_unfiltered (gdb_stdlog, - "handle_unaligned_watchpoint: is_insert: %d\n" +@@ -1447,12 +1447,12 @@ " aligned_addr: 0x%08lx, aligned_len: %d\n" --" next_addr: 0x%08lx, next_len: %d\n", -- is_insert, aligned_addr, aligned_len, addr, len); -+" next_addr: 0x%08lx, next_len: %s\n", -+ is_insert, aligned_addr, aligned_len, addr, plongest (len)); - - if (ret != 0) - return ret; -@@ -1322,7 +1322,7 @@ + " addr_orig: %s\n" + " " +-" next_addr: %s, next_len: %d\n" ++" next_addr: %s, next_len: %s\n" + " " + " addr_orig_next: %s\n", + is_insert, aligned_addr, + aligned_len, core_addr_to_string_nz (addr_orig), +- core_addr_to_string_nz (addr), len, ++ core_addr_to_string_nz (addr), plongest (len), + core_addr_to_string_nz (addr_orig_next)); + + addr_orig = addr_orig_next; +@@ -1467,7 +1467,7 @@ /* Implements insertion and removal of a single watchpoint. */ static int @@ -4598,7 +4602,7 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c { if (aarch64_point_is_aligned (1 /* is_watchpoint */ , addr, len)) return aarch64_handle_aligned_watchpoint (type, addr, len, is_insert); -@@ -1337,15 +1337,15 @@ +@@ -1482,15 +1482,15 @@ of the type TYPE. Return 0 on success, -1 on failure. */ static int @@ -4617,7 +4621,7 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c gdb_assert (type != hw_execute); -@@ -1369,15 +1369,15 @@ +@@ -1514,15 +1514,15 @@ type TYPE. Return 0 on success, -1 on failure. */ static int @@ -4636,7 +4640,7 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c gdb_assert (type != hw_execute); -@@ -1398,7 +1398,7 @@ +@@ -1543,7 +1543,7 @@ /* Implement the "to_region_ok_for_hw_watchpoint" target_ops method. */ static int @@ -4645,7 +4649,7 @@ Index: gdb-7.6.1/gdb/aarch64-linux-nat.c { CORE_ADDR aligned_addr; -@@ -1488,7 +1488,7 @@ +@@ -1655,7 +1655,7 @@ static int aarch64_linux_watchpoint_addr_within_range (struct target_ops *target, CORE_ADDR addr, diff --git a/SOURCES/gdb-upstream-framefilters-1of2.patch b/SOURCES/gdb-upstream-framefilters-1of2.patch index 80a0d43..7bd284b 100644 --- a/SOURCES/gdb-upstream-framefilters-1of2.patch +++ b/SOURCES/gdb-upstream-framefilters-1of2.patch @@ -55,11 +55,11 @@ http://sourceware.org/ml/gdb-cvs/2013-05/msg00084.html 2013-05-09 Doug Evans * symfile.c (syms_from_objfile_1): Delete args offsets, num_offsets. -Index: gdb-7.6/gdb/Makefile.in +Index: gdb-7.6.1/gdb/Makefile.in =================================================================== ---- gdb-7.6.orig/gdb/Makefile.in 2013-06-10 14:31:02.704084663 +0200 -+++ gdb-7.6/gdb/Makefile.in 2013-06-10 14:31:08.351082443 +0200 -@@ -284,6 +284,7 @@ SUBDIR_PYTHON_OBS = \ +--- gdb-7.6.1.orig/gdb/Makefile.in 2018-05-05 17:17:42.013394985 +0200 ++++ gdb-7.6.1/gdb/Makefile.in 2018-05-05 17:18:23.767768082 +0200 +@@ -284,6 +284,7 @@ py-exitedevent.o \ py-finishbreakpoint.o \ py-frame.o \ @@ -67,7 +67,7 @@ Index: gdb-7.6/gdb/Makefile.in py-function.o \ py-gdb-readline.o \ py-inferior.o \ -@@ -318,6 +319,7 @@ SUBDIR_PYTHON_SRCS = \ +@@ -318,6 +319,7 @@ python/py-exitedevent.c \ python/py-finishbreakpoint.c \ python/py-frame.c \ @@ -75,7 +75,7 @@ Index: gdb-7.6/gdb/Makefile.in python/py-function.c \ python/py-gdb-readline.c \ python/py-inferior.c \ -@@ -2174,6 +2176,10 @@ py-frame.o: $(srcdir)/python/py-frame.c +@@ -2174,6 +2176,10 @@ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-frame.c $(POSTCOMPILE) @@ -86,13 +86,13 @@ Index: gdb-7.6/gdb/Makefile.in py-function.o: $(srcdir)/python/py-function.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-function.c $(POSTCOMPILE) -Index: gdb-7.6/gdb/NEWS +Index: gdb-7.6.1/gdb/NEWS =================================================================== ---- gdb-7.6.orig/gdb/NEWS 2013-06-10 14:31:08.353082442 +0200 -+++ gdb-7.6/gdb/NEWS 2013-06-10 14:31:21.230077319 +0200 -@@ -4,6 +4,10 @@ - * Newly installed $prefix/bin/gcore acts as a shell interface for the - GDB command gcore. +--- gdb-7.6.1.orig/gdb/NEWS 2018-05-05 17:17:42.015395003 +0200 ++++ gdb-7.6.1/gdb/NEWS 2018-05-05 17:18:23.768768091 +0200 +@@ -20,6 +20,10 @@ + the tradeoff that there is a possibility of false hits being + reported. +* Python scripting + @@ -101,10 +101,10 @@ Index: gdb-7.6/gdb/NEWS * New remote packets qXfer:libraries-svr4:read's annex -Index: gdb-7.6/gdb/stack.c +Index: gdb-7.6.1/gdb/stack.c =================================================================== ---- gdb-7.6.orig/gdb/stack.c 2013-06-10 14:31:02.709084661 +0200 -+++ gdb-7.6/gdb/stack.c 2013-06-10 14:31:08.354082441 +0200 +--- gdb-7.6.1.orig/gdb/stack.c 2018-05-05 17:17:42.016395012 +0200 ++++ gdb-7.6.1/gdb/stack.c 2018-05-05 17:18:23.769768100 +0200 @@ -54,6 +54,7 @@ #include "psymtab.h" @@ -113,7 +113,7 @@ Index: gdb-7.6/gdb/stack.c void (*deprecated_selected_frame_level_changed_hook) (int); -@@ -1655,13 +1656,15 @@ frame_info (char *addr_exp, int from_tty +@@ -1676,13 +1677,15 @@ frames. */ static void @@ -131,7 +131,7 @@ Index: gdb-7.6/gdb/stack.c if (!target_has_stack) error (_("No stack.")); -@@ -1680,6 +1683,7 @@ backtrace_command_1 (char *count_exp, in +@@ -1701,6 +1704,7 @@ { struct frame_info *current; @@ -139,7 +139,7 @@ Index: gdb-7.6/gdb/stack.c count = -count; current = trailing; -@@ -1701,9 +1705,17 @@ backtrace_command_1 (char *count_exp, in +@@ -1722,9 +1726,17 @@ count = -1; } @@ -158,7 +158,7 @@ Index: gdb-7.6/gdb/stack.c if (info_verbose) { -@@ -1723,16 +1735,40 @@ backtrace_command_1 (char *count_exp, in +@@ -1744,16 +1756,40 @@ } } @@ -206,7 +206,7 @@ Index: gdb-7.6/gdb/stack.c { struct frame_id frame_id = get_frame_id (fi); -@@ -1748,24 +1784,25 @@ backtrace_command_1 (char *count_exp, in +@@ -1769,24 +1805,25 @@ } } @@ -247,7 +247,7 @@ Index: gdb-7.6/gdb/stack.c } } -@@ -1773,7 +1810,8 @@ static void +@@ -1794,7 +1831,8 @@ backtrace_command (char *arg, int from_tty) { struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); @@ -257,7 +257,7 @@ Index: gdb-7.6/gdb/stack.c if (arg) { -@@ -1790,25 +1828,31 @@ backtrace_command (char *arg, int from_t +@@ -1811,25 +1849,31 @@ for (j = 0; j < strlen (argv[i]); j++) argv[i][j] = tolower (argv[i][j]); @@ -297,7 +297,7 @@ Index: gdb-7.6/gdb/stack.c { strcat (arg, argv[i]); strcat (arg, " "); -@@ -1820,7 +1864,8 @@ backtrace_command (char *arg, int from_t +@@ -1841,7 +1885,8 @@ } } @@ -307,7 +307,7 @@ Index: gdb-7.6/gdb/stack.c do_cleanups (old_chain); } -@@ -1828,7 +1873,7 @@ backtrace_command (char *arg, int from_t +@@ -1849,7 +1894,7 @@ static void backtrace_full_command (char *arg, int from_tty) { @@ -316,7 +316,7 @@ Index: gdb-7.6/gdb/stack.c } -@@ -2562,7 +2607,9 @@ It can be a stack frame number or the ad +@@ -2583,7 +2628,9 @@ add_com ("backtrace", class_stack, backtrace_command, _("\ Print backtrace of all stack frames, or innermost COUNT frames.\n\ With a negative argument, print outermost -COUNT frames.\nUse of the \ @@ -327,11 +327,11 @@ Index: gdb-7.6/gdb/stack.c add_com_alias ("bt", "backtrace", class_stack, 0); if (xdb_commands) { -Index: gdb-7.6/gdb/data-directory/Makefile.in +Index: gdb-7.6.1/gdb/data-directory/Makefile.in =================================================================== ---- gdb-7.6.orig/gdb/data-directory/Makefile.in 2013-06-10 14:31:02.710084660 +0200 -+++ gdb-7.6/gdb/data-directory/Makefile.in 2013-06-10 14:31:08.355082441 +0200 -@@ -53,7 +53,11 @@ PYTHON_DIR = python +--- gdb-7.6.1.orig/gdb/data-directory/Makefile.in 2018-05-05 17:17:42.016395012 +0200 ++++ gdb-7.6.1/gdb/data-directory/Makefile.in 2018-05-05 17:18:23.769768100 +0200 +@@ -53,7 +53,11 @@ PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR) PYTHON_FILES = \ gdb/__init__.py \ @@ -343,11 +343,11 @@ Index: gdb-7.6/gdb/data-directory/Makefile.in gdb/command/ignore_errors.py \ gdb/command/pahole.py \ gdb/command/type_printers.py \ -Index: gdb-7.6/gdb/doc/gdb.texinfo +Index: gdb-7.6.1/gdb/doc/gdb.texinfo =================================================================== ---- gdb-7.6.orig/gdb/doc/gdb.texinfo 2013-06-10 14:31:02.727084654 +0200 -+++ gdb-7.6/gdb/doc/gdb.texinfo 2013-06-10 14:31:08.364082438 +0200 -@@ -6459,6 +6459,7 @@ currently executing frame and describes +--- gdb-7.6.1.orig/gdb/doc/gdb.texinfo 2018-05-05 17:17:42.030395137 +0200 ++++ gdb-7.6.1/gdb/doc/gdb.texinfo 2018-05-05 17:18:23.775768154 +0200 +@@ -6459,6 +6459,7 @@ @menu * Frames:: Stack frames * Backtrace:: Backtraces @@ -355,7 +355,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo * Selection:: Selecting a frame * Frame Info:: Information on a frame -@@ -6546,6 +6547,7 @@ line per frame, for many frames, startin +@@ -6546,6 +6547,7 @@ frame (frame zero), followed by its caller (frame one), and on up the stack. @@ -363,7 +363,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @table @code @kindex backtrace @kindex bt @r{(@code{backtrace})} -@@ -6571,6 +6573,19 @@ Similar, but print only the outermost @v +@@ -6571,6 +6573,19 @@ @itemx bt full -@var{n} Print the values of the local variables also. @var{n} specifies the number of frames to print, as described above. @@ -383,7 +383,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @end table @kindex where -@@ -6720,6 +6735,149 @@ Display an absolute filename. +@@ -6720,6 +6735,149 @@ Show the current way to display filenames. @end table @@ -533,7 +533,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @node Selection @section Selecting a Frame -@@ -23100,6 +23258,9 @@ situation, a Python @code{KeyboardInterr +@@ -23102,6 +23260,9 @@ * Selecting Pretty-Printers:: How GDB chooses a pretty-printer. * Writing a Pretty-Printer:: Writing a Pretty-Printer. * Type Printing API:: Pretty-printing types. @@ -543,7 +543,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo * Inferiors In Python:: Python representation of inferiors (processes) * Events In Python:: Listening for events from @value{GDBN}. * Threads In Python:: Accessing inferior threads from Python. -@@ -24450,6 +24611,636 @@ done then type printers would have to ma +@@ -24452,6 +24613,636 @@ order to avoid holding information that could become stale as the inferior changed. @@ -1180,7 +1180,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @node Inferiors In Python @subsubsection Inferiors In Python @cindex inferiors in Python -@@ -25280,6 +26071,11 @@ The @code{type_printers} attribute is a +@@ -25282,6 +26073,11 @@ @xref{Type Printing API}, for more information. @end defvar @@ -1192,7 +1192,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @node Objfiles In Python @subsubsection Objfiles In Python -@@ -25330,6 +26126,11 @@ The @code{type_printers} attribute is a +@@ -25332,6 +26128,11 @@ @xref{Type Printing API}, for more information. @end defvar @@ -1204,7 +1204,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo A @code{gdb.Objfile} object has the following methods: @defun Objfile.is_valid () -@@ -26348,7 +27149,7 @@ No my-foo-pretty-printers.py +@@ -26350,7 +27151,7 @@ When reading an auto-loaded file, @value{GDBN} sets the @dfn{current objfile}. This is available via the @code{gdb.current_objfile} function (@pxref{Objfiles In Python}). This can be useful for @@ -1213,7 +1213,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @menu * objfile-gdb.py file:: The @file{@var{objfile}-gdb.py} file -@@ -30219,6 +31020,22 @@ Is this going away???? +@@ -30227,6 +31028,22 @@ @node GDB/MI Stack Manipulation @section @sc{gdb/mi} Stack Manipulation Commands @@ -1236,7 +1236,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @subheading The @code{-stack-info-frame} Command @findex -stack-info-frame -@@ -30286,13 +31103,14 @@ For a stack with frame levels 0 through +@@ -30294,13 +31111,14 @@ (gdb) @end smallexample @@ -1252,7 +1252,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo [ @var{low-frame} @var{high-frame} ] @end smallexample -@@ -30309,7 +31127,9 @@ If @var{print-values} is 0 or @code{--no +@@ -30317,7 +31135,9 @@ the variables; if it is 1 or @code{--all-values}, print also their values; and if it is 2 or @code{--simple-values}, print the name, type and value for simple data types, and the name and type for arrays, @@ -1263,7 +1263,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo Use of this command to obtain arguments in a single frame is deprecated in favor of the @samp{-stack-list-variables} command. -@@ -30380,13 +31200,14 @@ args=[@{name="intarg",value="2"@}, +@@ -30388,13 +31208,14 @@ @c @subheading -stack-list-exception-handlers @@ -1279,7 +1279,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @end smallexample List the frames currently on the stack. For each frame it displays the -@@ -30416,7 +31237,9 @@ levels are between the two arguments (in +@@ -30424,7 +31245,9 @@ are equal, it shows the single frame at the corresponding level. It is an error if @var{low-frame} is larger than the actual number of frames. On the other hand, @var{high-frame} may be larger than the @@ -1290,7 +1290,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @subsubheading @value{GDBN} Command -@@ -30486,11 +31309,12 @@ Show a single frame: +@@ -30494,11 +31317,12 @@ @subheading The @code{-stack-list-locals} Command @findex -stack-list-locals @@ -1304,7 +1304,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @end smallexample Display the local variable names for the selected frame. If -@@ -30501,7 +31325,8 @@ type and value for simple data types, an +@@ -30509,7 +31333,8 @@ structures and unions. In this last case, a frontend can immediately display the value of simple data types and create variable objects for other data types when the user wishes to explore their values in @@ -1314,7 +1314,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo This command is deprecated in favor of the @samp{-stack-list-variables} command. -@@ -30526,13 +31351,14 @@ This command is deprecated in favor of t +@@ -30534,13 +31359,14 @@ (gdb) @end smallexample @@ -1330,7 +1330,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @end smallexample Display the names of local variables and function arguments for the selected frame. If -@@ -30540,7 +31366,8 @@ Display the names of local variables and +@@ -30548,7 +31374,8 @@ the variables; if it is 1 or @code{--all-values}, print also their values; and if it is 2 or @code{--simple-values}, print the name, type and value for simple data types, and the name and type for arrays, @@ -1340,10 +1340,10 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo @subsubheading Example -Index: gdb-7.6/gdb/mi/mi-cmd-stack.c +Index: gdb-7.6.1/gdb/mi/mi-cmd-stack.c =================================================================== ---- gdb-7.6.orig/gdb/mi/mi-cmd-stack.c 2013-06-10 14:31:02.730084652 +0200 -+++ gdb-7.6/gdb/mi/mi-cmd-stack.c 2013-06-10 14:31:08.365082437 +0200 +--- gdb-7.6.1.orig/gdb/mi/mi-cmd-stack.c 2018-05-05 17:17:42.032395155 +0200 ++++ gdb-7.6.1/gdb/mi/mi-cmd-stack.c 2018-05-05 17:18:23.775768154 +0200 @@ -31,6 +31,10 @@ #include "language.h" #include "valprint.h" @@ -1355,7 +1355,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c enum what_to_list { locals, arguments, all }; -@@ -38,6 +42,28 @@ static void list_args_or_locals (enum wh +@@ -38,6 +42,28 @@ enum print_values values, struct frame_info *fi); @@ -1384,7 +1384,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c /* Print a list of the stack frames. Args can be none, in which case we want to print the whole backtrace, or a pair of numbers specifying the frame numbers at which to start and stop the -@@ -52,14 +78,46 @@ mi_cmd_stack_list_frames (char *command, +@@ -52,14 +78,46 @@ int i; struct cleanup *cleanup_stack; struct frame_info *fi; @@ -1436,7 +1436,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c } else { -@@ -81,16 +139,37 @@ mi_cmd_stack_list_frames (char *command, +@@ -81,16 +139,37 @@ cleanup_stack = make_cleanup_ui_out_list_begin_end (current_uiout, "stack"); @@ -1483,7 +1483,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c } do_cleanups (cleanup_stack); -@@ -147,13 +226,34 @@ void +@@ -147,13 +226,34 @@ mi_cmd_stack_list_locals (char *command, char **argv, int argc) { struct frame_info *frame; @@ -1523,7 +1523,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c } /* Print a list of the arguments for the current frame. With argument -@@ -170,15 +270,20 @@ mi_cmd_stack_list_args (char *command, c +@@ -170,15 +270,20 @@ struct cleanup *cleanup_stack_args; enum print_values print_values; struct ui_out *uiout = current_uiout; @@ -1550,7 +1550,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c } else { -@@ -188,7 +293,7 @@ mi_cmd_stack_list_args (char *command, c +@@ -188,7 +293,7 @@ frame_high = -1; } @@ -1559,7 +1559,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c /* Let's position fi on the frame at which to start the display. Could be the innermost frame if the whole stack needs -@@ -203,21 +308,41 @@ mi_cmd_stack_list_args (char *command, c +@@ -203,21 +308,41 @@ cleanup_stack_args = make_cleanup_ui_out_list_begin_end (uiout, "stack-args"); @@ -1612,7 +1612,7 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c do_cleanups (cleanup_stack_args); } -@@ -230,13 +355,35 @@ void +@@ -230,13 +355,35 @@ mi_cmd_stack_list_variables (char *command, char **argv, int argc) { struct frame_info *frame; @@ -1653,11 +1653,11 @@ Index: gdb-7.6/gdb/mi/mi-cmd-stack.c } /* Print single local or argument. ARG must be already read in. For -Index: gdb-7.6/gdb/mi/mi-cmds.c +Index: gdb-7.6.1/gdb/mi/mi-cmds.c =================================================================== ---- gdb-7.6.orig/gdb/mi/mi-cmds.c 2013-06-10 14:31:02.730084652 +0200 -+++ gdb-7.6/gdb/mi/mi-cmds.c 2013-06-10 14:31:08.365082437 +0200 -@@ -86,6 +86,7 @@ static struct mi_cmd mi_cmds[] = +--- gdb-7.6.1.orig/gdb/mi/mi-cmds.c 2018-05-05 17:17:42.032395155 +0200 ++++ gdb-7.6.1/gdb/mi/mi-cmds.c 2018-05-05 17:18:23.775768154 +0200 +@@ -86,6 +86,7 @@ mi_cmd_data_write_register_values), DEF_MI_CMD_MI ("enable-timings", mi_cmd_enable_timings), DEF_MI_CMD_MI ("enable-pretty-printing", mi_cmd_enable_pretty_printing), @@ -1665,11 +1665,11 @@ Index: gdb-7.6/gdb/mi/mi-cmds.c DEF_MI_CMD_MI ("environment-cd", mi_cmd_env_cd), DEF_MI_CMD_MI ("environment-directory", mi_cmd_env_dir), DEF_MI_CMD_MI ("environment-path", mi_cmd_env_path), -Index: gdb-7.6/gdb/mi/mi-cmds.h +Index: gdb-7.6.1/gdb/mi/mi-cmds.h =================================================================== ---- gdb-7.6.orig/gdb/mi/mi-cmds.h 2013-06-10 14:31:02.730084652 +0200 -+++ gdb-7.6/gdb/mi/mi-cmds.h 2013-06-10 14:31:08.365082437 +0200 -@@ -118,6 +118,7 @@ extern mi_cmd_argv_ftype mi_cmd_var_show +--- gdb-7.6.1.orig/gdb/mi/mi-cmds.h 2018-05-05 17:17:42.033395164 +0200 ++++ gdb-7.6.1/gdb/mi/mi-cmds.h 2018-05-05 17:18:23.775768154 +0200 +@@ -118,6 +118,7 @@ extern mi_cmd_argv_ftype mi_cmd_var_show_format; extern mi_cmd_argv_ftype mi_cmd_var_update; extern mi_cmd_argv_ftype mi_cmd_enable_pretty_printing; @@ -1677,10 +1677,10 @@ Index: gdb-7.6/gdb/mi/mi-cmds.h extern mi_cmd_argv_ftype mi_cmd_var_set_update_range; /* Description of a single command. */ -Index: gdb-7.6/gdb/python/py-framefilter.c +Index: gdb-7.6.1/gdb/python/py-framefilter.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/python/py-framefilter.c 2013-06-10 14:31:08.366082437 +0200 ++++ gdb-7.6.1/gdb/python/py-framefilter.c 2018-05-05 17:18:23.776768162 +0200 @@ -0,0 +1,1528 @@ +/* Python frame filters + @@ -3210,11 +3210,11 @@ Index: gdb-7.6/gdb/python/py-framefilter.c + do_cleanups (cleanups); + return PY_BT_ERROR; +} -Index: gdb-7.6/gdb/python/py-objfile.c +Index: gdb-7.6.1/gdb/python/py-objfile.c =================================================================== ---- gdb-7.6.orig/gdb/python/py-objfile.c 2013-06-10 14:31:02.731084652 +0200 -+++ gdb-7.6/gdb/python/py-objfile.c 2013-06-10 14:31:08.366082437 +0200 -@@ -33,6 +33,8 @@ typedef struct +--- gdb-7.6.1.orig/gdb/python/py-objfile.c 2018-05-05 17:17:42.034395173 +0200 ++++ gdb-7.6.1/gdb/python/py-objfile.c 2018-05-05 17:18:23.776768162 +0200 +@@ -33,6 +33,8 @@ /* The pretty-printer list of functions. */ PyObject *printers; @@ -3223,7 +3223,7 @@ Index: gdb-7.6/gdb/python/py-objfile.c /* The type-printer list. */ PyObject *type_printers; } objfile_object; -@@ -61,6 +63,7 @@ objfpy_dealloc (PyObject *o) +@@ -61,6 +63,7 @@ objfile_object *self = (objfile_object *) o; Py_XDECREF (self->printers); @@ -3231,7 +3231,7 @@ Index: gdb-7.6/gdb/python/py-objfile.c Py_XDECREF (self->type_printers); Py_TYPE (self)->tp_free (self); } -@@ -81,6 +84,13 @@ objfpy_new (PyTypeObject *type, PyObject +@@ -81,6 +84,13 @@ return NULL; } @@ -3245,7 +3245,7 @@ Index: gdb-7.6/gdb/python/py-objfile.c self->type_printers = PyList_New (0); if (!self->type_printers) { -@@ -129,6 +139,47 @@ objfpy_set_printers (PyObject *o, PyObje +@@ -129,6 +139,47 @@ return 0; } @@ -3293,7 +3293,7 @@ Index: gdb-7.6/gdb/python/py-objfile.c /* Get the 'type_printers' attribute. */ static PyObject * -@@ -225,6 +276,13 @@ objfile_to_objfile_object (struct objfil +@@ -225,6 +276,13 @@ return NULL; } @@ -3307,7 +3307,7 @@ Index: gdb-7.6/gdb/python/py-objfile.c object->type_printers = PyList_New (0); if (!object->type_printers) { -@@ -270,6 +328,8 @@ static PyGetSetDef objfile_getset[] = +@@ -270,6 +328,8 @@ "The objfile's filename, or None.", NULL }, { "pretty_printers", objfpy_get_printers, objfpy_set_printers, "Pretty printers.", NULL }, @@ -3316,11 +3316,11 @@ Index: gdb-7.6/gdb/python/py-objfile.c { "type_printers", objfpy_get_type_printers, objfpy_set_type_printers, "Type printers.", NULL }, { NULL } -Index: gdb-7.6/gdb/python/py-progspace.c +Index: gdb-7.6.1/gdb/python/py-progspace.c =================================================================== ---- gdb-7.6.orig/gdb/python/py-progspace.c 2013-06-10 14:31:02.731084652 +0200 -+++ gdb-7.6/gdb/python/py-progspace.c 2013-06-10 14:31:08.366082437 +0200 -@@ -35,6 +35,8 @@ typedef struct +--- gdb-7.6.1.orig/gdb/python/py-progspace.c 2018-05-05 17:17:42.034395173 +0200 ++++ gdb-7.6.1/gdb/python/py-progspace.c 2018-05-05 17:18:23.776768162 +0200 +@@ -35,6 +35,8 @@ /* The pretty-printer list of functions. */ PyObject *printers; @@ -3329,7 +3329,7 @@ Index: gdb-7.6/gdb/python/py-progspace.c /* The type-printer list. */ PyObject *type_printers; } pspace_object; -@@ -69,6 +71,7 @@ pspy_dealloc (PyObject *self) +@@ -69,6 +71,7 @@ pspace_object *ps_self = (pspace_object *) self; Py_XDECREF (ps_self->printers); @@ -3337,7 +3337,7 @@ Index: gdb-7.6/gdb/python/py-progspace.c Py_XDECREF (ps_self->type_printers); Py_TYPE (self)->tp_free (self); } -@@ -89,6 +92,13 @@ pspy_new (PyTypeObject *type, PyObject * +@@ -89,6 +92,13 @@ return NULL; } @@ -3351,7 +3351,7 @@ Index: gdb-7.6/gdb/python/py-progspace.c self->type_printers = PyList_New (0); if (!self->type_printers) { -@@ -137,6 +147,47 @@ pspy_set_printers (PyObject *o, PyObject +@@ -137,6 +147,47 @@ return 0; } @@ -3399,7 +3399,7 @@ Index: gdb-7.6/gdb/python/py-progspace.c /* Get the 'type_printers' attribute. */ static PyObject * -@@ -221,6 +272,13 @@ pspace_to_pspace_object (struct program_ +@@ -221,6 +272,13 @@ return NULL; } @@ -3413,7 +3413,7 @@ Index: gdb-7.6/gdb/python/py-progspace.c object->type_printers = PyList_New (0); if (!object->type_printers) { -@@ -257,6 +315,8 @@ static PyGetSetDef pspace_getset[] = +@@ -257,6 +315,8 @@ "The progspace's main filename, or None.", NULL }, { "pretty_printers", pspy_get_printers, pspy_set_printers, "Pretty printers.", NULL }, @@ -3422,11 +3422,11 @@ Index: gdb-7.6/gdb/python/py-progspace.c { "type_printers", pspy_get_type_printers, pspy_set_type_printers, "Type printers.", NULL }, { NULL } -Index: gdb-7.6/gdb/python/py-utils.c +Index: gdb-7.6.1/gdb/python/py-utils.c =================================================================== ---- gdb-7.6.orig/gdb/python/py-utils.c 2013-06-10 14:31:02.732084652 +0200 -+++ gdb-7.6/gdb/python/py-utils.c 2013-06-10 14:31:08.366082437 +0200 -@@ -48,6 +48,28 @@ make_cleanup_py_decref (PyObject *py) +--- gdb-7.6.1.orig/gdb/python/py-utils.c 2018-05-05 17:17:42.034395173 +0200 ++++ gdb-7.6.1/gdb/python/py-utils.c 2018-05-05 17:18:23.776768162 +0200 +@@ -48,6 +48,28 @@ return make_cleanup (py_decref, (void *) py); } @@ -3455,11 +3455,11 @@ Index: gdb-7.6/gdb/python/py-utils.c /* Converts a Python 8-bit string to a unicode string object. Assumes the 8-bit string is in the host charset. If an error occurs during conversion, returns NULL with a python exception set. -Index: gdb-7.6/gdb/python/python-internal.h +Index: gdb-7.6.1/gdb/python/python-internal.h =================================================================== ---- gdb-7.6.orig/gdb/python/python-internal.h 2013-06-10 14:31:02.732084652 +0200 -+++ gdb-7.6/gdb/python/python-internal.h 2013-06-10 14:31:08.367082436 +0200 -@@ -251,9 +251,11 @@ PyObject *frame_info_to_frame_object (st +--- gdb-7.6.1.orig/gdb/python/python-internal.h 2018-05-05 17:17:42.034395173 +0200 ++++ gdb-7.6.1/gdb/python/python-internal.h 2018-05-05 17:18:23.776768162 +0200 +@@ -251,9 +251,11 @@ PyObject *pspace_to_pspace_object (struct program_space *); PyObject *pspy_get_printers (PyObject *, void *); @@ -3471,7 +3471,7 @@ Index: gdb-7.6/gdb/python/python-internal.h PyObject *gdbarch_to_arch_object (struct gdbarch *gdbarch); -@@ -304,6 +306,7 @@ void gdbpy_initialize_new_objfile_event +@@ -304,6 +306,7 @@ void gdbpy_initialize_arch (void); struct cleanup *make_cleanup_py_decref (PyObject *py); @@ -3479,11 +3479,11 @@ Index: gdb-7.6/gdb/python/python-internal.h struct cleanup *ensure_python_env (struct gdbarch *gdbarch, const struct language_defn *language); -Index: gdb-7.6/gdb/python/python.c +Index: gdb-7.6.1/gdb/python/python.c =================================================================== ---- gdb-7.6.orig/gdb/python/python.c 2013-06-10 14:31:02.732084652 +0200 -+++ gdb-7.6/gdb/python/python.c 2013-06-10 14:31:08.367082436 +0200 -@@ -1442,6 +1442,15 @@ free_type_printers (void *arg) +--- gdb-7.6.1.orig/gdb/python/python.c 2018-05-05 17:17:42.035395182 +0200 ++++ gdb-7.6.1/gdb/python/python.c 2018-05-05 17:18:23.777768171 +0200 +@@ -1442,6 +1442,15 @@ { } @@ -3499,10 +3499,10 @@ Index: gdb-7.6/gdb/python/python.c #endif /* HAVE_PYTHON */ -Index: gdb-7.6/gdb/python/python.h +Index: gdb-7.6.1/gdb/python/python.h =================================================================== ---- gdb-7.6.orig/gdb/python/python.h 2013-06-10 14:31:02.732084652 +0200 -+++ gdb-7.6/gdb/python/python.h 2013-06-10 14:31:08.367082436 +0200 +--- gdb-7.6.1.orig/gdb/python/python.h 2018-05-05 17:17:42.035395182 +0200 ++++ gdb-7.6.1/gdb/python/python.h 2018-05-05 17:18:23.777768171 +0200 @@ -21,6 +21,7 @@ #define GDB_PYTHON_H @@ -3511,7 +3511,7 @@ Index: gdb-7.6/gdb/python/python.h struct breakpoint_object; -@@ -28,6 +29,66 @@ struct breakpoint_object; +@@ -28,6 +29,66 @@ E.g. When the program loads libfoo.so, look for libfoo-gdb.py. */ #define GDBPY_AUTO_FILE_NAME "-gdb.py" @@ -3578,7 +3578,7 @@ Index: gdb-7.6/gdb/python/python.h extern void finish_python_initialization (void); void eval_python_from_control_command (struct command_line *); -@@ -43,6 +104,11 @@ int apply_val_pretty_printer (struct typ +@@ -43,6 +104,11 @@ const struct value_print_options *options, const struct language_defn *language); @@ -3590,10 +3590,10 @@ Index: gdb-7.6/gdb/python/python.h void preserve_python_values (struct objfile *objfile, htab_t copied_types); void gdbpy_load_auto_scripts_for_objfile (struct objfile *objfile); -Index: gdb-7.6/gdb/python/lib/gdb/FrameDecorator.py +Index: gdb-7.6.1/gdb/python/lib/gdb/FrameDecorator.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/python/lib/gdb/FrameDecorator.py 2013-06-10 14:31:08.367082436 +0200 ++++ gdb-7.6.1/gdb/python/lib/gdb/FrameDecorator.py 2018-05-05 17:18:23.777768171 +0200 @@ -0,0 +1,285 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. + @@ -3880,10 +3880,10 @@ Index: gdb-7.6/gdb/python/lib/gdb/FrameDecorator.py + args.append(SymValueWrapper(sym, None)) + + return args -Index: gdb-7.6/gdb/python/lib/gdb/FrameIterator.py +Index: gdb-7.6.1/gdb/python/lib/gdb/FrameIterator.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/python/lib/gdb/FrameIterator.py 2013-06-10 14:31:08.367082436 +0200 ++++ gdb-7.6.1/gdb/python/lib/gdb/FrameIterator.py 2018-05-05 17:18:23.777768171 +0200 @@ -0,0 +1,45 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. + @@ -3930,10 +3930,10 @@ Index: gdb-7.6/gdb/python/lib/gdb/FrameIterator.py + raise StopIteration + self.frame = result.older() + return result -Index: gdb-7.6/gdb/python/lib/gdb/frames.py +Index: gdb-7.6.1/gdb/python/lib/gdb/frames.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/python/lib/gdb/frames.py 2013-06-10 14:31:08.368082436 +0200 ++++ gdb-7.6.1/gdb/python/lib/gdb/frames.py 2018-05-05 17:18:23.777768171 +0200 @@ -0,0 +1,229 @@ +# Frame-filter commands. +# Copyright (C) 2013 Free Software Foundation, Inc. @@ -4164,11 +4164,11 @@ Index: gdb-7.6/gdb/python/lib/gdb/frames.py + sliced = itertools.islice(frame_iterator, frame_low, frame_high) + + return sliced -Index: gdb-7.6/gdb/python/lib/gdb/__init__.py +Index: gdb-7.6.1/gdb/python/lib/gdb/__init__.py =================================================================== ---- gdb-7.6.orig/gdb/python/lib/gdb/__init__.py 2013-06-10 14:31:02.733084651 +0200 -+++ gdb-7.6/gdb/python/lib/gdb/__init__.py 2013-06-10 14:31:08.368082436 +0200 -@@ -67,6 +67,8 @@ pretty_printers = [] +--- gdb-7.6.1.orig/gdb/python/lib/gdb/__init__.py 2018-05-05 17:17:42.035395182 +0200 ++++ gdb-7.6.1/gdb/python/lib/gdb/__init__.py 2018-05-05 17:18:23.777768171 +0200 +@@ -67,6 +67,8 @@ # Initial type printers. type_printers = [] @@ -4177,10 +4177,10 @@ Index: gdb-7.6/gdb/python/lib/gdb/__init__.py # Convenience variable to GDB's python directory PYTHONDIR = os.path.dirname(os.path.dirname(__file__)) -Index: gdb-7.6/gdb/python/lib/gdb/command/frame_filters.py +Index: gdb-7.6.1/gdb/python/lib/gdb/command/frame_filters.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/python/lib/gdb/command/frame_filters.py 2013-06-10 14:31:08.368082436 +0200 ++++ gdb-7.6.1/gdb/python/lib/gdb/command/frame_filters.py 2018-05-05 17:18:23.778768180 +0200 @@ -0,0 +1,461 @@ +# Frame-filter commands. +# Copyright (C) 2013 Free Software Foundation, Inc. @@ -4643,10 +4643,10 @@ Index: gdb-7.6/gdb/python/lib/gdb/command/frame_filters.py +DisableFrameFilter() +SetFrameFilterPriority() +ShowFrameFilterPriority() -Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-gdb.py.in +Index: gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter-gdb.py.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-gdb.py.in 2013-06-10 14:31:08.368082436 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter-gdb.py.in 2018-05-05 17:18:23.778768180 +0200 @@ -0,0 +1,48 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. + @@ -4696,10 +4696,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-gdb.py.in + +FrameObjFile() +FrameObjFile2() -Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-mi.c +Index: gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter-mi.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-mi.c 2013-06-10 14:31:08.368082436 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter-mi.c 2018-05-05 17:18:23.778768180 +0200 @@ -0,0 +1,138 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -4839,10 +4839,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-mi.c +{ + func5(3,5); +} -Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-mi.exp +Index: gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter-mi.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-mi.exp 2013-06-10 14:31:08.368082436 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter-mi.exp 2018-05-05 17:18:23.778768180 +0200 @@ -0,0 +1,179 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. + @@ -5023,10 +5023,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter-mi.exp +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=\\\[{name=\"foo\",arg=\"1\"},{name=\"bar\",arg=\"1\"},{name=\"fb\",arg=\"1\"},{name=\"bf\",arg=\"1\"},{name=\"str\"},{name=\"st2\"},{name=\"b\"},{name=\"c\"}\\\]" \ + "stack-list-variables 0" -Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.c +Index: gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.c 2013-06-10 14:31:08.369082436 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter.c 2018-05-05 17:18:23.778768180 +0200 @@ -0,0 +1,155 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -5183,10 +5183,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.c + const char *foo1 = "Test"; + func5(3,5); +} -Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.exp +Index: gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.exp 2013-06-10 14:31:08.369082436 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter.exp 2018-05-05 17:18:23.779768189 +0200 @@ -0,0 +1,239 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. + @@ -5427,10 +5427,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.exp +gdb_test "bt no-filters full" \ + ".*#0..*in main \\(\\).*" \ + "bt no-filters full no debuginfo" -Index: gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.py +Index: gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.6/gdb/testsuite/gdb.python/py-framefilter.py 2013-06-10 14:31:08.369082436 +0200 ++++ gdb-7.6.1/gdb/testsuite/gdb.python/py-framefilter.py 2018-05-05 17:18:23.779768189 +0200 @@ -0,0 +1,117 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. + diff --git a/SPECS/gdb.spec b/SPECS/gdb.spec index 650c1bf..9771f23 100644 --- a/SPECS/gdb.spec +++ b/SPECS/gdb.spec @@ -42,7 +42,7 @@ Version: 7.6.1 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 110%{?dist} +Release: 114%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain Group: Development/Debuggers @@ -926,6 +926,18 @@ Patch1269: gdb-rhbz1522798-ppc64-plt-reverse.patch # Fix signal handlers (RH BZ 1473411) regression (RH BZ 1531838, Pedro Alves). Patch1270: gdb-rhbz1531838-rhbz1473411-spawn-default-signal-handlers-regression.patch +# [s390x] Backport arch12 instructions decoding (RH BZ 1553104). +Patch1271: gdb-rhbz1553104-s390x-arch12-1of6.patch +Patch1272: gdb-rhbz1553104-s390x-arch12-2of6.patch +Patch1273: gdb-rhbz1553104-s390x-arch12-3of6.patch +Patch1274: gdb-rhbz1553104-s390x-arch12-4of6.patch +Patch1275: gdb-rhbz1553104-s390x-arch12-5of6.patch +Patch1276: gdb-rhbz1553104-s390x-arch12-6of6.patch +Patch1277: gdb-rhbz1553104-s390x-arch12-test.patch + +# [aarch64] Fix missed unaligned hardware watchpoints (RH BZ 1347993). +Patch1278: gdb-rhbz1347993-aarch64-hw-watchpoint.patch + %if 0%{!?rhel:1} || 0%{?rhel} > 6 # RL_STATE_FEDORA_GDB would not be found for: # Patch642: gdb-readline62-ask-more-rh.patch @@ -1142,6 +1154,7 @@ find -name "*.info*"|xargs rm -f %patch232 -p1 %patch828 -p1 %patch829 -p1 +%patch1278 -p1 %patch1 -p1 %patch3 -p1 @@ -1472,6 +1485,13 @@ find -name "*.info*"|xargs rm -f %patch1268 -p1 %patch1269 -p1 %patch1270 -p1 +%patch1271 -p1 +%patch1272 -p1 +%patch1273 -p1 +%patch1274 -p1 +%patch1275 -p1 +%patch1276 -p1 +%patch1277 -p1 %if 0%{?scl:1} %patch836 -p1 -R @@ -1840,6 +1860,8 @@ done # BZ 999645: /usr/share/gdb/auto-load/ needs filesystem symlinks mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load for i in $(echo bin lib $(basename %{_libdir}) sbin|tr ' ' '\n'|sort -u);do + # mkdir to satisfy dangling symlinks build check. + mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load/%{_root_prefix}/$i ln -s $(echo %{_root_prefix}|sed 's#^/*##')/$i \ $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load/$i done @@ -1997,6 +2019,18 @@ fi %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch" %changelog +* Fri Jun 29 2018 Jan Kratochvil - 7.6.1-114.el7 +- Fix /usr/share/gdb/auto-load/ (safely) dangling symlinks (RH BZ 1596023). + +* Thu May 24 2018 Jan Kratochvil - 7.6.1-113.el7 +- Fix backport of gdbserver support for containers (RH BZ 1578378). + +* Sat May 5 2018 Jan Kratochvil - 7.6.1-112.el7 +- [aarch64] Fix missed unaligned hardware watchpoints (RH BZ 1347993). + +* Fri Mar 23 2018 Jan Kratochvil - 7.6.1-111.el7 +- [s390x] Backport arch12 instructions decoding (RH BZ 1553104). + * Mon Jan 8 2018 Jan Kratochvil - 7.6.1-110.el7 - Fix signal handlers (RH BZ 1473411) regression (RH BZ 1531838, Pedro Alves).